[Pkg-privacy-commits] [vidalia] 29/160: Added t-p-u repository for handling the debconf interaction fixes
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:13:55 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 fd9a8a280cfbe5cd17231b3329213867c5000dbf
Author: Dererk <dererk at melee.dererk.com.ar>
Date: Sat Sep 25 07:55:27 2010 -0300
Added t-p-u repository for handling the debconf interaction fixes
Upload, if approved, will be performed on Sat, 30 Sep 2010 23:00:00 UTC,
to let l10n folks have some time to work on that.
---
.../vidalia-0.2.9-1+squeeze1/CHANGELOG | 1046 +++++
.../vidalia-0.2.9-1+squeeze1/CMakeLists.txt | 138 +
.../vidalia-0.2.9-1+squeeze1/CREDITS | 90 +
.../vidalia-0.2.9-1+squeeze1/HACKING | 299 ++
.../vidalia-0.2.9-1+squeeze1/INSTALL | 269 ++
.../vidalia-0.2.9-1+squeeze1/LICENSE | 279 ++
.../vidalia-0.2.9-1+squeeze1/LICENSE-GPLV2 | 340 ++
.../vidalia-0.2.9-1+squeeze1/LICENSE-GPLV3 | 674 ++++
.../vidalia-0.2.9-1+squeeze1/LICENSE-LGPLV3 | 165 +
.../vidalia-0.2.9-1+squeeze1/LICENSE-OPENSSL | 127 +
.../vidalia-0.2.9-1+squeeze1/README | 24 +
.../vidalia-0.2.9-1+squeeze1/README.breakpad | 94 +
.../vidalia-0.2.9-1+squeeze1/README.marble | 62 +
.../cmake/FindBreakpad.cmake | 50 +
.../cmake/FindMarble.cmake | 111 +
.../cmake/FindOpenSSL.cmake | 116 +
.../vidalia-0.2.9-1+squeeze1/cmake/FindWiX.cmake | 36 +
.../cmake/ParseArgumentsMacro.cmake | 35 +
.../cmake/VidaliaMacros.cmake | 289 ++
.../vidalia-0.2.9-1+squeeze1/config.h.in | 40 +
.../vidalia-0.2.9-1+squeeze1/contrib/geoip | 104 +
.../vidalia-0.2.9-1+squeeze1/contrib/geoip.py | 105 +
.../vidalia-0.2.9-1+squeeze1/debian}/FAQ | 0
.../vidalia-0.2.9-1+squeeze1/debian}/README.Debian | 5 +-
.../vidalia-0.2.9-1+squeeze1/debian}/README.source | 0
.../vidalia-0.2.9-1+squeeze1/debian}/changelog | 20 +-
.../vidalia-0.2.9-1+squeeze1/debian}/compat | 0
.../vidalia-0.2.9-1+squeeze1/debian}/config | 0
.../vidalia-0.2.9-1+squeeze1/debian}/control | 0
.../vidalia-0.2.9-1+squeeze1/debian}/copyright | 0
.../debian}/default.tor-off | 0
.../debian}/default.tor-on | 0
.../vidalia-0.2.9-1+squeeze1/debian}/docs | 0
.../vidalia-0.2.9-1+squeeze1/debian}/menu | 0
.../debian}/patches/debians-tor-binary-path.patch | 0
.../debian}/patches/series | 0
.../debian}/po/POTFILES.in | 0
.../vidalia-0.2.9-1+squeeze1/debian}/po/ca.po | 0
.../vidalia-0.2.9-1+squeeze1/debian}/po/cs.po | 0
.../vidalia-0.2.9-1+squeeze1/debian}/po/da.po | 0
.../vidalia-0.2.9-1+squeeze1/debian}/po/de.po | 0
.../vidalia-0.2.9-1+squeeze1/debian}/po/es.po | 0
.../vidalia-0.2.9-1+squeeze1/debian}/po/fi.po | 0
.../vidalia-0.2.9-1+squeeze1/debian}/po/fr.po | 0
.../vidalia-0.2.9-1+squeeze1/debian}/po/it.po | 0
.../vidalia-0.2.9-1+squeeze1/debian}/po/pt.po | 0
.../vidalia-0.2.9-1+squeeze1/debian}/po/ru.po | 0
.../vidalia-0.2.9-1+squeeze1/debian}/po/sv.po | 0
.../debian}/po/templates.pot | 0
.../vidalia-0.2.9-1+squeeze1/debian}/po/vi.po | 0
.../vidalia-0.2.9-1+squeeze1/debian}/po/zh_CN.po | 0
.../vidalia-0.2.9-1+squeeze1/debian}/po/zh_TW.po | 0
.../vidalia-0.2.9-1+squeeze1/debian}/postinst | 0
.../vidalia-0.2.9-1+squeeze1/debian}/postrm | 0
.../vidalia-0.2.9-1+squeeze1/debian}/rules | 0
.../vidalia-0.2.9-1+squeeze1/debian}/source/format | 0
.../vidalia-0.2.9-1+squeeze1/debian}/templates | 0
.../debian}/vidalia.desktop | 0
.../debian}/vidalia.install | 0
.../debian}/vidalia.lintian-overrides | 0
.../vidalia-0.2.9-1+squeeze1/debian}/vidalia.xpm | 0
.../vidalia-0.2.9-1+squeeze1/debian}/watch | 0
.../vidalia-0.2.9-1+squeeze1/doc/CMakeLists.txt | 32 +
.../vidalia-0.2.9-1+squeeze1/doc/Doxyfile.in | 236 ++
.../vidalia-0.2.9-1+squeeze1/doc/feature-spec.txt | 248 ++
.../vidalia-0.2.9-1+squeeze1/doc/geoip-spec.txt | 170 +
.../doc/status-events-ui.txt | 227 ++
.../vidalia-0.2.9-1+squeeze1/doc/version-spec.txt | 33 +
.../vidalia-0.2.9-1+squeeze1/doc/vidalia.1.in | 57 +
.../vidalia-0.2.9-1+squeeze1/pkg/CMakeLists.txt | 44 +
.../pkg/build-geoip-cache.sh | 37 +
.../vidalia-0.2.9-1+squeeze1/pkg/geoip-cache | 1435 +++++++
.../pkg/osx/CMakeLists.txt | 204 +
.../pkg/osx/InstallTorbutton.scpt.in | 22 +
.../pkg/osx/background.png | Bin 0 -> 87642 bytes
.../pkg/osx/build-bundle.txt | 100 +
.../pkg/osx/bundle-background.png | Bin 0 -> 123076 bytes
.../pkg/osx/bundle-ds_store | Bin 0 -> 12292 bytes
.../pkg/osx/nonbundle-ds_store | Bin 0 -> 12292 bytes
.../vidalia-0.2.9-1+squeeze1/pkg/osx/pkg-dmg | 1520 ++++++++
.../vidalia-0.2.9-1+squeeze1/pkg/osx/polipo.conf | 161 +
.../vidalia-0.2.9-1+squeeze1/pkg/osx/qt.conf | 2 +
.../pkg/osx/vidalia.conf.sample | 9 +
.../vidalia-0.2.9-1+squeeze1/pkg/package.sh | 47 +
.../pkg/rpm/CMakeLists.txt | 17 +
.../pkg/rpm/vidalia.spec.in | 141 +
.../pkg/win32/CMakeLists.txt | 175 +
.../pkg/win32/WixUI_Custom.wxs | 85 +
.../pkg/win32/af/vidalia_af.po | 207 +
.../pkg/win32/ar/vidalia_ar.po | 290 ++
.../pkg/win32/bg/vidalia_bg.po | 207 +
.../pkg/win32/bms/vidalia_bms.po | 267 ++
.../pkg/win32/bo/vidalia_bo.po | 207 +
.../pkg/win32/build-bundle-installer.txt | 53 +
.../pkg/win32/build-vidalia-installer.txt | 149 +
.../pkg/win32/ca/vidalia_ca.po | 207 +
.../pkg/win32/cs/vidalia_cs.po | 311 ++
.../pkg/win32/da/vidalia_da.po | 310 ++
.../pkg/win32/de/vidalia_de.po | 302 ++
.../pkg/win32/de_AT/vidalia_de_AT.po | 207 +
.../pkg/win32/de_CH/vidalia_de_CH.po | 207 +
.../pkg/win32/de_DE/vidalia_de_DE.po | 207 +
.../pkg/win32/default-header.bmp | Bin 0 -> 85894 bytes
.../pkg/win32/default-welcome.bmp | Bin 0 -> 461814 bytes
.../pkg/win32/default.action | 1260 ++++++
.../pkg/win32/el/vidalia_el.po | 230 ++
.../pkg/win32/en/vidalia_en.po | 293 ++
.../pkg/win32/es/vidalia_es.po | 301 ++
.../pkg/win32/et/vidalia.po | 271 ++
.../pkg/win32/eu/vidalia_eu.po | 207 +
.../pkg/win32/fa/vidalia_fa.po | 297 ++
.../pkg/win32/fi/vidalia_fi.po | 299 ++
.../pkg/win32/firefox-warning.ini | 34 +
.../pkg/win32/fr/vidalia_fr.po | 304 ++
.../pkg/win32/fur/vidalia_fur.po | 207 +
.../pkg/win32/gl/vidalia_gl.po | 207 +
.../pkg/win32/gu/vidalia_gu.po | 207 +
.../pkg/win32/he/vidalia_he.po | 281 ++
.../pkg/win32/hi/vidalia_hi.po | 207 +
.../pkg/win32/hr/vidalia_hr.po | 207 +
.../pkg/win32/hu/vidalia_hu.po | 207 +
.../pkg/win32/id/vidalia_id.po | 207 +
.../pkg/win32/is/vidalia_is.po | 207 +
.../pkg/win32/it/vidalia_it.po | 307 ++
.../pkg/win32/ja/vidalia_ja.po | 226 ++
.../pkg/win32/ka/vidalia_ka.po | 207 +
.../pkg/win32/km/vidalia_km.po | 207 +
.../pkg/win32/ko/vidalia_ko.po | 210 +
.../pkg/win32/ku/vidalia_ku.po | 207 +
.../pkg/win32/mktransform.vbs | 67 +
.../pkg/win32/mt/vidalia_mt.po | 207 +
.../pkg/win32/nb/vidalia_nb.po | 260 ++
.../pkg/win32/nl/vidalia_nl.po | 295 ++
.../pkg/win32/pa/vidalia_pa.po | 207 +
.../pkg/win32/pl/vidalia_pl.po | 304 ++
.../vidalia-0.2.9-1+squeeze1/pkg/win32/polipo.conf | 163 +
.../pkg/win32/polipo.wxs.in | 220 ++
.../pkg/win32/privoxy.config | 1179 ++++++
.../pkg/win32/pt/vidalia_pt.po | 304 ++
.../pkg/win32/pt_BR/vidalia_pt_BR.po | 207 +
.../pkg/win32/ro/vidalia_ro.po | 306 ++
.../pkg/win32/ru/vidalia_ru.po | 298 ++
.../pkg/win32/sl/vidalia_sl.po | 181 +
.../pkg/win32/sq/vidalia_sq.po | 207 +
.../pkg/win32/sr/vidalia_sr.po | 217 ++
.../pkg/win32/sv/vidalia_sv.po | 306 ++
.../pkg/win32/sw/vidalia_sw.po | 207 +
.../pkg/win32/templates/vidalia.pot | 216 ++
.../pkg/win32/th/vidalia_th.po | 213 +
.../pkg/win32/thandy.wxs.in | 106 +
.../vidalia-0.2.9-1+squeeze1/pkg/win32/tor.wxs.in | 405 ++
.../pkg/win32/torbutton.wxs.in | 147 +
.../pkg/win32/tr/vidalia_tr.po | 256 ++
.../pkg/win32/uk/vidalia_uk.po | 261 ++
.../pkg/win32/vi/vidalia_vi.po | 256 ++
.../pkg/win32/vidalia-bundle.nsi.in | 662 ++++
.../pkg/win32/vidalia.wxs.in | 366 ++
.../pkg/win32/zh_CN/vidalia_zh_CN.po | 274 ++
.../pkg/win32/zh_HK/vidalia_zh_HK.po | 207 +
.../pkg/win32/zh_TW/vidalia_zh_TW.po | 274 ++
.../vidalia-0.2.9-1+squeeze1/src/CMakeLists.txt | 68 +
.../src/common/CMakeLists.txt | 53 +
.../src/common/CountryInfo.cpp | 238 ++
.../src/common/CountryInfo.h | 43 +
.../vidalia-0.2.9-1+squeeze1/src/common/Log.cpp | 175 +
.../vidalia-0.2.9-1+squeeze1/src/common/Log.h | 157 +
.../src/common/TorSocket.cpp | 125 +
.../src/common/TorSocket.h | 63 +
.../src/common/TorSslSocket.cpp | 160 +
.../src/common/TorSslSocket.h | 71 +
.../src/common/ZlibByteArray.cpp | 383 ++
.../src/common/ZlibByteArray.h | 102 +
.../vidalia-0.2.9-1+squeeze1/src/common/crypto.cpp | 190 +
.../vidalia-0.2.9-1+squeeze1/src/common/crypto.h | 79 +
.../vidalia-0.2.9-1+squeeze1/src/common/file.cpp | 126 +
.../vidalia-0.2.9-1+squeeze1/src/common/file.h | 43 +
.../vidalia-0.2.9-1+squeeze1/src/common/html.cpp | 74 +
.../vidalia-0.2.9-1+squeeze1/src/common/html.h | 46 +
.../vidalia-0.2.9-1+squeeze1/src/common/net.cpp | 35 +
.../vidalia-0.2.9-1+squeeze1/src/common/net.h | 27 +
.../src/common/procutil.cpp | 134 +
.../vidalia-0.2.9-1+squeeze1/src/common/procutil.h | 56 +
.../src/common/stringutil.cpp | 356 ++
.../src/common/stringutil.h | 91 +
.../vidalia-0.2.9-1+squeeze1/src/common/win32.cpp | 272 ++
.../vidalia-0.2.9-1+squeeze1/src/common/win32.h | 56 +
.../vidalia-0.2.9-1+squeeze1/src/common/zconf.h | 332 ++
.../vidalia-0.2.9-1+squeeze1/src/common/zlib.h | 1357 +++++++
.../src/crashreporter/CMakeLists.txt | 73 +
.../src/crashreporter/CrashReportDialog.cpp | 129 +
.../src/crashreporter/CrashReportDialog.h | 92 +
.../src/crashreporter/CrashReportDialog.ui | 156 +
.../src/crashreporter/CrashReportUploader.cpp | 153 +
.../src/crashreporter/CrashReportUploader.h | 110 +
.../src/crashreporter/UploadProgressDialog.cpp | 61 +
.../src/crashreporter/UploadProgressDialog.h | 63 +
.../src/crashreporter/UploadProgressDialog.ui | 106 +
.../src/crashreporter/main.cpp | 182 +
.../crashreporter/res/32x32/tools-report-bug.png | Bin 0 -> 1709 bytes
.../crashreporter/res/48x48/tools-report-bug.png | Bin 0 -> 3166 bytes
.../crashreporter/res/64x64/tools-report-bug.png | Bin 0 -> 4882 bytes
.../src/crashreporter/res/CrashReporter.ico | Bin 0 -> 39438 bytes
.../src/crashreporter/res/CrashReporter.qrc | 11 +
.../src/crashreporter/res/CrashReporter.rc.in | 46 +
.../src/crashreporter/res/gd-class2-root.crt | 24 +
.../src/miniupnpc/CMakeLists.txt | 35 +
.../src/miniupnpc/bsdqueue.h | 531 +++
.../src/miniupnpc/codelength.h | 24 +
.../src/miniupnpc/connecthostport.c | 221 ++
.../src/miniupnpc/connecthostport.h | 17 +
.../src/miniupnpc/declspec.h | 15 +
.../src/miniupnpc/igd_desc_parse.c | 114 +
.../src/miniupnpc/igd_desc_parse.h | 45 +
.../src/miniupnpc/minisoap.c | 116 +
.../src/miniupnpc/minisoap.h | 15 +
.../src/miniupnpc/minissdpc.c | 130 +
.../src/miniupnpc/minissdpc.h | 15 +
.../src/miniupnpc/miniupnpc.c | 892 +++++
.../src/miniupnpc/miniupnpc.h | 114 +
.../src/miniupnpc/miniupnpcmodule.c | 494 +++
.../src/miniupnpc/miniupnpcstrings.h | 15 +
.../src/miniupnpc/miniwget.c | 250 ++
.../src/miniupnpc/miniwget.h | 28 +
.../src/miniupnpc/minixml.c | 191 +
.../src/miniupnpc/minixml.h | 37 +
.../src/miniupnpc/upnpcommands.c | 582 +++
.../src/miniupnpc/upnpcommands.h | 193 +
.../src/miniupnpc/upnperrors.c | 66 +
.../src/miniupnpc/upnperrors.h | 26 +
.../src/miniupnpc/upnpreplyparse.c | 127 +
.../src/miniupnpc/upnpreplyparse.h | 62 +
.../src/tools/CMakeLists.txt | 22 +
.../src/tools/nsh2po/CMakeLists.txt | 46 +
.../src/tools/nsh2po/nsh2po.cpp | 352 ++
.../src/tools/nsh2po/nsh2po_config.h.in | 23 +
.../src/tools/po2nsh/CMakeLists.txt | 29 +
.../src/tools/po2nsh/po2nsh.cpp | 257 ++
.../src/tools/po2ts/CMakeLists.txt | 32 +
.../src/tools/po2ts/po2ts.cpp | 316 ++
.../src/tools/po2wxl/CMakeLists.txt | 31 +
.../src/tools/po2wxl/po2wxl.cpp | 343 ++
.../src/tools/ts2po/CMakeLists.txt | 53 +
.../src/tools/ts2po/ts2po.cpp | 270 ++
.../src/tools/ts2po/ts2po_config.h.in | 23 +
.../src/tools/wixtool/CMakeLists.txt | 27 +
.../src/tools/wixtool/wixtool.cpp | 710 ++++
.../src/torcontrol/AddressMap.cpp | 105 +
.../src/torcontrol/AddressMap.h | 70 +
.../src/torcontrol/BootstrapStatus.cpp | 97 +
.../src/torcontrol/BootstrapStatus.h | 147 +
.../src/torcontrol/CMakeLists.txt | 58 +
.../src/torcontrol/Circuit.cpp | 121 +
.../src/torcontrol/Circuit.h | 85 +
.../src/torcontrol/ControlCommand.cpp | 124 +
.../src/torcontrol/ControlCommand.h | 59 +
.../src/torcontrol/ControlConnection.cpp | 375 ++
.../src/torcontrol/ControlConnection.h | 130 +
.../src/torcontrol/ControlReply.cpp | 78 +
.../src/torcontrol/ControlReply.h | 53 +
.../src/torcontrol/ControlSocket.cpp | 218 ++
.../src/torcontrol/ControlSocket.h | 57 +
.../src/torcontrol/LogEvent.cpp | 80 +
.../src/torcontrol/LogEvent.h | 59 +
.../src/torcontrol/ProtocolInfo.cpp | 36 +
.../src/torcontrol/ProtocolInfo.h | 56 +
.../src/torcontrol/ReplyLine.cpp | 109 +
.../src/torcontrol/ReplyLine.h | 62 +
.../src/torcontrol/RouterDescriptor.cpp | 83 +
.../src/torcontrol/RouterDescriptor.h | 112 +
.../src/torcontrol/RouterStatus.cpp | 124 +
.../src/torcontrol/RouterStatus.h | 101 +
.../src/torcontrol/SendCommandEvent.cpp | 67 +
.../src/torcontrol/SendCommandEvent.h | 61 +
.../src/torcontrol/Stream.cpp | 154 +
.../src/torcontrol/Stream.h | 101 +
.../src/torcontrol/TorControl.cpp | 1053 +++++
.../src/torcontrol/TorControl.h | 402 ++
.../src/torcontrol/TorEvents.cpp | 458 +++
.../src/torcontrol/TorEvents.h | 255 ++
.../src/torcontrol/TorProcess.cpp | 203 +
.../src/torcontrol/TorProcess.h | 67 +
.../src/torcontrol/TorService.cpp | 313 ++
.../src/torcontrol/TorService.h | 152 +
.../src/torcontrol/TorSignal.cpp | 36 +
.../src/torcontrol/TorSignal.h | 41 +
.../src/torcontrol/tcglobal.cpp | 99 +
.../src/torcontrol/tcglobal.h | 121 +
.../src/vidalia/CMakeLists.txt | 500 +++
.../src/vidalia/ControlPasswordInputDialog.cpp | 103 +
.../src/vidalia/ControlPasswordInputDialog.h | 78 +
.../src/vidalia/ControlPasswordInputDialog.ui | 128 +
.../src/vidalia/CrashReporter.cpp | 408 ++
.../src/vidalia/CrashReporter.h | 96 +
.../src/vidalia/HelperProcess.cpp | 134 +
.../src/vidalia/HelperProcess.h | 80 +
.../src/vidalia/LanguageSupport.cpp | 128 +
.../src/vidalia/LanguageSupport.h | 44 +
.../src/vidalia/MainWindow.cpp | 1949 ++++++++++
.../src/vidalia/MainWindow.h | 292 ++
.../src/vidalia/MainWindow.ui | 603 +++
.../src/vidalia/PackageInfo.cpp | 92 +
.../src/vidalia/PackageInfo.h | 97 +
.../src/vidalia/UpdateProcess.cpp | 354 ++
.../src/vidalia/UpdateProcess.h | 170 +
.../src/vidalia/UpdateProgressDialog.cpp | 92 +
.../src/vidalia/UpdateProgressDialog.h | 70 +
.../src/vidalia/UpdateProgressDialog.ui | 102 +
.../src/vidalia/UpdatesAvailableDialog.cpp | 100 +
.../src/vidalia/UpdatesAvailableDialog.h | 76 +
.../src/vidalia/UpdatesAvailableDialog.ui | 96 +
.../src/vidalia/VClickLabel.cpp | 96 +
.../src/vidalia/VClickLabel.h | 60 +
.../src/vidalia/VMessageBox.cpp | 161 +
.../src/vidalia/VMessageBox.h | 94 +
.../src/vidalia/Vidalia.cpp | 518 +++
.../vidalia-0.2.9-1+squeeze1/src/vidalia/Vidalia.h | 164 +
.../src/vidalia/VidaliaWindow.cpp | 151 +
.../src/vidalia/VidaliaWindow.h | 78 +
.../src/vidalia/about/AboutDialog.cpp | 62 +
.../src/vidalia/about/AboutDialog.h | 37 +
.../src/vidalia/about/AboutDialog.ui | 108 +
.../src/vidalia/about/LicenseDialog.cpp | 41 +
.../src/vidalia/about/LicenseDialog.h | 43 +
.../src/vidalia/about/LicenseDialog.ui | 149 +
.../src/vidalia/bwgraph/BandwidthGraph.cpp | 268 ++
.../src/vidalia/bwgraph/BandwidthGraph.h | 78 +
.../src/vidalia/bwgraph/BandwidthGraph.ui | 485 +++
.../src/vidalia/bwgraph/GraphFrame.cpp | 321 ++
.../src/vidalia/bwgraph/GraphFrame.h | 118 +
.../src/vidalia/config/AbstractTorSettings.cpp | 131 +
.../src/vidalia/config/AbstractTorSettings.h | 81 +
.../src/vidalia/config/AdvancedPage.cpp | 308 ++
.../src/vidalia/config/AdvancedPage.h | 86 +
.../src/vidalia/config/AdvancedPage.ui | 353 ++
.../src/vidalia/config/AppearancePage.cpp | 89 +
.../src/vidalia/config/AppearancePage.h | 53 +
.../src/vidalia/config/AppearancePage.ui | 130 +
.../src/vidalia/config/BridgeDownloader.cpp | 162 +
.../src/vidalia/config/BridgeDownloader.h | 126 +
.../config/BridgeDownloaderProgressDialog.cpp | 91 +
.../config/BridgeDownloaderProgressDialog.h | 84 +
.../config/BridgeDownloaderProgressDialog.ui | 73 +
.../src/vidalia/config/BridgeUsageDialog.cpp | 81 +
.../src/vidalia/config/BridgeUsageDialog.h | 53 +
.../src/vidalia/config/BridgeUsageDialog.ui | 110 +
.../src/vidalia/config/ConfigDialog.cpp | 300 ++
.../src/vidalia/config/ConfigDialog.h | 93 +
.../src/vidalia/config/ConfigDialog.ui | 94 +
.../src/vidalia/config/ConfigPage.h | 71 +
.../src/vidalia/config/ConfigPageStack.cpp | 71 +
.../src/vidalia/config/ConfigPageStack.h | 56 +
.../src/vidalia/config/DomainValidator.cpp | 30 +
.../src/vidalia/config/DomainValidator.h | 33 +
.../src/vidalia/config/ExitPolicy.cpp | 165 +
.../src/vidalia/config/ExitPolicy.h | 77 +
.../src/vidalia/config/GeneralPage.cpp | 150 +
.../src/vidalia/config/GeneralPage.h | 72 +
.../src/vidalia/config/GeneralPage.ui | 219 ++
.../src/vidalia/config/IpValidator.cpp | 51 +
.../src/vidalia/config/IpValidator.h | 35 +
.../src/vidalia/config/NetworkPage.cpp | 481 +++
.../src/vidalia/config/NetworkPage.h | 101 +
.../src/vidalia/config/NetworkPage.ui | 527 +++
.../src/vidalia/config/NetworkSettings.cpp | 340 ++
.../src/vidalia/config/NetworkSettings.h | 112 +
.../src/vidalia/config/NicknameValidator.cpp | 44 +
.../src/vidalia/config/NicknameValidator.h | 35 +
.../src/vidalia/config/Policy.cpp | 196 +
.../src/vidalia/config/Policy.h | 81 +
.../src/vidalia/config/PortValidator.cpp | 39 +
.../src/vidalia/config/PortValidator.h | 35 +
.../src/vidalia/config/ServerPage.cpp | 612 +++
.../src/vidalia/config/ServerPage.h | 127 +
.../src/vidalia/config/ServerPage.ui | 1061 +++++
.../src/vidalia/config/ServerSettings.cpp | 417 ++
.../src/vidalia/config/ServerSettings.h | 116 +
.../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 | 390 ++
.../src/vidalia/config/TorSettings.h | 121 +
.../src/vidalia/config/UPNPControl.cpp | 165 +
.../src/vidalia/config/UPNPControl.h | 114 +
.../src/vidalia/config/UPNPControlThread.cpp | 332 ++
.../src/vidalia/config/UPNPControlThread.h | 92 +
.../src/vidalia/config/UPNPTestDialog.cpp | 168 +
.../src/vidalia/config/UPNPTestDialog.h | 89 +
.../src/vidalia/config/UPNPTestDialog.ui | 100 +
.../src/vidalia/config/VSettings.cpp | 106 +
.../src/vidalia/config/VSettings.h | 67 +
.../src/vidalia/config/VidaliaSettings.cpp | 296 ++
.../src/vidalia/config/VidaliaSettings.h | 121 +
.../src/vidalia/help/browser/HelpBrowser.cpp | 459 +++
.../src/vidalia/help/browser/HelpBrowser.h | 101 +
.../src/vidalia/help/browser/HelpBrowser.ui | 684 ++++
.../src/vidalia/help/browser/HelpTextBrowser.cpp | 99 +
.../src/vidalia/help/browser/HelpTextBrowser.h | 42 +
.../src/vidalia/help/content/content.qrc | 77 +
.../src/vidalia/help/content/de/config.html | 82 +
.../src/vidalia/help/content/de/contents.xml | 47 +
.../src/vidalia/help/content/de/index.html | 42 +
.../src/vidalia/help/content/de/links.html | 83 +
.../src/vidalia/help/content/de/log.html | 126 +
.../src/vidalia/help/content/de/netview.html | 184 +
.../src/vidalia/help/content/de/running.html | 107 +
.../src/vidalia/help/content/de/server.html | 150 +
.../vidalia/help/content/de/troubleshooting.html | 105 +
.../src/vidalia/help/content/en/bridges.html | 69 +
.../src/vidalia/help/content/en/config.html | 198 +
.../src/vidalia/help/content/en/contents.xml | 66 +
.../src/vidalia/help/content/en/index.html | 40 +
.../src/vidalia/help/content/en/links.html | 83 +
.../src/vidalia/help/content/en/log.html | 105 +
.../src/vidalia/help/content/en/netview.html | 174 +
.../src/vidalia/help/content/en/running.html | 106 +
.../src/vidalia/help/content/en/server.html | 242 ++
.../src/vidalia/help/content/en/services.html | 146 +
.../vidalia/help/content/en/troubleshooting.html | 149 +
.../src/vidalia/help/content/fi/bridges.html | 53 +
.../src/vidalia/help/content/fi/config.html | 140 +
.../src/vidalia/help/content/fi/contents.xml | 63 +
.../src/vidalia/help/content/fi/index.html | 35 +
.../src/vidalia/help/content/fi/links.html | 83 +
.../src/vidalia/help/content/fi/log.html | 89 +
.../src/vidalia/help/content/fi/netview.html | 142 +
.../src/vidalia/help/content/fi/running.html | 89 +
.../src/vidalia/help/content/fi/server.html | 190 +
.../src/vidalia/help/content/fi/services.html | Bin 0 -> 13618 bytes
.../vidalia/help/content/fi/troubleshooting.html | 70 +
.../src/vidalia/help/content/fr/bridges.html | 74 +
.../src/vidalia/help/content/fr/config.html | 201 +
.../src/vidalia/help/content/fr/contents.xml | 62 +
.../src/vidalia/help/content/fr/index.html | 41 +
.../src/vidalia/help/content/fr/links.html | 83 +
.../src/vidalia/help/content/fr/log.html | 129 +
.../src/vidalia/help/content/fr/netview.html | 177 +
.../src/vidalia/help/content/fr/running.html | 106 +
.../src/vidalia/help/content/fr/server.html | 267 ++
.../src/vidalia/help/content/fr/services.html | 164 +
.../vidalia/help/content/fr/troubleshooting.html | 111 +
.../src/vidalia/help/content/ru/bridges.html | 71 +
.../src/vidalia/help/content/ru/config.html | 193 +
.../src/vidalia/help/content/ru/contents.xml | 56 +
.../src/vidalia/help/content/ru/index.html | 42 +
.../src/vidalia/help/content/ru/links.html | 82 +
.../src/vidalia/help/content/ru/log.html | 105 +
.../src/vidalia/help/content/ru/netview.html | 174 +
.../src/vidalia/help/content/ru/running.html | 105 +
.../src/vidalia/help/content/ru/server.html | 189 +
.../vidalia/help/content/ru/troubleshooting.html | 97 +
.../src/vidalia/help/content/sv/bridges.html | 69 +
.../src/vidalia/help/content/sv/config.html | 199 +
.../src/vidalia/help/content/sv/contents.xml | 63 +
.../src/vidalia/help/content/sv/index.html | 37 +
.../src/vidalia/help/content/sv/links.html | 83 +
.../src/vidalia/help/content/sv/log.html | 105 +
.../src/vidalia/help/content/sv/netview.html | 174 +
.../src/vidalia/help/content/sv/running.html | 99 +
.../src/vidalia/help/content/sv/server.html | 242 ++
.../src/vidalia/help/content/sv/services.html | 146 +
.../vidalia/help/content/sv/troubleshooting.html | 97 +
.../src/vidalia/help/content/zh_CN/config.html | 72 +
.../src/vidalia/help/content/zh_CN/contents.xml | 47 +
.../src/vidalia/help/content/zh_CN/index.html | 38 +
.../src/vidalia/help/content/zh_CN/links.html | 83 +
.../src/vidalia/help/content/zh_CN/log.html | 88 +
.../src/vidalia/help/content/zh_CN/netview.html | 174 +
.../src/vidalia/help/content/zh_CN/running.html | 96 +
.../src/vidalia/help/content/zh_CN/server.html | 152 +
.../help/content/zh_CN/troubleshooting.html | 76 +
.../src/vidalia/i18n/CMakeLists.txt | 89 +
.../src/vidalia/i18n/af/qt_af.po | 426 ++
.../src/vidalia/i18n/af/vidalia_af.po | 2682 +++++++++++++
.../src/vidalia/i18n/ar/qt_ar.po | 443 +++
.../src/vidalia/i18n/ar/vidalia_ar.po | 3377 ++++++++++++++++
.../src/vidalia/i18n/bg/qt_bg.po | 430 +++
.../src/vidalia/i18n/bg/vidalia_bg.po | 3292 ++++++++++++++++
.../src/vidalia/i18n/bms/qt_bms.po | 431 +++
.../src/vidalia/i18n/bms/vidalia_bms.po | 2776 +++++++++++++
.../src/vidalia/i18n/bo/qt_bo.po | 426 ++
.../src/vidalia/i18n/bo/vidalia_bo.po | 2682 +++++++++++++
.../src/vidalia/i18n/ca/qt_ca.po | 426 ++
.../src/vidalia/i18n/ca/vidalia_ca.po | 2682 +++++++++++++
.../src/vidalia/i18n/cs/qt_cs.po | 430 +++
.../src/vidalia/i18n/cs/vidalia_cs.po | 3293 ++++++++++++++++
.../src/vidalia/i18n/da/qt_da.po | 526 +++
.../src/vidalia/i18n/da/vidalia_da.po | 3252 ++++++++++++++++
.../src/vidalia/i18n/de/qt_de.po | 442 +++
.../src/vidalia/i18n/de/vidalia_de.po | 3367 ++++++++++++++++
.../src/vidalia/i18n/de_AT/vidalia_de_AT.po | 2682 +++++++++++++
.../src/vidalia/i18n/de_CH/vidalia_de_CH.po | 2682 +++++++++++++
.../src/vidalia/i18n/de_DE/vidalia_de_DE.po | 2682 +++++++++++++
.../src/vidalia/i18n/el/qt_el.po | 426 ++
.../src/vidalia/i18n/el/vidalia_el.po | 2717 +++++++++++++
.../src/vidalia/i18n/es/qt_es.po | 438 +++
.../src/vidalia/i18n/es/vidalia_es.po | 3306 ++++++++++++++++
.../src/vidalia/i18n/et/qt_et.po | 426 ++
.../src/vidalia/i18n/et/vidalia_et.po | 3292 ++++++++++++++++
.../src/vidalia/i18n/eu/qt_eu.po | 426 ++
.../src/vidalia/i18n/eu/vidalia_eu.po | 2682 +++++++++++++
.../src/vidalia/i18n/fa/qt_fa.po | 430 +++
.../src/vidalia/i18n/fa/vidalia_fa.po | 3295 ++++++++++++++++
.../src/vidalia/i18n/fi/qt_fi.po | 442 +++
.../src/vidalia/i18n/fi/vidalia_fi.po | 3355 ++++++++++++++++
.../src/vidalia/i18n/fr/qt_fr.po | 442 +++
.../src/vidalia/i18n/fr/vidalia_fr.po | 3357 ++++++++++++++++
.../src/vidalia/i18n/fur/qt_fur.po | 426 ++
.../src/vidalia/i18n/fur/vidalia_fur.po | 2682 +++++++++++++
.../src/vidalia/i18n/gl/qt_gl.po | 426 ++
.../src/vidalia/i18n/gl/vidalia_gl.po | 2682 +++++++++++++
.../src/vidalia/i18n/gu/qt_gu.po | 426 ++
.../src/vidalia/i18n/gu/vidalia_gu.po | 2681 +++++++++++++
.../src/vidalia/i18n/he/qt_he.po | 430 +++
.../src/vidalia/i18n/he/vidalia_he.po | 3293 ++++++++++++++++
.../src/vidalia/i18n/hi/qt_hi.po | 431 +++
.../src/vidalia/i18n/hi/vidalia_hi.po | 2683 +++++++++++++
.../src/vidalia/i18n/hr/qt_hr.po | 426 ++
.../src/vidalia/i18n/hr/vidalia_hr.po | 2682 +++++++++++++
.../src/vidalia/i18n/hu/qt_hu.po | 436 +++
.../src/vidalia/i18n/hu/vidalia_hu.po | 3293 ++++++++++++++++
.../src/vidalia/i18n/id/qt_id.po | 426 ++
.../src/vidalia/i18n/id/vidalia_id.po | 2682 +++++++++++++
.../src/vidalia/i18n/is/qt_is.po | 426 ++
.../src/vidalia/i18n/is/vidalia_is.po | 2682 +++++++++++++
.../src/vidalia/i18n/it/qt_it.po | 447 +++
.../src/vidalia/i18n/it/vidalia_it.po | 3349 ++++++++++++++++
.../src/vidalia/i18n/ja/qt_ja.po | 440 +++
.../src/vidalia/i18n/ja/vidalia_ja.po | 3292 ++++++++++++++++
.../src/vidalia/i18n/ka/qt_ka.po | 426 ++
.../src/vidalia/i18n/ka/vidalia_ka.po | 2682 +++++++++++++
.../src/vidalia/i18n/km/qt_km.po | 426 ++
.../src/vidalia/i18n/km/vidalia_km.po | 2682 +++++++++++++
.../src/vidalia/i18n/ko/qt_ko.po | 426 ++
.../src/vidalia/i18n/ko/vidalia_ko.po | 2682 +++++++++++++
.../src/vidalia/i18n/ku/qt_ku.po | 426 ++
.../src/vidalia/i18n/ku/vidalia_ku.po | 2682 +++++++++++++
.../src/vidalia/i18n/mt/qt_mt.po | 426 ++
.../src/vidalia/i18n/mt/vidalia_mt.po | 2682 +++++++++++++
.../src/vidalia/i18n/nb/qt_nb.po | 442 +++
.../src/vidalia/i18n/nb/vidalia_nb.po | 3370 ++++++++++++++++
.../src/vidalia/i18n/nl/qt_nl.po | 444 +++
.../src/vidalia/i18n/nl/vidalia_nl.po | 3310 ++++++++++++++++
.../src/vidalia/i18n/pa/qt_pa.po | 426 ++
.../src/vidalia/i18n/pa/vidalia_pa.po | 2682 +++++++++++++
.../src/vidalia/i18n/pl/qt_pl.po | 443 +++
.../src/vidalia/i18n/pl/vidalia_pl.po | 3342 ++++++++++++++++
.../src/vidalia/i18n/pt/qt_pt.po | 442 +++
.../src/vidalia/i18n/pt/vidalia_pt.po | 3321 ++++++++++++++++
.../src/vidalia/i18n/pt_BR/qt_pt_BR.po | 426 ++
.../src/vidalia/i18n/pt_BR/vidalia_pt_BR.po | 2765 +++++++++++++
.../src/vidalia/i18n/ro/qt_ro.po | 443 +++
.../src/vidalia/i18n/ro/vidalia_ro.po | 3334 ++++++++++++++++
.../src/vidalia/i18n/ru/qt_ru.po | 443 +++
.../src/vidalia/i18n/ru/vidalia_ru.po | 3425 +++++++++++++++++
.../src/vidalia/i18n/sl/qt_sl.po | 431 +++
.../src/vidalia/i18n/sl/vidalia_sl.po | 4063 ++++++++++++++++++++
.../src/vidalia/i18n/sq/qt_sq.po | 430 +++
.../src/vidalia/i18n/sq/vidalia_sq.po | 3293 ++++++++++++++++
.../src/vidalia/i18n/sr/qt_sr.po | 426 ++
.../src/vidalia/i18n/sr/vidalia_sr.po | 3292 ++++++++++++++++
.../src/vidalia/i18n/sv/qt_sv.po | 438 +++
.../src/vidalia/i18n/sv/vidalia_sv.po | 3292 ++++++++++++++++
.../src/vidalia/i18n/sw/qt_sw.po | 426 ++
.../src/vidalia/i18n/sw/vidalia_sw.po | 2682 +++++++++++++
.../src/vidalia/i18n/templates/qt.pot | 427 ++
.../src/vidalia/i18n/templates/vidalia.pot | 3293 ++++++++++++++++
.../src/vidalia/i18n/th/qt_th.po | 431 +++
.../src/vidalia/i18n/th/vidalia_th.po | 2792 ++++++++++++++
.../src/vidalia/i18n/tr/qt_tr.po | 438 +++
.../src/vidalia/i18n/tr/vidalia_tr.po | 3307 ++++++++++++++++
.../src/vidalia/i18n/uk/qt_uk.po | 431 +++
.../src/vidalia/i18n/uk/vidalia_uk.po | 2685 +++++++++++++
.../src/vidalia/i18n/vi/qt_vi.po | 121 +
.../src/vidalia/i18n/vi/vidalia_vi.po | 2663 +++++++++++++
.../src/vidalia/i18n/vidalia_i18n.qrc | 63 +
.../src/vidalia/i18n/zh_CN/qt_zh_CN.po | 438 +++
.../src/vidalia/i18n/zh_CN/vidalia_zh_CN.po | 3318 ++++++++++++++++
.../src/vidalia/i18n/zh_HK/qt_zh_HK.po | 426 ++
.../src/vidalia/i18n/zh_HK/vidalia_zh_HK.po | 2682 +++++++++++++
.../src/vidalia/i18n/zh_TW/qt_zh_TW.po | 436 +++
.../src/vidalia/i18n/zh_TW/vidalia_zh_TW.po | 3293 ++++++++++++++++
.../src/vidalia/log/LogFile.cpp | 117 +
.../src/vidalia/log/LogFile.h | 58 +
.../src/vidalia/log/LogHeaderView.cpp | 45 +
.../src/vidalia/log/LogHeaderView.h | 36 +
.../src/vidalia/log/LogMessageColumnDelegate.cpp | 39 +
.../src/vidalia/log/LogMessageColumnDelegate.h | 38 +
.../src/vidalia/log/LogTreeItem.cpp | 167 +
.../src/vidalia/log/LogTreeItem.h | 67 +
.../src/vidalia/log/LogTreeWidget.cpp | 267 ++
.../src/vidalia/log/LogTreeWidget.h | 95 +
.../src/vidalia/log/MessageLog.cpp | 483 +++
.../src/vidalia/log/MessageLog.h | 99 +
.../src/vidalia/log/MessageLog.ui | 745 ++++
.../src/vidalia/log/StatusEventItem.cpp | 110 +
.../src/vidalia/log/StatusEventItem.h | 121 +
.../src/vidalia/log/StatusEventItemDelegate.cpp | 180 +
.../src/vidalia/log/StatusEventItemDelegate.h | 71 +
.../src/vidalia/log/StatusEventWidget.cpp | 614 +++
.../src/vidalia/log/StatusEventWidget.h | 234 ++
.../vidalia-0.2.9-1+squeeze1/src/vidalia/main.cpp | 222 ++
.../src/vidalia/network/CircuitItem.cpp | 76 +
.../src/vidalia/network/CircuitItem.h | 55 +
.../src/vidalia/network/CircuitListWidget.cpp | 363 ++
.../src/vidalia/network/CircuitListWidget.h | 106 +
.../src/vidalia/network/GeoIp.cpp | 75 +
.../src/vidalia/network/GeoIp.h | 96 +
.../src/vidalia/network/GeoIpCache.cpp | 160 +
.../src/vidalia/network/GeoIpCache.h | 87 +
.../src/vidalia/network/GeoIpCacheItem.cpp | 183 +
.../src/vidalia/network/GeoIpCacheItem.h | 97 +
.../src/vidalia/network/GeoIpRequest.cpp | 80 +
.../src/vidalia/network/GeoIpRequest.h | 62 +
.../src/vidalia/network/GeoIpResolver.cpp | 283 ++
.../src/vidalia/network/GeoIpResolver.h | 86 +
.../src/vidalia/network/GeoIpResponse.cpp | 137 +
.../src/vidalia/network/GeoIpResponse.h | 58 +
.../src/vidalia/network/NetViewer.cpp | 570 +++
.../src/vidalia/network/NetViewer.h | 154 +
.../src/vidalia/network/NetViewer.ui | 393 ++
.../src/vidalia/network/RouterDescriptorView.cpp | 143 +
.../src/vidalia/network/RouterDescriptorView.h | 56 +
.../src/vidalia/network/RouterInfoDialog.cpp | 79 +
.../src/vidalia/network/RouterInfoDialog.h | 59 +
.../src/vidalia/network/RouterInfoDialog.ui | 449 +++
.../src/vidalia/network/RouterListItem.cpp | 150 +
.../src/vidalia/network/RouterListItem.h | 66 +
.../src/vidalia/network/RouterListWidget.cpp | 240 ++
.../src/vidalia/network/RouterListWidget.h | 97 +
.../src/vidalia/network/StreamItem.cpp | 38 +
.../src/vidalia/network/StreamItem.h | 42 +
.../src/vidalia/network/TorMapImageView.cpp | 333 ++
.../src/vidalia/network/TorMapImageView.h | 87 +
.../src/vidalia/network/TorMapWidget.cpp | 286 ++
.../src/vidalia/network/TorMapWidget.h | 89 +
.../vidalia/network/TorMapWidgetInputHandler.cpp | 138 +
.../src/vidalia/network/TorMapWidgetInputHandler.h | 55 +
.../src/vidalia/network/TorMapWidgetPopupMenu.cpp | 90 +
.../src/vidalia/network/TorMapWidgetPopupMenu.h | 81 +
.../src/vidalia/network/ZImageView.cpp | 374 ++
.../src/vidalia/network/ZImageView.h | 88 +
.../src/vidalia/res/128x128/tor-logo.png | Bin 0 -> 9309 bytes
.../src/vidalia/res/128x128/tor-off.png | Bin 0 -> 9864 bytes
.../src/vidalia/res/128x128/tor-on.png | Bin 0 -> 7968 bytes
.../src/vidalia/res/128x128/tor-starting.png | Bin 0 -> 7399 bytes
.../src/vidalia/res/128x128/tor-stopping.png | Bin 0 -> 6661 bytes
.../src/vidalia/res/16x16/application-exit.png | Bin 0 -> 842 bytes
.../vidalia/res/16x16/applications-internet.png | Bin 0 -> 939 bytes
.../src/vidalia/res/16x16/applications-system.png | Bin 0 -> 776 bytes
.../src/vidalia/res/16x16/dialog-information.png | Bin 0 -> 803 bytes
.../src/vidalia/res/16x16/dialog-warning.png | Bin 0 -> 596 bytes
.../src/vidalia/res/16x16/emblem-important.png | Bin 0 -> 752 bytes
.../src/vidalia/res/16x16/format-justify-fill.png | Bin 0 -> 500 bytes
.../src/vidalia/res/16x16/graph-area.png | Bin 0 -> 304 bytes
.../src/vidalia/res/16x16/graph-line.png | Bin 0 -> 278 bytes
.../src/vidalia/res/16x16/help-about.png | Bin 0 -> 734 bytes
.../src/vidalia/res/16x16/media-playback-start.png | Bin 0 -> 501 bytes
.../src/vidalia/res/16x16/media-playback-stop.png | Bin 0 -> 499 bytes
.../res/16x16/preferences-desktop-notification.png | Bin 0 -> 860 bytes
.../src/vidalia/res/16x16/preferences-system.png | Bin 0 -> 874 bytes
.../src/vidalia/res/16x16/system-help.png | Bin 0 -> 886 bytes
.../src/vidalia/res/16x16/system-run.png | Bin 0 -> 910 bytes
.../src/vidalia/res/16x16/tor-logo.png | Bin 0 -> 3425 bytes
.../src/vidalia/res/16x16/tor-off.png | Bin 0 -> 3437 bytes
.../src/vidalia/res/16x16/tor-on.png | Bin 0 -> 3279 bytes
.../src/vidalia/res/16x16/tor-starting.png | Bin 0 -> 3247 bytes
.../src/vidalia/res/16x16/tor-stopping.png | Bin 0 -> 3200 bytes
.../src/vidalia/res/16x16/utilities-log-viewer.png | Bin 0 -> 564 bytes
.../vidalia/res/16x16/utilities-system-monitor.png | Bin 0 -> 578 bytes
.../src/vidalia/res/16x16/view-media-artist.png | Bin 0 -> 409 bytes
.../src/vidalia/res/22x22/application-exit.png | Bin 0 -> 1134 bytes
.../src/vidalia/res/22x22/dialog-password.png | Bin 0 -> 1072 bytes
.../src/vidalia/res/22x22/edit-copy.png | Bin 0 -> 644 bytes
.../src/vidalia/res/22x22/edit-delete.png | Bin 0 -> 1121 bytes
.../src/vidalia/res/22x22/folder.png | Bin 0 -> 605 bytes
.../src/vidalia/res/22x22/format-justify-fill.png | Bin 0 -> 633 bytes
.../src/vidalia/res/22x22/go-down-search.png | Bin 0 -> 838 bytes
.../src/vidalia/res/22x22/go-up-search.png | Bin 0 -> 820 bytes
.../src/vidalia/res/22x22/help-about.png | Bin 0 -> 1041 bytes
.../src/vidalia/res/22x22/list-add.png | Bin 0 -> 907 bytes
.../src/vidalia/res/22x22/list-remove.png | Bin 0 -> 498 bytes
.../src/vidalia/res/22x22/page-zoom.png | Bin 0 -> 1125 bytes
.../src/vidalia/res/22x22/preferences-system.png | Bin 0 -> 1350 bytes
.../src/vidalia/res/22x22/system-help.png | Bin 0 -> 1222 bytes
.../src/vidalia/res/22x22/tor-logo.png | Bin 0 -> 3971 bytes
.../src/vidalia/res/22x22/tor-off.png | Bin 0 -> 3744 bytes
.../src/vidalia/res/22x22/tor-on.png | Bin 0 -> 3466 bytes
.../src/vidalia/res/22x22/tor-starting.png | Bin 0 -> 3364 bytes
.../src/vidalia/res/22x22/tor-stopping.png | Bin 0 -> 3349 bytes
.../vidalia/res/22x22/utilities-system-monitor.png | Bin 0 -> 947 bytes
.../vidalia/res/32x32/applications-internet.png | Bin 0 -> 2683 bytes
.../src/vidalia/res/32x32/applications-system.png | Bin 0 -> 1836 bytes
.../src/vidalia/res/32x32/dialog-ok-apply.png | Bin 0 -> 1218 bytes
.../src/vidalia/res/32x32/dialog-warning.png | Bin 0 -> 1354 bytes
.../src/vidalia/res/32x32/document-save-all.png | Bin 0 -> 1351 bytes
.../src/vidalia/res/32x32/document-save.png | Bin 0 -> 1263 bytes
.../src/vidalia/res/32x32/edit-clear.png | Bin 0 -> 2102 bytes
.../src/vidalia/res/32x32/edit-copy.png | Bin 0 -> 860 bytes
.../src/vidalia/res/32x32/edit-delete.png | Bin 0 -> 1333 bytes
.../src/vidalia/res/32x32/edit-find.png | Bin 0 -> 1834 bytes
.../src/vidalia/res/32x32/edit-select-all.png | Bin 0 -> 1277 bytes
.../src/vidalia/res/32x32/format-justify-fill.png | Bin 0 -> 673 bytes
.../src/vidalia/res/32x32/go-home.png | Bin 0 -> 1332 bytes
.../src/vidalia/res/32x32/go-next.png | Bin 0 -> 1473 bytes
.../src/vidalia/res/32x32/go-previous.png | Bin 0 -> 1536 bytes
.../src/vidalia/res/32x32/help-about.png | Bin 0 -> 1491 bytes
.../src/vidalia/res/32x32/network-workgroup.png | Bin 0 -> 2226 bytes
.../res/32x32/preferences-desktop-locale.png | Bin 0 -> 2442 bytes
.../src/vidalia/res/32x32/preferences-other.png | Bin 0 -> 2256 bytes
.../32x32/preferences-system-network-sharing.png | Bin 0 -> 1933 bytes
.../res/32x32/preferences-system-network.png | Bin 0 -> 2685 bytes
.../src/vidalia/res/32x32/preferences-system.png | Bin 0 -> 2171 bytes
.../src/vidalia/res/32x32/script-error.png | Bin 0 -> 1709 bytes
.../src/vidalia/res/32x32/security-low.png | Bin 0 -> 1650 bytes
.../src/vidalia/res/32x32/security-medium.png | Bin 0 -> 1638 bytes
.../src/vidalia/res/32x32/services.png | Bin 0 -> 1153 bytes
.../src/vidalia/res/32x32/system-help.png | Bin 0 -> 2120 bytes
.../vidalia/res/32x32/system-software-update.png | Bin 0 -> 2588 bytes
.../src/vidalia/res/32x32/tor-logo.png | Bin 0 -> 3957 bytes
.../src/vidalia/res/32x32/tor-off.png | Bin 0 -> 4271 bytes
.../src/vidalia/res/32x32/tor-on.png | Bin 0 -> 3789 bytes
.../src/vidalia/res/32x32/tor-starting.png | Bin 0 -> 3729 bytes
.../src/vidalia/res/32x32/tor-stopping.png | Bin 0 -> 3625 bytes
.../src/vidalia/res/32x32/utilities-log-viewer.png | Bin 0 -> 1279 bytes
.../vidalia/res/32x32/utilities-system-monitor.png | Bin 0 -> 1446 bytes
.../src/vidalia/res/32x32/view-fullscreen.png | Bin 0 -> 1007 bytes
.../src/vidalia/res/32x32/view-refresh.png | Bin 0 -> 2182 bytes
.../src/vidalia/res/32x32/window-close.png | Bin 0 -> 2085 bytes
.../src/vidalia/res/32x32/zoom-fit-best.png | Bin 0 -> 1866 bytes
.../src/vidalia/res/32x32/zoom-in.png | Bin 0 -> 1871 bytes
.../src/vidalia/res/32x32/zoom-out.png | Bin 0 -> 1866 bytes
.../vidalia/res/48x48/applications-internet.png | Bin 0 -> 5158 bytes
.../src/vidalia/res/48x48/chronometer.png | Bin 0 -> 14551 bytes
.../src/vidalia/res/48x48/dialog-password.png | Bin 0 -> 2696 bytes
.../src/vidalia/res/48x48/media-playback-start.png | Bin 0 -> 1932 bytes
.../src/vidalia/res/48x48/media-playback-stop.png | Bin 0 -> 1891 bytes
.../src/vidalia/res/48x48/modem.png | Bin 0 -> 2101 bytes
.../src/vidalia/res/48x48/network-connect.png | Bin 0 -> 2879 bytes
.../src/vidalia/res/48x48/network-wired.png | Bin 0 -> 2016 bytes
.../src/vidalia/res/48x48/network-workgroup.png | Bin 0 -> 4001 bytes
.../48x48/preferences-system-network-sharing.png | Bin 0 -> 3411 bytes
.../vidalia/res/48x48/system-software-update.png | Bin 0 -> 4803 bytes
.../src/vidalia/res/48x48/tor-logo.png | Bin 0 -> 4662 bytes
.../src/vidalia/res/48x48/tor-off.png | Bin 0 -> 4992 bytes
.../src/vidalia/res/48x48/tor-on.png | Bin 0 -> 4533 bytes
.../src/vidalia/res/48x48/tor-starting.png | Bin 0 -> 4358 bytes
.../src/vidalia/res/48x48/tor-stopping.png | Bin 0 -> 4155 bytes
.../src/vidalia/res/48x48/view-media-artist.png | Bin 0 -> 5256 bytes
.../src/vidalia/res/64x64/tor-logo.png | Bin 0 -> 6867 bytes
.../src/vidalia/res/EquifaxSecureCA.crt | 19 +
.../src/vidalia/res/cacert_root.crt | 41 +
.../src/vidalia/res/credits.html | 71 +
.../src/vidalia/res/flags/ae.png | Bin 0 -> 1048 bytes
.../src/vidalia/res/flags/af.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/al.png | Bin 0 -> 1061 bytes
.../src/vidalia/res/flags/am.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/an.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/ao.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/ar.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/at.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/au.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/aw.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/az.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/ba.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/bb.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/bd.png | Bin 0 -> 1061 bytes
.../src/vidalia/res/flags/be.png | Bin 0 -> 1060 bytes
.../src/vidalia/res/flags/bf.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/bg.png | Bin 0 -> 602 bytes
.../src/vidalia/res/flags/bh.png | Bin 0 -> 1052 bytes
.../src/vidalia/res/flags/bi.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/bj.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/bm.png | Bin 0 -> 1057 bytes
.../src/vidalia/res/flags/bn.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/bo.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/br.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/bs.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/bt.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/bw.png | Bin 0 -> 1053 bytes
.../src/vidalia/res/flags/by.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/bz.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/ca.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/cf.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/cg.png | Bin 0 -> 1061 bytes
.../src/vidalia/res/flags/ch.png | Bin 0 -> 1045 bytes
.../src/vidalia/res/flags/ci.png | Bin 0 -> 1061 bytes
.../src/vidalia/res/flags/ck.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/cl.png | Bin 0 -> 1046 bytes
.../src/vidalia/res/flags/cm.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/cn.png | Bin 0 -> 645 bytes
.../src/vidalia/res/flags/co.png | Bin 0 -> 1051 bytes
.../src/vidalia/res/flags/cr.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/cs.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/cu.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/cv.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/cy.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/cz.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/de.png | Bin 0 -> 194 bytes
.../src/vidalia/res/flags/dk.png | Bin 0 -> 1058 bytes
.../src/vidalia/res/flags/dz.png | Bin 0 -> 1058 bytes
.../src/vidalia/res/flags/ec.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/ee.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/eg.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/er.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/es.png | Bin 0 -> 342 bytes
.../src/vidalia/res/flags/et.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/eu.png | Bin 0 -> 146 bytes
.../src/vidalia/res/flags/fi.png | Bin 0 -> 344 bytes
.../src/vidalia/res/flags/fj.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/fo.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/fr.png | Bin 0 -> 226 bytes
.../src/vidalia/res/flags/ga.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/gb.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/ge.png | Bin 0 -> 649 bytes
.../src/vidalia/res/flags/gi.png | Bin 0 -> 1060 bytes
.../src/vidalia/res/flags/gl.png | Bin 0 -> 1059 bytes
.../src/vidalia/res/flags/gp.png | Bin 0 -> 1051 bytes
.../src/vidalia/res/flags/gr.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/gt.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/gu.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/gy.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/hk.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/hr.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/ht.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/hu.png | Bin 0 -> 606 bytes
.../src/vidalia/res/flags/id.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/ie.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/il.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/in.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/iq.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/ir.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/is.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/it.png | Bin 0 -> 231 bytes
.../src/vidalia/res/flags/jm.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/jo.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/jp.png | Bin 0 -> 669 bytes
.../src/vidalia/res/flags/ke.png | Bin 0 -> 1060 bytes
.../src/vidalia/res/flags/kg.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/kh.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/ki.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/kp.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/kr.png | Bin 0 -> 1061 bytes
.../src/vidalia/res/flags/kw.png | Bin 0 -> 1032 bytes
.../src/vidalia/res/flags/ky.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/kz.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/lb.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/lc.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/lk.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/lt.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/lu.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/lv.png | Bin 0 -> 1053 bytes
.../src/vidalia/res/flags/ly.png | Bin 0 -> 644 bytes
.../src/vidalia/res/flags/ma.png | Bin 0 -> 104 bytes
.../src/vidalia/res/flags/mc.png | Bin 0 -> 1061 bytes
.../src/vidalia/res/flags/md.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/mg.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/mk.png | Bin 0 -> 294 bytes
.../src/vidalia/res/flags/mn.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/mo.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/mp.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/ms.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/mt.png | Bin 0 -> 647 bytes
.../src/vidalia/res/flags/mx.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/my.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/mz.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/na.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/nc.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/nf.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/nl.png | Bin 0 -> 607 bytes
.../src/vidalia/res/flags/no.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/np.png | Bin 0 -> 104 bytes
.../src/vidalia/res/flags/nr.png | Bin 0 -> 1059 bytes
.../src/vidalia/res/flags/nz.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/om.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/pa.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/pe.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/pf.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/ph.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/pk.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/pl.png | Bin 0 -> 583 bytes
.../src/vidalia/res/flags/pm.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/pr.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/pt.png | Bin 0 -> 355 bytes
.../src/vidalia/res/flags/py.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/qa.png | Bin 0 -> 668 bytes
.../src/vidalia/res/flags/ro.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/ru.png | Bin 0 -> 232 bytes
.../src/vidalia/res/flags/sa.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/sb.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/sd.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/se.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/sg.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/si.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/sk.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/sl.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/sm.png | Bin 0 -> 946 bytes
.../src/vidalia/res/flags/so.png | Bin 0 -> 1054 bytes
.../src/vidalia/res/flags/sy.png | Bin 0 -> 104 bytes
.../src/vidalia/res/flags/tc.png | Bin 0 -> 1061 bytes
.../src/vidalia/res/flags/tg.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/th.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/tn.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/to.png | Bin 0 -> 670 bytes
.../src/vidalia/res/flags/tp.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/tr.png | Bin 0 -> 1050 bytes
.../src/vidalia/res/flags/tt.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/tv.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/tw.png | Bin 0 -> 654 bytes
.../src/vidalia/res/flags/tz.png | Bin 0 -> 1061 bytes
.../src/vidalia/res/flags/ua.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/ug.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/unknown.png | Bin 0 -> 280 bytes
.../src/vidalia/res/flags/us.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/uy.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/va.png | Bin 0 -> 1063 bytes
.../src/vidalia/res/flags/ve.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/vg.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/vi.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/vn.png | Bin 0 -> 1059 bytes
.../src/vidalia/res/flags/ws.png | Bin 0 -> 1048 bytes
.../src/vidalia/res/flags/ye.png | Bin 0 -> 1062 bytes
.../src/vidalia/res/flags/za.png | Bin 0 -> 1064 bytes
.../src/vidalia/res/flags/zw.png | Bin 0 -> 269 bytes
.../src/vidalia/res/icons/node-bw-high.png | Bin 0 -> 132 bytes
.../src/vidalia/res/icons/node-bw-low.png | Bin 0 -> 129 bytes
.../src/vidalia/res/icons/node-bw-med.png | Bin 0 -> 130 bytes
.../src/vidalia/res/icons/node-bw-none.png | Bin 0 -> 112 bytes
.../src/vidalia/res/icons/node-hibernating.png | Bin 0 -> 180 bytes
.../src/vidalia/res/icons/node-unresponsive.png | Bin 0 -> 146 bytes
.../src/vidalia/res/icons/placemark-relay.png | Bin 0 -> 255 bytes
.../src/vidalia/res/icons/tor-off.icns | Bin 0 -> 47571 bytes
.../src/vidalia/res/icons/tor-on.icns | Bin 0 -> 35464 bytes
.../src/vidalia/res/icons/tor-starting.icns | Bin 0 -> 34067 bytes
.../src/vidalia/res/icons/tor-stopping.icns | Bin 0 -> 31033 bytes
.../src/vidalia/res/icons/vidalia.icns | Bin 0 -> 42887 bytes
.../src/vidalia/res/icons/vidalia.ico | Bin 0 -> 23934 bytes
.../src/vidalia/res/license.html | 379 ++
.../src/vidalia/res/map/world-map.png | Bin 0 -> 929168 bytes
.../src/vidalia/res/vidalia.qrc | 310 ++
.../src/vidalia/res/vidalia_win.rc.in | 46 +
.../src/vidalia}/vidalia.desktop | 0
testing-proposed-updates/vidalia_0.2.9.orig.tar.gz | Bin 0 -> 3049123 bytes
948 files changed, 279758 insertions(+), 19 deletions(-)
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/CHANGELOG b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/CHANGELOG
new file mode 100644
index 0000000..9035bb6
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/CHANGELOG
@@ -0,0 +1,1046 @@
+0.2.9 20-May-2010
+ o Remove the GoDaddy CA certificate bundle since we changed the
+ certificate used to authenticate connections to
+ geoips.vidalia-project.net for downloading GeoIP information from a
+ commercial GoDaddy certificate to a free CACert certificate.
+ o Define -D_WIN32_WINNT=0x0501 on Windows builds so that MiniUPnPc will
+ build with the latest versions of MinGW.
+ o Modify miniupnpc.c from MiniUPnPc's source so that it will build on
+ Mac OS X 10.4.
+ o Work around Qt's new behavior for the QT_WA macro so that Vidalia will
+ work correctly again on Windows with Qt >= 4.6.
+ o Force CMake to include the *_RELEASE versions of Qt libraries when
+ building a .dmg on Mac OS X, so that it will work with CMake >= 2.8 as
+ well.
+ o Explicitly link zlib into src/common to avoid link errors on some
+ older versions of Mac OS X.
+ o Add Danish, Brazilian Portguese and Vietnamese translations.
+
+
+0.2.8 11-Apr-2010
+ o Stop using our custom dock icon implementation on OS X and just use
+ QSystemTrayIcon everywhere. Fixes the build on Snow Leopard.
+ (Ticket #562)
+ o Update the bundled CA certificates to re-enable downloading bridges
+ from bridges.torproject.org via SSL.
+ o Include a pre-configured qt.conf file in the Mac OS X bundles that
+ disable Qt plugin loading from the default directories. Otherwise,
+ users who have Qt installed in a system-wide location would end up
+ loading the libraries twice and crashing.
+ o Include libgcc_s_dw2-1.dll in the Windows installers, since Qt 4.6 now
+ depends on that DLL. Including the .dll is currently hardcoded, so the
+ Windows installer must be built using Qt 4.6. (Ticket #555)
+ o Update the included version of miniupnpc to 1.4.20100407.
+ o Add Burmese and Thai UI translations.
+
+
+0.2.7 25-Jan-2010
+ o Remove the explicit palette set for the configuration dialog that
+ prevented the dialog from inheriting colors from the user's current
+ system theme. (Ticket #485. Patch from mkirk.)
+ o Correct the path to the badge pixmap used in time skew warning
+ messages. (Ticket #537. Patch from mkirk.)
+ o Fix compilation on Debian GNU/kFreeBSD. Patch from dererk.
+ o Clean up a couple status event messages related to dangerous port
+ warnings.
+ o Change the vidalia_ru.nsh output encoding from KOI8-R to Windows-1251.
+ (Ticket #527)
+ o Add an option for building an OS X 10.4 compatible binary.
+
+
+0.2.6 02-Nov-2009
+ o Remove the erroneous comma in the default vidalia.conf in the
+ Mac OS X drag-and-drop bundle, since we now dump whatever the
+ user types into a QString rather than parsing it into a
+ QStringList.
+ o Updated the Arabic, Russian and Slovenian translations.
+
+
+0.2.5 14-Oct-2009
+ o Add support in the Network settings page for configuring the
+ Socks4Proxy and Socks5Proxy* options that were added in
+ Tor 0.2.2.1-alpha. Patch from Christopher Davis.
+ o Add a "Automatically distribute my bridge address" checkbox (enabled
+ by default) to the bridge relay settings options. (Ticket #524)
+ o Add ports 7000 and 7001 to the list of ports excluded by the IRC
+ category in the exit policy configuration tab. (Ticket #517)
+ o Add a context menu for highlighted event items in the "Basic" message
+ log view that allows the user to copy the selected item text to the
+ clipboard.
+ o Maybe fix a time conversion bug that could result in Vidalia
+ displaying the wrong uptime for a relay in the network map.
+ o Stop trying to enforce proper quoting and escaping of arguments to be
+ given to the proxy executable (e.g., Polipo). Now the user is on their
+ own for properly formatting the command line used to start the proxy
+ executable. (Ticket #523)
+
+
+0.2.4 07-Sep-2009
+ o Split the message log into "Basic" and "Advanced" views. The
+ "Advanced" view contains standard log messages from Tor, while the new
+ experimental "Basic" view displays status events received from Tor.
+ (Ticket #265)
+ o Apply an application-global stylesheet on OS X that forces all tree
+ widgets in Vidalia to use the 12pt font recommended by Apple's human
+ interface guidelines.
+ o Add an OSX_FORCE_32BIT CMake option that can be used to force a 32-bit
+ build on Mac OS X versions that default to 64-bit builds (e.g., Snow
+ Leopard), if only 32-bit versions of the Qt libraries are available.
+ o Fix a bug introduced in 0.2.3 that prevented Vidalia from correctly
+ responding to ADDRMAP events from Tor. The result was that users would
+ sometimes see IP addresses in the connection list shown under the network
+ map rather than hostnames.
+ o Fix a bug in the default "bootstrap" vidalia.conf file included in the
+ OS X drag-and-drop bundles that pointed to a non-existent Polipo
+ configuration file, causing Polipo to fail on startup.
+
+
+0.2.3 27-Aug-2009
+ o Create the data directory before trying to copy over the default
+ Vidalia configuration file from inside the application bundle on Mac
+ OS X. Affects only OS X drag-and-drop installer users without a
+ previous Vidalia installation.
+ o Change all Tor event handling to use Qt's signals and slots mechanism
+ instead of custom QEvent subclasses.
+ o Fix another bug that resulted in the "Who has used my bridge?" link
+ initially being visible when the user clicks "Setup Relaying" from
+ the control panel if they are running a non-bridge relay.
+ (Ticket #509, reported by "vrapp")
+ o Always hide the "Who has used my bridge?" link when Tor isn't running,
+ since clicking it won't return useful information until Tor actually
+ is running.
+
+
+0.2.2 14-Aug-2009
+ o When the user clicks "Browse" in the Advanced settings page to locate
+ a new torrc, set the initial directory shown in the file dialog to the
+ current location of the user's torrc. (Ticket #505)
+ o Use 'ditto' to strip the architectures we don't want from the Qt
+ frameworks installed into the app bundle with the dist-osx,
+ dist-osx-bundle and dist-osx-split-bundle build targets.
+ o Fix a bug in the CMakeLists.txt files for ts2po and po2ts that caused
+ build errors on Panther for those two tools.
+ o Include rebuilt OpenSSL libraries in the Windows packages that are
+ built with the static (/MT) version of the Microsoft Visual C++
+ Runtime. Otherwise, we would require users to install the MSVC
+ Redistributable, which doesn't work for portable installations such as
+ the Tor Browser Bundle.
+ o Remove the NSIS file for the Vidalia installer since we now ship
+ MSI-based installers on Windows.
+
+
+0.2.1 03-Aug-2009
+ o Add a "Find Bridges Now" button that will attempt to automatically
+ download a set of bridge addresses and add them to the list of bridges
+ in the Network settings page.
+ o Add support for building with Google's Breakpad crash reporting
+ library (currently disabled by default).
+ o Show or hide the "Who has used my bridge recently?" link along with
+ the other bridge-related widgets when the user toggles the relay mode
+ in the Network settings page. (Ticket #480)
+ o Tolerate bridge addresses that do not specify a port number, since Tor
+ now defaults to using port 443 in such cases.
+ o Add support for viewing the map as a full screen widget when built
+ with KDE Marble support.
+ o Compute the salted hash of the control password ourself when starting
+ Tor, rather than launching Tor once to hash the password, parsing the
+ output, and then again to actually start Tor.
+ o Add a signal handler that allows Vidalia to clean up and exit normally
+ when it catches a SIGINT or SIGTERM signal. (Ticket #481)
+ o If the user chooses to ignore further warnings for a particular port,
+ remove it from the WarnPlaintextPorts and RejectPlaintextPorts
+ settings immediately. Also remember their preferences and reapply them
+ later, even if Tor is unable to writes to its torrc.(Ticket #493)
+ o Don't display additional plaintext port warning message boxes until
+ the first visible message box is dismissed. (Ticket #493)
+ o Renamed the 'make win32-installer' CMake target to 'make dist-win32'
+ for consistency with our 'make dist-osx' target.
+ o Fix a couple bugs in the WiX-based Windows installer related to building
+ a Marble-enabled Vidalia installer.
+ o Write the list of source files containing translatable strings to a
+ .pro file and supply just the .pro file as an argument to lupdate, rather
+ than supplying all of the source file names themselves.
+
+
+0.1.15 09-Jul-2009
+ o Bump the minimum required Qt version to 4.3.0.
+ o Remove USE_QSSLSOCKET as a build option. If your Qt doesn't support
+ OpenSSL, then you don't get GeoIP lookups.
+ o Fix the TorPostFlight portion of the OS X bundle installer so it
+ doesn't fail when installing Torbutton.
+ o Include libeay32.dll in the Windows installers.
+
+
+0.1.14 29-Jun-2009
+ o Close the TorProcess more quickly after registering for log events, so
+ we avoid displaying duplicate log messages received over Tor's control
+ port and Tor's stdout log. (Ticket #484)
+ o Explicitly set CMAKE_OSX_SYSROOT to the 10.4 SDK rather than expecting
+ the packager to do so when building a Universal binary.
+ o Include Tor's geoip file in the Windows bundles.
+
+
+0.1.13 25-May-2009
+ o Remove an old warning on the relay settings page that running a bridge
+ relay requires Tor 0.2.0.8-alpha or newer.
+ o Add a workaround for a bug that prevented Vidalia's tray icon from
+ getting added to the system notification area on Gnome when Vidalia was
+ run on system startup. Patch by Steve Tyree. (Ticket #247)
+ o Fix a bug that prevented the control panel from displaying when
+ running on the Enlightenment window manager. Patch by Steve Tyree.
+ o Rename the CMake variables used to store the location of Qt's lupdate
+ and lrelease executables. Recent versions of CMake decided to use the
+ same variable name, which was stomping on mine, resulting in the wrong
+ lupdate and lrelease executables being used.
+ o Use the TorProcess subclass of QProcess for launching Tor when hashing
+ a control password so we can take advantage of its PATH+=:/usr/sbin
+ trick on Debian there too.
+ o If a RouterDescriptor object is empty, don't try to display it in the
+ router descriptor details viewer. (Ticket #479)
+ o Wait until Vidalia has registered for log events via the control port
+ before ignoring Tor's output on stdout. Previously we would start
+ ignoring Tor's stdout after successfully authenticating, but before
+ registering for log events which, in some cases, could lead to
+ messages not appearing in the message log.
+ o Update many translations and remove others than are no longer
+ up-to-date enough to be useful.
+
+
+0.2.0 19-Mar-2009
+ o Add support for changing UI languages without having to restart
+ Vidalia.
+ o Add preliminary support for using the KDE Marble widget for the
+ network map. It's currently a compile-time option and is disabled by
+ default.
+ o Add support for displaying Tor's plaintext port warnings. Also gives
+ the user the option to disable future warnings.
+ o Add an interface for displaying the geographic distribution of
+ clients who have recently used a bridge operator's relay.
+ o Add tooltips to tree items in the help browser's table of contents. Some
+ of the help topic labels are a bit long.
+ o Switch to a simpler About dialog and move the license information to a
+ separate HTML-formatted display.
+ o Switch to a simpler drag-and-drop installer in the OS X bundles.
+ o Switch to an MSI-based installer on Windows.
+ o Clear the list of default CA certificates used by QSslSocket before adding
+ the only one we care about. Suggested by coderman.
+ o Support building with Visual Studio again.
+ o Add a Debian package structure from dererk.
+ o Updated Albanian, Czech, Finnish, Polish, Portuguese, Romanian,
+ Swedish, Turkish and many other translations.
+
+
+0.1.12 16-Mar-2009
+ o Fix a bug in the hidden service settings configuration class that
+ could lead to compile errors in Visual Studio and on IRIX.
+ o Fix a build error that occurred on IRIX when using the MIPSPro
+ compiler. Patch from Matthew Saunier.
+ o Remove two duplicated strings in the Spanish translation of Qt's
+ internal strings (qt_es.po). The duplicated strings caused build
+ errors when building with Qt 4.5. (Ticket #469)
+ o Remove the code that altered PublishServerDescriptor when becoming a
+ bridge, since Tor handles that itself now, and ensure that BridgeRelay
+ is reset when going from bridge to just-a-client mode.
+ o Remove an unnecessary #include from helpbrowser.cpp.
+ o Add an application icon based on Tor's logo to the vidalia.desktop
+ file.
+
+
+0.1.11 16-Feb-2009
+ o Remove support for configuring Tor's User and Group options in the
+ Advanced settings page.
+ o Only set HttpsProxy if both the "I use a proxy..." checkbox and the
+ "Use this proxy for HTTPS also" checkboxes are checked. Otherwise,
+ unset it. (Ticket #440)
+ o Fix a use of an uninitialized variable that would occur when Tor was
+ already running when Vidalia started, and the "Start Tor when Vidalia
+ Starts" checkbox is checked. (Ticket #443)
+ o Switch to using 'getinfo address-mappings' instead of
+ 'getinfo addr-mappings'. (Ticket #454)
+ o Backport a change that removes a verticalSpacing property from a .ui
+ file, so Vidalia 0.1.x will still build on Qt 4.2. (Ticket #442)
+ o Fix some memory leaks in the hidden service configuration dialog.
+ o Fix a CIRC event parsing bug that would occur when the CIRC event
+ contained a 0-hop circuit path and EXTENDED_EVENTS is enabled.
+ o Include patches from Steven J. Murdoch that enables the Tor Browser
+ Bundle to launch Firefox itself without relying on Portable Firefox.
+
+
+0.1.10 02-Nov-2008
+ o Add a prettier dialog for prompting people for their control port password
+ that also includes a checkbox for whether the user wants Vidalia to remember
+ the entered password, a Help button, and a Reset button (Windows only).
+ o Fix a crash bug that occurred when the user clicks 'Clear' in the message
+ log toolbar followed by 'Save All'. (Ticket #434)
+ o Uncheck the Torbutton options by default in the Windows bundle installer
+ if Firefox is not installed. (Ticket #421)
+ o Add a Windows bundle installer page that warns the user that they should
+ install Firefox, if it looks like they haven't already done so. (Ticket
+ #421)
+
+
+0.1.9 02-Sep-2008
+ o Create the control panel's menubar as a parentless QMenuBar, so it is
+ visible even if the control panel is not the topmost window. (Ticket #286)
+ o Add a context menu with a "copy" option to RouterDescriptorView? so
+ users can copy some text to the clipboard. (Ticket #291)
+ o Make the Tor status label and Vidalia tray icon tooltip display the same
+ text after a circuit is established. (Ticket #390)
+ o Correct the location of the simplified Chinese help files so they will
+ actually load again.
+ o Try to load a translation for the current language from Qt's translations
+ directory, so we can get Qt's internal widgets (e.g. QDialogButtonBox)
+ translated. (Ticket #375)
+ o Use "$\r$\n" in the MessageBox strings in the Windows installer
+ translations, so the newlines appear properly. (Ticket #411)
+ o Grab the Qt .dlls included in the Vidalia installer directly from the
+ configured Qt binary directory (as specified by ${QT_BINARY_DIR}).
+ o Add OPENSSL_BINARY_DIR and MINGW_BINARY_DIR cmake options that can be
+ used to specify where the Windows installer NSIS scripts should look
+ for those dlls, rather than requiring them to all be in a "bin" directory
+ under ${Vidalia_BINARY_DIR}.
+ o Make the location of the Tor, Privoxy, and Torbutton package files into
+ configurable CMake options so the bundle can be built without having to
+ shimmy all these files into some specific directory hierarchy. Makes the
+ bundle a bit less annoying to build.
+ o Use the architecture name (e.g. "universal" or "ppc") rather than the
+ OS X version name (e.g. "tiger" or "panther") when naming OS X packages.
+ o Update the INSTALL file to recommend out-of-source builds.
+ o Stop building the nsh2po and po2nsh conversion tools on non-Windows
+ platforms.
+
+
+0.1.8 17-Aug-2008
+ o Make the position of the y-axis on the bandwidth graph variable based on
+ the width of the axis labels. This works better for languages like Farsi
+ where "KB/s" somehow becomes 19 characters. (Ticket #373)
+ o Support alphanumeric circuit and stream IDs, rather than assuming IDs will
+ always be numeric. Current Tors only use numeric circuit and stream IDs,
+ but they may some day. (Ticket #400)
+ o Include ssleay32.dll in the Windows packages so Vidalia won't crash when
+ it finds an incompatible version of ssleay32.dll in the user's $PATH.
+ (Ticket #401)
+ o If the message log is sorted by severity or lexiographically, or if the
+ user manually repositioned the vertical scroll bar, then retain the scroll
+ bar's previous position after adding a new message to the log.
+ o If the current message log layout is right-to-left (e.g. if the user's
+ translation is Farsi), then use a custom item delegate for the log message
+ column whose sole purpose is to keep Qt from screwing with the message
+ text. (Ticket #396)
+ o Reduce the default number of messages to retain in the message log to 50
+ messages. Most people never look at the window and the extra 200 messages
+ just needlessly eat memory.
+ o Restore the "zoom" and "close" icons in the router and circuit list
+ context menus. They were lost in the move to the Oxygen icon theme in
+ 0.1.4.
+ o Make both the 'Ctrl+W' and 'Esc' shortcuts for closing any Vidalia window.
+ Previously, it was just 'Esc' on Windows and 'Ctrl+W' on all other
+ platforms.
+ o Make pressing "Return" mean the same thing as clicking 'OK' in the
+ config dialog, and make pressing 'Esc' mean the same thing as clicking
+ 'Cancel'. (Ticket #327)
+ o Fix the icon used for the help browser's window icon.
+
+
+0.1.7 02-Aug-2008
+ o Handle spaces in the Tor version number we get from 'getinfo version'
+ since Tor has included svn revision numbers in its response (e.g.
+ "0.2.0.30 (r12345)") for a while now.
+ o Include stdlib.h in the format conversion tools. Fixes the build on some
+ platforms.
+ o Rework the message log scrollbar logic so it's consistent again on
+ Qt 4.4.0. (Ticket #369)
+ o Remove the horizontal scroll bar behavior in the message log. It was
+ really annoying and unnecessary since long messages have tooltips anyway.
+ o Add "TZ=UTC" to the BrowserExecutable's environment variables when launched
+ via Vidalia.
+ o Rename the 'pt_BR' Windows installer translation to just 'pt' since there
+ is apparently nothing 'BR'-specific about it. (Ticket #394)
+ o Update Tor's URL in the Windows installer and translations.
+ o Add an nsh2po tool (not built by default) that can be used to extract
+ LangString entries from an NSIS file and generate a .po file. This was
+ used to help push our installer translations into Pootle.
+ o Add a po2nsh tool to convert the Windows installer .po files to NSIS .nsh
+ files at build time.
+ o Tell CMake to skip the pkg/ subdirectories that aren't likely to be needed
+ on the current build platform.
+ o Updated Czech, French, and German translations.
+
+
+0.1.6 08-Jul-2008
+ o Fix a bug in our control socket communication introduced in 0.1.3 that
+ could cause excessive CPU usage or crashing on some platforms.
+ o Fix po2ts so that it uses the same encoding to read in a .po file that it
+ uses to write out the .ts file. This resulted in garbled characters when
+ viewing some translations on apparently all platforms except OS X.
+ o Use the correct field when trying to parse the severity value from the
+ 'getinfo status/bootstrap-phase' response.
+ o Fix compilation of the ts2po and po2ts conversion tools on OS X Panther.
+ o Tweak the ts2po and po2ts dependencies so Vidalia can be built with Xcode
+ on OS X again.
+ o Update ts2po to use 'msgctxt' in .po files for specifying message
+ context, rather than overloading the "#:" line.
+ o Update po2ts to tolerate using either 'msgctxt' or an overload "#:" line
+ for specifying message context.
+ o If we're building with CMake 2.6, then force CMake 2.4 compatibility for
+ linker search path behavior. Fixes a CMake warning when building with
+ CMake 2.6. (Ticket #374)
+ o Explicitly link in ws2_32 when building with UPnP support on Windows.
+ (Ticket #374 as well)
+ o Add a Romanian GUI and installer translation.
+ o Updated Farsi, Finnish, French, German, and Swedish translations.
+
+
+0.1.5 21-Jun-2008
+ o Add support for Tor 0.2.1.2-alpha's new 'status/bootstrap-phase' getinfo
+ option. Call it to update the progress bar to Tor's current bootstrapping
+ progress immediately after connecting to Tor.
+ o Convert to using GNU gettext .po files for our translations, rather than
+ Qt's .ts format. The .po files are converted to .ts (and then to .qm) at
+ build time. We switched to .po files so we can point pootle
+ (https://translation.torproject.org) directly at Vidalia's svn repository.
+ o Force a repaint() to try to ensure the progress bar and onion status icon
+ don't overlap briefly when starting Tor.
+ o Tweak the resize policy for the control panel so the vertical size is
+ fixed at minimal and sufficient, and the horizontal size is adjustable but
+ obeys the minimum size hint. (Ticket #363)
+ o Default to the language chosen by the user during install (Windows-only)
+ rather than the system language. (Ticket #246)
+ o Include the text of the LGPLv3 in the binary packages.
+ o Updated Finnish, French, German, Japanese, Spanish, and Swedish
+ translations.
+
+
+0.1.4 13-Jun-2008
+ o Add a progress bar and status label for displaying Tor's startup progress
+ based on new Tor bootstrapping status events.
+ o Include UPnP support based on the MiniUPnPc library. Also added a UPnP
+ test dialog to help users determine if their router or firewall supports
+ UPnP. Initial patch for UPnP support from Steven J. Murdoch.
+ o Switch all of Vidalia's icons to the KDE Oxygen theme so that our icon set
+ has a a DFSG-compatible license.
+ o Fix a crash bug that occurred when opening the settings dialog when Tor
+ was not running. (Ticket #360)
+ o Respond to mouse wheel events on the network map by zooming in or out on
+ the map image. Patch from Vern Sun.
+ o Make external links in the help browser clickable, which will try to open
+ them in the user's default browser. The user is first warned that their
+ request might not be anonymous if their default browser is not configured
+ to use Tor.
+ o Apply some Tor trademark compliance updates to user-visible strings.
+ o Cut down the margin around the table of contents in the help browser. It
+ looked goofy with so much empty space.
+ o Update Finnish, Spanish, and Swedish translations.
+
+
+0.1.3 25-May-2008
+ o Added a hidden service configuration UI designed and implemented by
+ Domenik Bork.
+ o Added a "Proxy Executable" configuration option and UI that allows
+ you to specify an HTTP proxy application that Vidalia will start and
+ stop along with Tor.
+ o Fix a bug in how Vidalia sent control commands to Tor that would
+ cause Vidalia to freeze when built against Qt 4.4.0. (Ticket #353)
+ o If we're running Tor >= 0.2.0.13-alpha, then check the descriptor
+ annotations for each descriptor before deciding to do a geoip lookup
+ on its IP address. If the annotations indicate it is a special purpose
+ descriptor (e.g., bridges), then don't do the lookup at all. (Ticket #326)
+ o Fix the OSX_FAT_BINARY build option so that it actually does produce a
+ Universal binary when enabled. (Ticket #342)
+ o Rename src/util to src/common, since libutil.a was apparently conflicting
+ with libUtil.dylib when compiling Vidalia on OS X Leopard.
+ o Switch to using 'getinfo ns/all' instead of 'getinfo network-status' to
+ get a list of available relays. 'getinfo network-status' was deprecated
+ long ago.
+ o Only display the running relays in the big list of relays to the left of
+ the network map. Listing a big pile of unavailable relays is not
+ particularly useful, and just clutters up the list.
+ o Add support for the 'usefeature verbose_names' control command that was
+ introduced way back in Tor 0.1.2.2-alpha.
+ o Correct the tab order on the custom bandwidth settings tab. (Ticket #351)
+ o Remove the 'Run Tor as a Service' checkbox. Lots of people seem to be
+ clicking it even though they don't really need to, and we end up leaving
+ them in a broken state after a reboot.
+ o Restore the Windows application icon that was inadvertently removed in
+ 0.1.2. Reported by dr|z3d. (Ticket #358)
+ o Add a Turkish GUI translation from Yunus Kaba.
+ o Updated Finnish and Swedish translations.
+
+
+0.1.2 24-Mar-2008
+ o Correctly load the CA certificate used to verify SSL connections to the
+ GeoIP server. This caused Vidalia >= 0.1.0 clients built against Qt >=
+ 4.3.2 to be unable to retrieve updated GeoIP information. (Ticket #349)
+ o Fix compilation when UINT_MAX is not defined. (Ticket #350)
+ o Bridges are no longer required to have a DirPort set as of Tor
+ 0.2.0.13-alpha, so stop forcing it on for bridges. At some point, we'll
+ likely start forcing DirPort to be disabled for bridges, and on by default
+ but optional for normal relays. (Ticket #337)
+ o Fix a typo in VidaliaMacros.cmake that would allow configuration to
+ continue even if windres.exe couldn't be found.
+ o Update the version of Torbutton included in the OS X bundle to
+ 1.1.17-alpha, and actually include the bundle's uninstaller script.
+ o Updated Finnish and Swedish translations.
+
+
+0.1.1 17-Mar-2008
+ o Use CMake to configure the version number that ends up getting displayed
+ in the About box.
+ o Update the RPM .spec file with the new CMake requirements. Patch from Oliver
+ Niesner.
+ o TunnelDirConns and PreferTunneledDirConns are now enabled by default as of
+ Tor 0.2.0.22-rc.
+ o Don't check the 'My ISP blocks connections to the Tor network' box simply
+ because TunnelDirConns is enabled. Checking the box still enables
+ encrypted directory connections on older Tors.
+ o Add a Japanese GUI translation from Nardog
+ o Updated Finnish and Swedish translations
+
+
+0.1.0 01-Mar-2008
+ o Migrate to CMake as our build system, instead of the previous mix of
+ autoconf and qmake. See the updated INSTALL file for more information.
+ o Add an OpenSSL license exception so Vidalia can be linked against OpenSSL
+ and redistributed. Also include the text of the GPLv3, since our license
+ says "GPLv2 or later."
+ o Don't try to 'SETCONF HashedControlPassword' if we couldn't hash the
+ control password, otherwise we could end up disabling authentication.
+ (Ticket #305)
+ o If Vidalia is built against Qt >= 4.3 with SSL support, then do our GeoIP
+ lookups over an SSL connection.
+ o Work around a crash bug with a sorted QTreeWidget that occurs with Qt
+ 4.3.3, and possibly later versions as well.
+ o Parse ReachableAddresses values properly when there are multiple ports
+ specified on a single line.
+ o RESETCONF the value of PublishServerDescriptor when the user switches from
+ being a relay to acting as only a client.
+ o Add support for Tor's STATUS_GENERAL, STATUS_CLIENT, and STATUS_SERVER
+ status events.
+ o Listen for the DANGEROUS_VERSION general status event and warn the user
+ if their version of Tor is no longer recommended.
+ o Listen for the CIRCUIT_ESTABLISHED client status event and only turn the
+ yellow onion status icon green after Tor has successfully established a
+ circuit.
+ o If the user's vidalia.conf contains an empty value for their Tor
+ executable, use the default for the user's platform.
+ o If the user is running a bridge relay with Tor 0.2.0.13-alpha or newer,
+ then set 'BridgeRelay 1' when configuring their bridge.
+ o Don't save a randomly generated control password to Vidalia's
+ configuration file. If Vidalia gets disconnected from Tor or crashes, we
+ will no longer be able to reconnect.
+ o Don't let users save an empty string for a Tor executable in the Settings
+ dialog.
+ o Apply the changes for settings pages in the same order in which the pages
+ appear in the Settings dialog. The only two pages for which this matters
+ are the 'Network' and 'Sharing' pages. (Ticket #336)
+ o Old Jabber clients apparently use port 5223 for encrypted connections. So,
+ include that port as part of the "Instant Messaging" exit policy checkbox.
+ (Ticket #333)
+ o Stop displaying flags next to the language names in the Appearance
+ settings page.
+ o Add a "How do I find a bridge?" link and corresponding help text to the
+ 'Network' settings page.
+ o Add a 'BrowserExecutable' configuration option to launch a Web browser
+ when Tor has built a circuit, and exit Vidalia when the browser is closed.
+ Patch from Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>.
+ o Add 'ProxyExecutable' and 'ProxyExecutableArguments' configuration options
+ to launch a proxy application with given parameters when Vidalia starts,
+ and close it when Vidalia exits.
+ Patches from Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>.
+ o Respond to the Delete key in the network map by closing whatever circuits
+ or streams are currently selected. Suggested by Andrew Lewman.
+ o Rename the 'Relay' settings page to the 'Sharing' settings page.
+ o Add a vidalia.desktop desktop entry file that can be installed with
+ 'make install'.
+ o Add an Albanian GUI translation from Frederik Nosi.
+ o Add a Hebrew GUI and Win32 installer translation.
+ o Updated Finnish, Norwegian, Polish, Russian, and Swedish translations.
+
+
+0.0.16 22-Nov-2007
+ o Fix compilation on Mac OS X 10.3 (Panther).
+ o GETCONF RelayBandwidthRate and RelayBandwidthBurst properly on Tor >=
+ 0.2.0.1-alpha. In 0.0.15, we were SETCONFing RelayBandwidthFoo when
+ appropriate, but always GETCONFing BandwidthFoo. Fixes Ticket #298.
+ o Display the correct default list of allowed ports in the Network settings
+ page, and don't try to save an empty list. Noticed by Roger Dingledine.
+ o Only remember the torrc and datadir values if Vidalia started Tor, or
+ if the user changed the displayed values.
+ o Fix some dumb logic in determing whether the Windows we're running on
+ supports window transparency.
+ o Use the correct icon for the "Close Stream" context menu action in the
+ circuit and stream list widget.
+ o Create the message log, network map, bandwidth graph, and settings dialogs
+ without parents, so they can be independently brought to the foreground on
+ Windows Vista.
+ o Update the default bandwidth rate and burst rate to 5MB and 10MB,
+ respectively, to match Tor's defaults.
+ o Make the "Use this proxy for HTTPS also" checkbox checked by default.
+ o Disable the labels that display the user's bridge relay information if the
+ user is not running a bridge, instead of just disabling the copy button.
+ o Modified the Mac OS X bundle installer to set Vidalia to start
+ automatically on login for the user that installed the bundle.
+ o Added an Arabic translation from Ahmad Gharbeia.
+ o Updated Finnish, German, Simplified Chinese, and Traditional Chinese
+ translations.
+
+
+0.0.15 24-Oct-2007
+ o Add a new 'Network' settings page to the config dialog that lets users
+ configure an HTTP/HTTPS proxy, specify allowed ports if they are behind a
+ restrictive firewall or proxy, and set up bridges and tunneled dir conns.
+ o Add a 'Help Censored Users Connect to the Tor Network' option to the
+ 'Server' settings page to help users set up their Tor as a brigde relay.
+ This option is only available for those running Tor 0.2.0.8-alpha or
+ newer.
+ o Stop hardcoding a font size of 10 in many places. This made the fonts on
+ Mac OS X look non-standard and inconsistent.
+ o Restructure the code that manages GETCONFing values from Tor and then
+ later SETCONFing any changed values to make it easier to add more pages
+ like the 'Network' and 'Server' settings pages in the future.
+ o If we prompt the user to enter a control password and they enter one,
+ don't keep trying to use our randomly generated password.
+ o Fix a bug in the network map that would cause the user to sometimes be
+ unable to select a circuit or server after clicking and dragging the mouse
+ in one of the lists. (Ticket #269)
+ o Stop leaking memory for pretty much every circuit we plotted on the network
+ map. Found by Roger Dingledine and his Valgrind.
+ o Stop leaking memory if TorMapWidget::addRouter() is called for a router
+ that is already on the map. Also found by Roger Dingledine and his
+ Valgrind.
+ o Stop leaking memory used by QTranslator and the configuration dialog on
+ exit.
+ o Default to using an ORPort of 443 when setting up a server on Windows.
+ 9001 is still the default everywhere else.
+ o Fix a crash bug that could occur when Vidalia gets disconnected from Tor
+ while waiting for a response to a previous command. Bug reported by Roger
+ Dingledine. (Ticket #295)
+ o Create a single TorProcess object used to start and stop Tor, instead of
+ creating a new one each time and cleaning up after Tor exits. (Ticket
+ #294)
+ o Do the control connection asynchronously so we aren't trying to call
+ waitForConnected() in the control socket thread before it has an event loop
+ running.
+ o Don't start Tor or test for a running Tor with an open control port until
+ the main event loop is running.
+ o Older Tors write their state file even if all we're doing is
+ --hash-password. So if the user has configured a non-default data
+ directory, include that in the list of command line arguments when we run
+ Tor to hash the user's control password.
+ o Support changing Tor's control port and authentication settings without
+ having to restart Tor for the settings to take effect.
+ o Recognize the REMAP stream status in STREAM events.
+ o Allow the control panel window to expand horizontally and vertically to
+ fit longer translated text labels.
+ o Make VClickLabel right-to-left aware so the control panel buttons look
+ correct when using the Farsi translation.
+ o Fix our configure.in to produce a Makefile instead of an Xcode project on
+ OS X. This only affected users who got Qt 4.3 from Trolltech's .dmg
+ installers.
+ o Fix our configure.in to tell QMake the fully-expanded path to which our
+ man page should be installed.
+ o Fix our configure.in so we can use it to build under Cygwin or MinGW with
+ Qt >= 4.3.0.
+ o Move to a consistent use of the word "Relay" instead of "Server" or
+ "Router" in the interface.
+ o Convert the path separators in a configured data directory to whatever the
+ platform standard is.
+ o Remove the custom palette used in all Vidalia's windows that had been
+ around since 0.0.1.
+ o Attempt to standardize the GUI fonts to whatever the user's platform
+ thinks is best.
+ o Default to using Qt's Windows Vista style on Windows Vista. On other
+ Windowses or any non-Mac platform, default to the Cleanlooks style if
+ we're building with Qt >= 4.3.
+ o Add some information to the help browser about the new network settings
+ and bridge relay configuration, as well as the new authentication
+ settings in 0.0.14.
+ o When the user clicks the Help button in the Settings dialog, take them
+ directly to the help topic for whichever settings page they are currently
+ viewing.
+ o Added Torbutton 1.1.9.1-alpha to the Mac OS X bundles, thanks to
+ Andrew Lewman.
+ o Disable enable-edit-actions, enable-remote-toggle, and
+ enable-remote-http-toggle in the bundled Privoxy configuration. Suggested
+ by Greg Fleischer.
+ o Updated Finnish, French, German, Norwegian, Polish, and Russian
+ translations.
+
+0.0.14 26-Aug-2007
+ o Add support for Tor's HashedControlPassword and CookieAuthentication
+ options. Password authentication is enabled by default.
+ o Add support for Tor's new PROTOCOLINFO control command.
+ o Support running on Windows NT 4.0 again.
+ o Check to see if "%PROGRAMFILES%\Vidalia Bundle\Tor\tor.exe" exists when
+ setting the default Tor executable on Win32. If it doesn't, fall back to
+ "%PROGRAMFILES%\Tor\tor.exe". (Ticket #262)
+ o Allow the people who think clicking 'New Identity' is the solution to
+ everything to be disappointed six times per minute, instead of once.
+ o Add the ability to configure Tor's data directory.
+ o Give users the option of not removing %APPDATA%\Tor and %APPDATA%\Vidalia
+ in the Win32 Vidalia and bundle installers.
+ o Add a Czech GUI and installer translation from el Mar.
+ o Updated Finnish and German translations.
+
+
+0.0.13 02-Aug-2007
+ o Remove the control protocol version checking logic, since Tor will now
+ just hang up if the first command received isn't a valid AUTHENTICATE
+ command.
+ o Fix a bug where Vidalia would display an incorrect error message if the
+ user started Vidalia, stopped Tor, ran Tor manually, then clicked 'Start
+ Tor'. (Reported by arma)
+ o Maintain a list of address mappings, so we can try to replace IP addresses
+ in stream targets with host names when displaying them on the network map.
+ (Suggested by phobos)
+ o Stop including help documentation for each language, even if it is
+ untranslated. If there is no translated help documentation for a language,
+ simply load the documentation from the English version.
+ o Use RelayBandwidthBurst and RelayBandwidthRate on Tor >= 0.2.0.1-alpha.
+ o Remove from the server config page the 'Address' text box, the 'Get
+ Address' button, and 'Automatically Update' checkbox.
+ o Don't do balloon messages on Windows 2000; I'm told it doesn't work even
+ though QSystemTrayIcon::supportsMessages() says it should.
+ o Removed a duplicate check when determining what control event Vidalia
+ received from Tor.
+ o Check /usr/sbin/ for a Tor binary if one isn't found in $PATH.
+ o Fixed compilation on Mac OS X Panther.
+ o Support building with Qt 4.3 in our configure.in (no code changes
+ required).
+ o Change the "Start Tor" control panel button text to "Starting Tor" while
+ Tor is starting.
+ o Added a "Control Panel" item to the OS X dock icon's context menu.
+ o Added tooltips to the circuits and streams listed on the network map.
+ o Stop putting a torrc in %APPDATA%\Tor if the user is also installing Vidalia,
+ since they'll just get confused from having two torrc files.
+ o Added a Swedish GUI and installer translation from Amin Amini.
+ o Added an Italian installer translation from Alex Mazzariol.
+ o Update Finnish, French, German, Italian, Russian and Spanish translations.
+
+
+0.0.12 01-Jun-2007
+ o Added a new "Control Panel" main window that appears when Vidalia first
+ starts. This dialog is for people who either aren't trained to look in
+ their system tray area for a Vidalia icon, or those who simply do not have
+ a system tray area.
+ o Added -logfile and -loglevel command-line options that can log useful
+ Vidalia debugging messages to a file or to stdout. Hopefully this will
+ help make tracking down future Vidalia bugs easier.
+ o Add a box to the Advanced settings page to change the IP address on which
+ we will try to connect to Tor's control port, instead of always assuming
+ 127.0.0.1. (Ticket #81)
+ o Don't yell at the user if our SAVECONF fails after changing some
+ configuration settings; just remember the intended settings and reapply them
+ next time Tor runs.
+ o Restore a window to its previous state each time it is opened, not just
+ the first time after Vidalia is started.
+ o Only allow the 'New Identity' button to be clicked once every 60 seconds.
+ o Show the number of online servers in the status tip for the server list,
+ as well as the total number of servers.
+ o Expand filenames that use "~/", "%APPDATA%", or "%PROGRAMFILES%" in either
+ the path to Tor's executable or torrc.
+ o Fix the message log timestamp format to be "MMM dd hh:mm:ss.zzz", instead
+ of "MMM dd hh:mm:ss:zzz".
+ o Don't create the help browser window until we actually need it, so we
+ don't waste memory on a window the user might never use.
+ o Fix a minor bug that's been around since 0.0.1: actually remove objects
+ from the list of targets for an event, instead of from a copy of the list.
+ o Display command-line options information as a message box so even Win32
+ folks can see it, if they give Vidalia a bogus argument.
+ o Revert back to the single uninstaller strategy on Win32, so don't leave
+ program groups behind after uninstalling the bundle. (Ticket #237)
+ o Start Privoxy minimized if the user selects "Run installed components now"
+ after completing the Win32 installer.
+ o Don't skip past the Win32 installer results immediately, since there could
+ have been errors the user should see.
+ o Include a default.action file for Privoxy in the Win32 and OS X bundles
+ with the +limit-connect{1-} fix.
+ o Include some more helpful text in the Win32 installer welcome screen and
+ category descriptions.
+ o Fix the paths to *-spec.txt in the script that builds the OS X bundles.
+ o Include Tor_Uninstaller.applescript and uninstall_tor_bundle.sh in the OS
+ X bundle. (Ticket #230)
+ o Updated Dutch, Finnish, French, German, Norwegian, Polish and Spanish
+ translations.
+
+
+0.0.11 07-Feb-2007
+ o Fix a race condition that could (and did) cause Vidalia to freeze.
+ o RESETCONF all server-related settings when the be-a-server checkbox gets
+ unchecked, not just ORPort and Nickname.
+ o Add support for zlib or gzip compressed GeoIP responses.
+ o Handle chunked transfer encodings properly in GeoIP responses.
+ o Be a little less eager to send GeoIP requests right away. Now we wait 10
+ seconds after adding an address to the queue, or a maximum of 30 seconds,
+ before sending the request.
+ o Tolerate entries in geoip-cache that have no timestamp. If an entry does
+ not have a timestamp, use the current date and time.
+ o Respond to double-clicks on the map. Double left-click zooms in towards
+ the mouse pointer and double right-click zooms out.
+ o If Vidalia is built with Qt >= 4.2, use the open and closed hand cursors
+ in ZImageView when panning the world map.
+ o Qt >= 4.2 handles the sorting in addTopLevelItem() in the server list. We
+ still do the sorted inserts ourselves in older Qts.
+ o Display circuits as a list of server nicknames (like we currently do), but
+ save the original circuit paths (possibly with key IDs for non-Named
+ servers) so we don't display the wrong server information when the user
+ selects that circuit.
+ o Fix a bug introduced in 0.0.10 that caused a server's little pinpoint on
+ the map to not be highlighted green when the server is selected in the
+ server list.
+ o Update the stream target address on every stream status event, not just
+ NEW stream events.
+ o Add an EU flag for the server list.
+ o Add a "Cancel" button to the message box that asks server operators if
+ they want to delay server shutdown or kill Tor right away. (Ticket #222)
+ o Add version information to our compiled Win32 vidalia.exe.
+ o Be more tolerant of Win32 people removing the Tor service out from under
+ Vidalia.
+ o Explicitly specify the tab order in the bandwidth graph.
+ o Fix a bug in parsing Tor's version string when it contains modifiers such
+ as '-alpha'.
+ o Make Circuit::hops() correctly return an empty QStringList for empty paths,
+ instead of a QStringList with one empty QString.
+ o Do a better job of detecting Qt 4.2 debug libs on OS X. There were a few
+ necessary non-Qt libs missing from LIBS when we did our AC_TRY_LINK.
+ o Add vidalia.spec to our configure.in, so the RPM spec file stays current.
+ o Add a Traditional Chinese installer and GUI translation from Cloud.
+ o Updated Dutch, Farsi, Polish, Russian, and Simplified Chinese translations.
+
+
+0.0.10 25-Dec-2006
+ o Load NT service functions on demand so we can run on Windows 95/98/ME
+ again. (Ticket #211)
+ o Add a column to the list of servers in the network map window, with a
+ little flag icon for each server.
+ o If the network map window is not visible, queue all GeoIP requests until
+ either the window becomes visible again or the queue contains requests for
+ at least one-quarter of all known servers.
+ o If we get a valid geoip response telling us the geoip database doesn't
+ have a location for the requested IP address, cache that response for one
+ week so we don't keep sending requests that are likely to fail anyway.
+ o Use QSystemTrayIcon when available (except on Mac). If we are using
+ QSystemTrayIcon on systems that support balloon messages, use a balloon to
+ indicate when NEWNYM is successful. We still show a message box when NEWNYM
+ fails. (Ticket #183)
+ o Add a graph style dropdown box to the bandwidth graph settings, so you can
+ choose between a fancy alpha blended area graph and a faster, simpler line
+ graph.
+ o Add a button to continue starting Vidalia anyway, even if Vidalia thinks
+ there might be another Vidalia process already running. It's possible that a
+ previous Vidalia did not exit cleanly and another process ended up with
+ the old Vidalia's PID.
+ o Add a "Zoom to Circuit" option to the circuit context menu in the network
+ map's list of circuits.
+ o Add a context menu to the dock icon on OS X. (Ticket #135)
+ o If we're building with Qt >= 4.2.0, then use its new saveGeometry() and
+ restoreGeometry() functions to save and restore window size and position.
+ If we're still using an old Qt, make sure the window fits on screen when
+ we try to restore it. (Ticket #207)
+ o Fix a bug in how the server points were keyed on the network map that
+ could cause some circuits to not get drawn. (Ticket #175)
+ o Really close the read channel when we want to stop reading from the Tor
+ process's stdout. This would sometimes cause duplicate messages in the
+ message log if Vidalia was running on a non-English-speaking Windows.
+ o Be more correct about what we consider as valid latitudes and longitudes.
+ o Give a better error message if we fail to determine what version of Tor's
+ control protocol is being spoken.
+ o Clarify some labels in the message log settings. (Ticket #203)
+ o Settle on a convention of not ending tool tips or status tips with a
+ period.
+ o Start shipping a geoip-cache file in our Win32 installers so people have
+ some initial geographic information, instead of starting out entirely
+ empty-handed.
+ o Add a Farsi translation.
+ o Add a Spanish translation contributed by desolator.
+ o Add a Portuguese (Brazilian) translation contributed by Mabat Haram.
+ o Add a Simplified Chinese installer translation contributed by omg.
+ o Updates to Finnish, French, German, Italian, Norwegian, Polish,
+ Russian, and Simplified Chinese translations.
+
+
+0.0.9 05-Nov-2006
+ o Added a new, more intuitive interface for setting a server's bandwidth
+ rate and exit policies.
+ o Improved our ./configure script so it will detect old or non-debug
+ versions of Qt and link accordingly.
+ o Added support for more easily building Qt as a Universal binary on OS X.
+ o Added a right-click option to circuits listed in the network map dialog to
+ close the circuit (Ticket #176).
+ o Added a right-click option to servers listed in the network map dialog to
+ zoom in on the server on the map (Ticket #176).
+ o Stop using a custom font and just use the platform default on all dialogs.
+ o Add "Close Window" shortcuts for Linux (Ctrl+W).
+ o Fixed a crash bug that would occur when saving messages in the message
+ log (Ticket #185).
+ o Fixed a bug that would cause messages with identical timestamps to not
+ get copied to the clipboard (Ticket #190).
+ o Ask if the user wants to delay shutting down their server when Vidalia
+ exits, to give clients time to find new circuits. We previously only did
+ this when the user stopped Tor, but wasn't exiting Vidalia.
+ o If Windows is restarting, then don't ask about delaying a server shut
+ down; just stop Tor and exit immediately so Windows doesn't yell at us.
+ o Detect if Tor was installed as an NT service prior to Vidalia, so we don't
+ accidentally remove it.
+ o Create a new torrc and specify a control port for the Tor NT service, so
+ it doesn't die when the user tries to start the service and we don't have
+ to tell the user to go add a line to their torrc.
+ o Fixed a bug that caused Vidalia to crash if it tried to read in a bogus
+ geoip-cache file from its data directory (Ticket #184).
+ o Refuse to cache information we did not ask for that we received in response
+ to a GeoIP request.
+ o Wait no more than ten seconds after queueing a GeoIP request before
+ sending it, so requests don't starve if we keep constantly getting new
+ descriptors.
+ o Ask Tor what its SocksPort and SocksAddress is before building our GeoIP
+ request, instead of always assuming Tor is listening on 127.0.0.1:9050.
+ o Explicitly specify the sort order for the message log and server list, so
+ things aren't backwards when linking with Qt 4.2.x.
+ o Add support for translating the Vidalia and Vidalia bundle installers.
+ o Start bundling Torbutton with the Vidalia bundle installer.
+ o Add a Norwegian (Bokmal) translation contributed by xiando.
+ o Updates to the Finnish, French, German, and Polish translations.
+
+
+0.0.8 03-Oct-2006
+ o Vidalia will now attempt to connect to an existing Tor's ControlPort
+ before starting its own Tor process. If it finds a Tor with an open
+ ControlPort, Vidalia will "attach" to that Tor instead of starting a new
+ process.
+ o Vidalia now supports running Tor as an NT service on Windows.
+ o When Vidalia starts its own Tor process, it will now default to starting it
+ with a "-f ~/.vidalia/torrc", to avoid permissions conflicts when running
+ Tor as a user that does not have write access to the default torrc. The
+ torrc used when starting Tor is still configurable.
+ o Fix a bug that was causing unexpected behavior with many unrelated Windows
+ applications.
+ o Do a better job of determining if another Vidalia process is running on
+ Windows, to eliminate all the false positives reported.
+ o Major performance improvements related to loading the network map.
+ o Support receiving server identities in circ events, as well as names, so
+ Vidalia will work with Tor 0.1.2.2-alpha and later.
+ o Moved the "New Identity" button to the main popup menu for easier
+ access.
+ o Vidalia dialogs remember their last size and location when Vidalia exits
+ and restore their size and location the next time Vidalia runs.
+ o Vidalia windows now close in response to a Command-W on Mac OS X.
+ o Added a "Zoom To Fit" button to the network map, to zoom in on the active
+ circuits.
+ o Numerous minor aesthetic and usability improvements to many of Vidalia's
+ dialogs.
+ o Fix a bug that was causing signal conflict warnings on Debian.
+ o Fix a crash that would occur when exiting Vidalia after an attempt to
+ start Tor with a non-existent executable.
+ o Add a Bulgarian translation contributed by kutia0001.
+ o Add a Dutch translation contributed by Saedian.
+ o Add a Hungarian translation contributed by Tibor Fekete.
+ o Add a Polish translation contributed by ZeeWolf.
+ o Updates to the Finnish, French, and Russian translations.
+
+
+0.0.7 07-Jul-2006
+ o Fix a bug that was causing Vidalia to freeze frequently for some people,
+ particularly when running at a verbose log level.
+ o Fix a bug that would cause Windows Vidalias to not want to start after
+ Vidalia had been killed via the Task Manager.
+ o Add a French translation contributed by Michel Burkhardt.
+ o In the network map, update the displayed uptime by looking at the difference
+ between now and the publication time, and add that difference to the published
+ uptime.
+
+
+0.0.6 23-Jun-2006
+ o Fix the network map to properly remove circuits after they are closed.
+ o Fix our configure script to properly handle the --prefix option (patch by
+ Alexander Wirt).
+ o Check if Vidalia is already running when we start. If Vidalia is already
+ running, then warn and exit in the second instance.
+ o Strip all invalid characters from the server's nickname and make sure the
+ user can't enter any.
+ o Default to the Tor binary located in the user's $PATH, instead of trying
+ to guess directory locations.
+ o Add support for adjusting a server's BandwidthRate and BandwidthBurst
+ values.
+ o Store Vidalia's settings in a file, (rather than in the registry on
+ Windows), so Vidalia can be more portable. Note that settings aren't
+ "imported" from the registry, so 0.0.5 users will have to configure
+ their Vidalia settings again.
+ o Make the bandwidth graph just a normal window instead of a tool window, so
+ it can hide behind other Vidalia windows, if necessary.
+ o On OS X, ensure that the About, Configure, and Exit actions get merged
+ into the "Vidalia" menu in the default menubar when Vidalia is running in
+ a non-English language.
+ o Add an Italian translation contributed by Alex Mazzariol.
+ o Add a Russian translation contributed by ygrek.
+ o Add a manpage for Vidalia contributed by Alexander Wirt.
+
+
+0.0.5 02-Jun-2006
+ o Make the "Always On Top" property of the bandwidth graph optional.
+ o Add a new dialog showing a list of routers that the user's Tor currently
+ knows about, as well as the user's current circuits and streams and
+ detailed information about individual routers. The circuits and router
+ geographic locations are plotted on a world map. Thanks to Christoph
+ Sieghart, Michael Zuercher, and Adam Tomjack for help with this feature.
+ o Stop automatically scrolling to the newest item added to the message log,
+ if the user is looking through their message history.
+ o Create a horizontal scrollbar on the message log when an excessively long
+ message is logged.
+ o Add support for the NEWNYM signal in the form of a "New Identity"
+ button, to force Tor to use only clean circuits for new application
+ requests.
+ o Add a Mac OS X bundle.
+ o Add a Finnish translation contributed by DJHasis.
+ o Add a German translation contributed by Christoph Sieghart.
+ o Fix a bug that caused people running servers to update their public IP
+ address too often if they had the "Automatically Update" option checked.
+
+
+0.0.4 09-May-2006
+ o Add a fixed set of Windows .ico files from Dan Christensen. Our
+ contributed set in 0.0.3 apparently had a blank image in it that some old
+ Windowses would use instead of the icon that actually had an image.
+ o Add an option for servers to check periodically to see if their public IP
+ address has changed.
+ o Give servers the option to shut down after 30 seconds, to give clients
+ time to find new circuits, instead of just always killing Tor immediately.
+ o Improve GUI responsiveness when waiting for the Tor process to finish
+ starting up.
+ o Be smarter about guessing the default location of Tor in non-English
+ Windowses.
+
+
+0.0.3 13-Apr-2006
+ o Fixed a server configuration bug that caused people to not really be a
+ middleman node, even though the checkbox told them they were.
+ o Fixed a bug in choosing a default language that caused help documents to
+ sometimes not appear.
+ o Fixed the Win32 bundle installer to not leave 2 files and a registry key
+ laying around after an uninstall. Also give users the option of launching
+ Vidalia when the solo installer is finished.
+ o Fixed a bug where Vidalia would ignore Windows when asked to shut down
+ because the system is restarting.
+ o Improved tray icon support on older Windowses. Also started using a new
+ set of icons created by Matt Hanson, based on our previous set by Corinna
+ Habets.
+ o Improved help document accessibility by adding "Help" buttons to many
+ dialogs and error message boxes.
+
+
+0.0.2 02-Apr-2006
+ o Added an integrated help browser and documentation.
+ o Added exit policy configuration support for servers.
+ o Added support for language translations and language selection.
+ o Added a Simplified Chinese (zh_CN) translation from Wu Xiaoguong.
+ o Added support for changing Vidalia's interface style.
+ o Aesthetic improvements in many dialogs.
+
+
+0.0.1 28-Feb-2006
+ o Initial testing release.
+ o Basic features include:
+ - Starting/stopping/monitoring Tor
+ - Bandwidth graph
+ - Message log
+ - Basic server configuration
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/CMakeLists.txt
new file mode 100644
index 0000000..572b984
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/CMakeLists.txt
@@ -0,0 +1,138 @@
+##
+## $Id: CMakeLists.txt 4301 2010-05-20 23:22:33Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+
+set(VER_MAJOR "0")
+set(VER_MINOR "2")
+set(VER_PATCH "9")
+set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}")
+message(STATUS "Configuring Vidalia ${VERSION}")
+project(Vidalia)
+
+## Specify the minimim required CMake version
+cmake_minimum_required(VERSION 2.4.7)
+if (COMMAND cmake_policy)
+ # Force CMake 2.4 compatibility for handling linker search paths
+ cmake_policy(SET CMP0003 OLD)
+endif(COMMAND cmake_policy)
+
+## We declare this option here, because it determines the minimum
+## required Qt version
+option(USE_MARBLE "Enable the KDE Marble-based map widget." OFF)
+
+## Specify the minimum version of Qt required
+set(QT_MIN_VERSION "4.3.0")
+
+## Specify the Qt libraries used
+include(FindQt4)
+find_package(Qt4 REQUIRED)
+set(QT_USE_QTNETWORK true)
+set(QT_USE_QTXML 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})
+include(${CMAKE_SOURCE_DIR}/cmake/VidaliaMacros.cmake)
+include(CheckIncludeFile)
+include(CheckIncludeFileCXX)
+include(CheckTypeSize)
+include(CheckFunctionExists)
+if (WIN32)
+ include(${CMAKE_SOURCE_DIR}/cmake/FindWiX.cmake)
+endif(WIN32)
+if (MSVC OR UNIX)
+ include(${CMAKE_SOURCE_DIR}/cmake/FindOpenSSL.cmake)
+endif(MSVC OR UNIX)
+
+if(MSVC_IDE)
+ set(CMAKE_SUPPRESS_REGENERATION TRUE)
+ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
+ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
+endif(MSVC_IDE)
+
+## Define Vidalia-specific CMake options
+if (APPLE)
+ option(OSX_TIGER_COMPAT "Build an OS X 10.4 Compatible Vidalia." OFF)
+ if (OSX_TIGER_COMPAT)
+ set(CMAKE_EXE_LINKER_FLAGS "-mmacosx-version-min=10.4"
+ CACHE STRING "Flags used by the linker." FORCE)
+ set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk"
+ CACHE STRING "isysroot used for universal binary support" FORCE)
+ endif(OSX_TIGER_COMPAT)
+
+ option(OSX_FAT_BINARY "Build Vidalia as a Universal binary." OFF)
+ if (OSX_FAT_BINARY)
+ set(CMAKE_OSX_ARCHITECTURES "ppc;i386"
+ CACHE STRING "OS X build architectures" FORCE)
+ set(CMAKE_EXE_LINKER_FLAGS "-mmacosx-version-min=10.4"
+ CACHE STRING "Flags used by the linker." FORCE)
+ set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk"
+ CACHE STRING "isysroot used for universal binary support" FORCE)
+ endif(OSX_FAT_BINARY)
+
+ option(OSX_FORCE_32BIT "Force a 32-bit build for compatibility." OFF)
+ if (OSX_FORCE_32BIT)
+ add_definitions(-m32)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32"
+ CACHE STRING "Flags used by the linker." FORCE)
+ endif(OSX_FORCE_32BIT)
+endif(APPLE)
+
+## UPnP support is currently optional (enabled by default)
+option(USE_MINIUPNPC "Enable UPnP support using the MiniUPnPc library." ON)
+
+## Crash reporting via Google Breakpad is optional (disabled by default)
+option(USE_BREAKPAD "Enable Google Breakpad crash reporting." OFF)
+if (USE_BREAKPAD)
+ include(${CMAKE_SOURCE_DIR}/cmake/FindBreakpad.cmake)
+endif(USE_BREAKPAD)
+
+## Automatic software update is optional (disabled by default)
+if (WIN32)
+ option(USE_AUTOUPDATE "Enable automatic software update support." OFF)
+endif(WIN32)
+
+## Find the KDE Marble library
+if (USE_MARBLE)
+ include(${CMAKE_SOURCE_DIR}/cmake/FindMarble.cmake)
+endif(USE_MARBLE)
+
+## Check for system header files
+check_include_file("limits.h" HAVE_LIMITS_H)
+check_include_file("sys/limits.h" HAVE_SYS_LIMITS_H)
+check_include_file("signal.h" HAVE_SIGNAL_H)
+
+## Check for the sizes of various data types
+check_type_size(int SIZEOF_INT)
+
+## Check for the existence of some platform-specific functions
+if (HAVE_SIGNAL_H)
+ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} "signal.h")
+ check_function_exists(sigaction HAVE_SIGACTION)
+ check_function_exists(signal HAVE_SIGNAL)
+endif(HAVE_SIGNAL_H)
+
+## Write out a configuration file
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/config.h
+)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+## Add the actual source directories
+add_subdirectory(src)
+add_subdirectory(doc)
+add_subdirectory(pkg)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/CREDITS b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/CREDITS
new file mode 100644
index 0000000..ebdf0a2
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/CREDITS
@@ -0,0 +1,90 @@
+Vidalia is currently developed by:
+ Matt Edman <edmanm at vidalia-project.net>
+
+
+Contributors:
+ Domenik Bork was a Google Summer of Code student during Summer 2008 and
+ added the hidden service configuration interface.
+
+ Ren Bucholz <http://homes.eff.org/~renbucholz/tor/> created some of the
+ onion images off of which Corinna's icons and some of our own images are
+ based.
+
+ Dan Christensen <http://opello.org/> added additional image formats to
+ the .ico files to support more Windowses. He also created the graph style
+ icons in the bandwidth graph settings.
+
+ dr|z3d created the Vidalia logo design and image files and helped redesign
+ the Vidalia website.
+
+ Geoff Goodell <http://afs.eecs.harvard.edu/~goodell/> supplied us with
+ nearly all of the flag icons that we use in the Appearance configuration
+ page and network map. He also created the router status icons we use in
+ the network map.
+
+ Corinna Habets <corinna at geekin.de> created the images off which
+ our application icons are based.
+
+ Matt Hanson <http://www.zuerchertech.com/> tweaked Corinna's images a bit
+ and created some .icos based off of them.
+
+ Justin Hipple <hipplej at vidalia-project.net> co-founded the Vidalia project
+ and helped with lots of the initial development.
+
+ Andrew Lewman wrote the original Mac OS X bundle installer off which
+ Vidalia's is based, and also added Torbutton to the bundle.
+
+ This product includes GeoLite data created by MaxMind, available from
+ http://maxmind.com/
+
+ Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> wrote the code
+ to launch a web browser when Tor has built a circuit and close Vidalia when
+ the browser has exited. He also implemented UPnP support using the MiniUPNPc
+ library.
+
+ Brandon Nase <http://www.students.dsu.edu/naseb/> designed and built
+ the original vidalia-project.net website.
+
+ Christoph Sieghart (sigi) <http://www.0x2a.at/blog/> gave us some code that
+ converts world space coordinates (latitude,longitude) into image space
+ coordinates (x,y) which we used in the Net Viewer.
+
+ Michael Zuercher and Adam Tomjack of Zuerchertech LLC
+ <http://www.zuerchertech.com> gave us the ZImageView class which handles
+ drawing, scrolling and zooming the map image in the Network Viewer.
+
+
+Translators:
+ Albanian Frederik Nosi
+ Arabic Ahmad Gharbeia
+ Bulgarian kutia0001
+ Czech el Mar <http://airdump.net>
+ Dutch Ater Atrocitas
+ Farsi persepolis
+ Hossein
+ Finnish DJ Hasis
+ French Michel Burkhardt
+ eight118
+ Daniel Berthereau
+ German Christoph Sieghart
+ Steffen Dabbert
+ Hebrew Anonymous
+ Hungarian Tibor Fekete
+ Italian Alex Mazzariol
+ Japanese Nardog
+ Benessa Defend
+ Norwegian xiando
+ Micromus
+ Polish ZeeWolf
+ Portuguese Mabat Haram
+ Russian ygrek
+ Spanish dererk
+ desolator
+ Simplified Chinese Wu Xiaoguang
+ LinHongJun
+ Swedish Amin Amini
+ DJHasis
+ Traditional Chinese LinHongJun
+ Turkish Yunus Kaba
+ Omer Ishakoglu
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/HACKING b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/HACKING
new file mode 100644
index 0000000..ee27a53
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/HACKING
@@ -0,0 +1,299 @@
+$Id: HACKING 3828 2009-06-09 23:41:54Z edmanm $
+
+ Vidalia Coding and Repository Specification
+
+0. Introduction
+
+ This document is intended to loosely specify coding conventions followed in
+ Vidalia code, as well as conventions used in Vidalia's Subversion
+ repository.
+
+1. Repository Organization
+
+1.1. Subversion Location
+
+ Vidalia's repository supports anonymous checkout. You can grab the most
+ recent revision of Vidalia's source code via:
+
+ svn co https://svn.vidalia-project.net/svn/vidalia/trunk/ vidalia
+
+1.2 Directory Layout
+
+ The following are the current directories found in Vidalia's SVN repository
+ and a general decription of their intended contents:
+
+ From https://svn.vidalia-project.net/svn/vidalia:
+
+ ./tags:
+
+ Snapshots of all Vidalia releases will be contained in a sub-directory
+ of ./tags, named according to the Vidalia version specification.
+ For example, ./tags/vidalia-0.0.1/ would contain the 0.0.1 release of
+ Vidalia.
+
+ ./trunk:
+
+ Contains the main branch of Vidalia's source code.
+
+ ./trunk/doc:
+
+ Contains Vidalia's documentation, such as specifications and todo
+ lists.
+
+ ./trunk/src:
+
+ All Vidalia source code will be contained under this directory.
+
+ ./trunk/src/torcontrol:
+
+ Code in this directory implements Tor's control protocol. It also
+ handles things such as starting and stopping Tor and checking the
+ status of the Tor process.
+
+ ./trunk/src/vidalia:
+
+ This directory contains code that implements the GUI components of
+ Vidalia. Whenever possible and sane, each component should be placed in
+ an appropriately-named subdirectory of ./trunk/src/vidalia.
+
+ ./trunk/src/vidalia/res:
+
+ All GUI-related resource files, such as images, should go in this
+ directory. Images should be placed in sub-directories appropriate for
+ their image size. For example, 16x16 images would go in
+ ./trunk/src/vidalia/res/16x16/
+
+ ./trunk/src/common:
+
+ If a source file doesn't belong in the previous directories, it should
+ go here. This directory will containg various utility functions, such
+ as date or time parsing, custom string manipulation functions, etc. If
+ a particular utility has multiple source files, they should all be
+ placed in a subdirectory. For example, if there were several source
+ files that implemented various string manipulation functions, they
+ could go in ./trunk/src/common/string.
+
+2. Coding Conventions
+
+ This section aims to provide a small overview of coding conventions used in
+ Vidalia, to keep the look of the code consistent between developers and
+ contributors. Since it would be impossible to specify all aspects of coding
+ here, common sense should be employed for things not specified below.
+
+2.1. Naming Conventions
+
+2.1.1. Source File Names
+
+ C++ classes should be divided in to a <ClassName>.h file, containing the
+ class declarations, and a <ClassName>.cpp file containg the class
+ implementation. Each .cpp file should implement only one public class.
+ Filenames containing a class should follow the same "CamelCase"
+ capitalization format as the class name itself.
+
+ Source files that do not implement a C++ class should be named logically and
+ in all lowercase letters. For example, threading-related code would go in
+ thread.cpp and thread.h.
+
+
+2.1.2. Class Names
+
+ Class names should begin with a capital letter. If a name is a combination
+ of distinct words, each word should be capitalized. The purpose of the class
+ should be explained in Doxygen tags. Example:
+
+ /** A brief description of MyClass. */
+ /**
+ * Alternatively, here is a more detailed description of MyClass.
+ */
+ class MyClass
+ {
+ };
+
+
+ Doxygen-style comments should be used above each method declaration in
+ the class.
+
+2.1.3. Method Names
+
+ Method names should begin with a lower case letter. If a method name is a
+ combination of distinct words, each word should be capitalized. Methods
+ should have descriptions of their purpose. Example:
+
+ /* Description of what someMethod does. */
+ int
+ MyClass::someMethod(int foo)
+ {
+ }
+
+ Doxygen tags should be used for comments above the method definition
+ ONLY if the method's declaration in the class header file does not
+ already have a Doxygen-style comments.
+
+ Note that the method's return type is declared on a line by itself. Private
+ member function should NOT have an underscore prepended to their name.
+
+2.1.4. Variable Names
+
+ Variable names should follow a convention similar to method names. Variable
+ names should be descriptive if their purpose is non-obvious.
+
+ Variables that are members of a class should have a leading underscore to
+ distinguish them from local variables in a method. Member variables should
+ also have a description of their purpose in Doxygen tags. For example:
+
+ /** A brief description of MyClass */
+
+ /**
+ * A more detailed description of MyClass.
+ */
+ class MyClass
+ {
+ private:
+ int _myVariable; /**< Description of what _myVariable is */
+ };
+
+2.1.5. Ordering of Method and Member Variable Declarations
+
+ Class member method and variable declarations should be arranged according
+ to decreasing order of visibility.
+
+ class MyClass : public QObject
+ {
+ Q_OBJECT
+
+ public:
+ /* Public enums */
+
+ /* Public methods */
+
+ public slots:
+ /* Public slots */
+
+ signals:
+ /* Signals emitted by this class */
+
+ protected:
+ /* Protected methods */
+
+ /* Protected member variables */
+
+ protected slots:
+ /* Protected slots */
+
+ private:
+ /* Private methods */
+
+ /* Private member variables */
+
+ private slots:
+ /* Private slots */
+ };
+
+2.1.6. Widget Names
+
+ Every widget declared in a Qt Designer .ui file must have a short three or
+ four letter prefix that describes the widget's type.
+
+ Widget Type Prefix Example
+ ------------------------------------------------------------
+ QCheckBox chk chkEnableFoo
+ QComboBox cmbo cmboNames
+ QDialogButtonBox - buttonBox
+ QFrame frm frmMain
+ QGroupBox grp grpAdvanced
+ QLabel lbl lblHeader
+ QLineEdit line lineAddress
+ QListView lst lstMessages
+ QProgressBar pbar pbarDownload
+ - progressBar
+ QPushButton btn btnClose
+ QRadioButton rdo rdoSomeOption
+ QSpinBox spn spnDial
+ QTableView tbl tblSpreadsheet
+ QTabWidget tab tabServerOptions
+ QToolButton btn btnExit
+ QTreeView tree treeFolders
+
+
+2.2. Comments
+
+ Comments should be standard C style comments. For example:
+
+ int fooCounter; /* Comment about counting foo */
+
+ Multi-line comments should be formatted as:
+
+ /*
+ * This section of code is potentially confusing or ambiguous, so here is a
+ * long comment that takes up multiple lines.
+ */
+
+2.3. Indentation
+
+ All source code should follow these conventions:
+
+ 1. Tabs should be 2 characters wide.
+ 2. Your editor should be set to replace tabs with spaces.
+ 3. Lines should be less than 80 characters wide whenever possible.
+
+2.4. Bracing
+
+2.4.1. Methods
+
+ Opening and closing braces for functions should be placed at column 1. For
+ example:
+
+ void
+ Foo::bar(void)
+ {
+ }
+
+2.4.2. Loops
+
+ Braces for loops should be formatted as follows:
+
+ for (i = 0; i < 10; i++) {
+ /* Do something ten times */
+ }
+
+2.4.3. if-else Statements
+
+ The `else' portion of an if-else statement, if present, should begin on the
+ same line as the closing brace of the `if' portion.
+
+ if (foo == bar) {
+ /* Do something */
+ } else {
+ /* My foo doesn't equal bar */
+ }
+
+ Braces may be omitted if there is only one line of code to be executed if
+ the evaluated condition is true. For example, the following is permitted:
+
+ if (foo == bar)
+ return;
+
+2.5. Parentheses
+
+ There should NOT be a space between an opening parenthesis and the
+ first argument, nor between the end of the last argument and a closing
+ parenthesis.
+
+ int value = someObject.someMethod(foo, bar, baz);
+
+2.6. Method Arguments
+
+ const-correctness should be enforced whenever possible. Objects passed as
+ arguments to a method should be passed by a const reference, as in the
+ following example:
+
+ void
+ SomeClass::someMethod(const OtherClass &oc)
+ {
+ /* Do something with oc */
+ }
+
+2.7. Other
+
+ Source files should end with a single blank line.
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/INSTALL b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/INSTALL
new file mode 100644
index 0000000..b48b579
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/INSTALL
@@ -0,0 +1,269 @@
+
+ Instructions for Building and Installing Vidalia from Source
+
+
+Before building and running Vidalia, you will need to have the following
+packages installed:
+
+ * Qt >= 4.3 http://qt.nokia.com/downloads
+ * Tor >= 0.2.0.34 https://www.torproject.org/download.html
+ * CMake >= 2.4.0 http://www.cmake.org/HTML/Download.html
+
+
+Linux/BSD/Unix
+--------------
+ 1. To configure and compile Vidalia, you can run the following sequence of
+ commands:
+
+ mkdir build && cd build
+ cmake ..
+ make
+
+ 2. When the previous command finishes, Vidalia's binary will be
+ placed in the build/src/vidalia/ directory.
+
+ 3. Optionally, you can run `make install` to install Vidalia into
+ your /usr/local/bin/ directory.
+
+
+Mac OS X
+--------
+CMake on Mac OS X gives you the option of compiling Vidalia from the command
+line using standard Unix Makefiles, or generating an Xcode project if you
+prefer building from an IDE.
+
+ 1. To build Vidalia from the command line, you can run:
+
+ mkdir build && cd build
+ cmake ..
+ make
+
+ Alternatively, you can have CMake generate an Xcode project for Vidalia
+ by running:
+
+ mkdir xcode && cd xcode
+ cmake -G Xcode ..
+
+ 2. If you built from the command line, Vidalia's binary will be in an
+ application bundle located at build/src/vidalia/Vidalia.app. You can copy
+ Vidalia.app to your Applications folder, if you prefer.
+
+ If you're building from a CMake-generated Xcode project, you can simply
+ click "Build & Go" in Xcode to build and run Vidalia. Or, you can run
+ 'xcodebuild' if you prefer building from the command line.
+
+
+Windows with MinGW
+-------------------
+ 1. Make sure the following directories are in your PATH environment
+ variable:
+
+ * CMake (e.g., "C:\Program Files\CMake 2.4\bin")
+ * MinGW (e.g., "C:\MinGW\bin")
+ * Qt (e.g., "C:\Qt\4.3.2\bin")
+
+ 2. Configure Vidalia and generate Makefiles by running:
+
+ mkdir build && cd build
+ cmake -G "MinGW Makefiles" ..
+
+ There should be no spaces in the path to your build directory. Otherwise,
+ Vidalia will fail to build.
+
+ 3. Compile Vidalia by running:
+
+ mingw32-make
+
+
+If CMake fails to find your Qt installation, you can explicitly tell CMake
+where to find Qt as in the following example:
+
+ cmake -DQT_QMAKE_EXECUTABLE="C:\Qt\4.3.2\bin\qmake.exe" ..
+
+You would replace "C:\Qt\4.3.2\bin" in the previous command with the actual
+path to your Qt installation's qmake.exe binary.
+
+
+Windows with Visual Studio
+--------------------------
+Starting with Qt 4.3.2, the open source editions of Qt/Win include support for
+Visual Studio. Previously, Visual Studio support was limited to commercial
+editions of Qt unless you patched Qt's source.
+
+To build Vidalia under Visual Studio, you will first need to obtain Qt's
+source code and compile it with Visual Studio support. The following
+directions show how to compile Qt with Visual Studio 2005 support, but a
+similar process can be followed for other versions of VS.
+
+ 1. Download and install Visual C++ 2005 Express
+
+ http://www.microsoft.com/express/2005/download/default.aspx
+
+ 2. Download and install the Windows Platform SDK and configure Visual C++ with
+ the location of the Platform SDK's executable, include, and library
+ directories.
+
+ http://msdn2.microsoft.com/en-us/express/aa700755.aspx
+
+ It is important to also install the "Microsoft Web Workshop (IE) SDK", even
+ though that seems irrelevant.
+
+ 3. Download the Qt/Windows open source edition source code and extract it to a
+ directory with no spaces (e.g., C:\Qt\4.3.3).
+
+ http://qt.nokia.com/downloads/windows-cpp
+
+ 4. Edit the Visual Studio 2005 command prompt environment variables to
+ include the platform SDK files, by opening
+
+ C:\Program Files\Microsoft Visual Studio 8\Common7\Tools\vsvars32.bat
+
+ and adding
+
+ C:\Program Files\Microsoft Platform SDK for Windows Servers 2003 R2\Include
+
+ to the INCLUDE variable and
+
+ C:\Program Files\Microsoft Platform SDK for Windows Servers 2003 R2\Lib
+
+ to the LIB variable. Modify the path to the platform SDK files as
+ appropriate, depending on where you installed Visual Studio and the
+ Platform SDK in Steps 1 and 2.
+
+ 5. Open the Visual Studio 2005 Command Prompt and 'cd' to the location of
+ your extracted Qt source code (e.g., C:\Qt\4.3.3).
+
+ 6. Configure Qt with support for your version of Visual Studio. For example,
+ to configure Qt with support for Visual Studio 2005, you would run:
+
+ configure.exe -debug-and-release -static -fast -platform win32-msvc2005
+
+ See Qt's README file for more available platform options.
+
+ 7. Compile Qt by running:
+
+ nmake.exe
+
+ (NOTE: This step will take several hours and lots of hard drive space.)
+
+Once you have Qt compiled with Visual Studio support, you can use CMake to
+generate a Visual Studio project file by running
+
+ mkdir build && cd build
+ cmake -G "Visual Studio 8 2005" ..
+
+or whatever your particular version of Visual Studio happens to be.
+'cmake --help' lists other available generators.
+
+
+Windows with NMake
+-------------------
+To compile Vidalia from the command line using NMake, you will first need to
+follow the steps under the 'Windows with Visual Studio' section for compiling
+Qt with Visual Studio support.
+
+If you want to build Vidalia from the command line, you can have CMake
+generate NMake makefiles by running:
+
+ mkdir build && cd build
+ cmake -G "NMake Makefiles" ..
+
+You can then compile Vidalia from the command line by simply running:
+
+ nmake
+
+
+Available Configuration Options
+-------------------------------
+You can customize your Vidalia build by supplying arguments and values to the
+`cmake` commands above. Each of the configuration options can be specified on
+the command line and follows the format "-D <var>:<type>=<value>
+
+ -DUSE_QSSLSOCKET=0
+
+ Disable building Vidalia with SSL support.
+
+ -DUSE_MINIUPNPC=0
+
+ Disable UPnP support in Vidalia.
+
+ -DOSX_FAT_BINARY=1
+
+ Build Vidalia as a Universal binary.
+
+ -DOSX_TIGER_COMPAT=1
+
+ Build Vidalia compatible with OS X Tiger (10.4).
+
+ -DOSX_FORCE_32BIT=1
+
+ Forces a 32-bit build. This is useful on platforms that default to 64-bit
+ (e.g. Snow Leopard), but only have 32-bit versions of the Qt libraries
+ available.
+
+ -DQT_QMAKE_EXECUTABLE=/path/to/qmake
+
+ Specifies the location of Qt's 'qmake' binary.
+
+ -DOPENSSL_LIBRARY_DIR=/path/to/openssl
+
+ Specifies the location of OpenSSL's libraries.
+
+ -DCMAKE_INSTALL_PREFIX=/usr/local
+
+ Specifies the install prefix used for `make install`.
+
+ -DCMAKE_BUILD_TYPE=<buildtype>
+
+ Available build types include: "release", "debug", "minsizerel"
+
+ -DUSE_MARBLE=1
+
+ Replace the flat map with a 3-D sphere using the Marble libraries.
+
+ -DWIX_BINARY_DIR=C:\Path\To\WiX\
+
+ Specifies the location of your WiX executables, such as candle.exe and
+ light.exe (optional, Windows-only).
+
+
+For example, to configure CMake to look for Qt in "/usr/local/Qt-4.3.2/bin",
+you would run:
+
+ cmake -DQT_QMAKE_EXECUTABLE=/usr/local/Qt-4.3.2/bin/qmake ..
+
+Don't forget the dot(s) at the end!
+
+CMake also supports other generators besides Makefiles on certain platforms.
+See 'cmake --help' or 'man cmake' (on non-Windows platforms) for more
+information about supported generators and configuration options.
+
+
+Additional Build Targets
+-------------------------
+Vidalia contains a number of additional CMake build targets to assist in
+building code documentation and platform-specific packages. The targets are:
+
+ 'dist' Creates a Vidalia source code tarball.
+
+ 'dist-osx' Creates a Vidalia-only Mac OS X .dmg.
+
+ 'dist-osx-bundle' Creates a Vidalia bundle .dmg. See
+ pkg/osx/build-bundle.txt for additional
+ information on the CMake options necessary to create
+ a proper OS X bundle.
+
+ 'dist-osx-split-bundle' Creates a "split" Mac OS X bundle. See
+ pkg/osx/build-bundle.txt for additional
+ information on the CMake options necessary to create
+ a proper OS X bundle.
+
+ 'dist-win32' Creates a Windows .msi package. You will also
+ need to define -DWIX_BINARY_DIR=<path-to-WiX>
+ in order to use this build target.
+
+ 'doxygen' Creates the Doxygen-generated code
+ documentation for Vidalia's source. You must
+ have Doxygen installed for this target to
+ function.
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/LICENSE b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/LICENSE
new file mode 100644
index 0000000..4014c16
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/LICENSE
@@ -0,0 +1,279 @@
+=======
+LICENSE
+=======
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License (GPL) as published by
+the Free Software Foundation; either version 2 of the License, or (at
+your option) any later version. The full text of versions 2 and 3 of
+the GPL can be found respectively in the files LICENSE-GPLV2 and
+LICENSE-GPLV3.
+
+EXCEPTION: This distribution of Vidalia may be linked against OpenSSL
+according to the terms of the section below entitled "OpenSSL Exception."
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+ _OpenSSL Exception_
+
+0. Definitions
+
+"Vidalia" means Vidalia software licensed under version 2 or any later
+version of the GNU General Public License (collectively, "GPL"), or a
+work based on such software and licensed under the GPL.
+
+"OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL
+Project and licensed under the OpenSSL Licenses, or a work based on such
+software and licensed under the OpenSSL Licenses.
+
+"OpenSSL Licenses" means the OpenSSL License and Original SSLeay License
+under which the OpenSSL Project distributes the OpenSSL toolkit software,
+as those licenses appear in the file LICENSE-OPENSSL.
+
+1. Exception
+
+You have permission to copy, modify, propagate, and distribute a work
+formed by combining OpenSSL with Vidalia, or a work derivative of such a
+combination, even if such copying, modification, propagation, or
+distribution would otherwise violate the terms of the GPL. You must
+comply with the GPL in all respects for all of the code used other than
+OpenSSL.
+
+You may include this OpenSSL Exception and its grant of permissions when
+you distribute Vidalia. Inclusion of this notice with such a
+distribution constitutes a grant of such permission. If you do not wish
+to grant these permissions, remove this section entitled "OpenSSL
+Exception" from your distribution.
+
+
+===================================================================
+
+Vidalia incorporates icons from KDE's Oxygen icon theme. It is
+licensed as follows:
+
+ Copyright (C) 2007 David Vignoni <david at icon-king.com>
+ Copyright (C) 2007 Johann Ollivier Lapeyre <johann at oxygen-icons.org>
+ Copyright (C) 2007 Kenneth Wimer <kwwii at bootsplash.org>
+ Copyright (C) 2007 Nuno Fernades Pinheiro <nf.pinheiro at gmail.com>
+ Copyright (C) 2007 Riccardo Iaconelli <riccardo at oxygen-icons.org>
+ Copyright (C) 2007 David Miller <miller at oxygen-icons.org>
+
+and others
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 3 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+===================================================================
+
+Tor is distributed under this license:
+
+Copyright (c) 2001-2004, Roger Dingledine
+Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson
+Copyright (c) 2007-2009, The Tor Project, Inc.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+ * Neither the names of the copyright owners nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+src/common/strlcat.c and src/common/strlcpy.c by Todd C. Miller are licensed
+under the following license:
+
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller at courtesan.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+If you got Tor as a static binary with OpenSSL included, then you should know:
+ "This product includes software developed by the OpenSSL Project
+ for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+===============================================================================
+
+The function append_string() in Vidalia's src/vidalia/CrashReporter.cpp is
+also derived from the strlcat() implementation by Todd C. Miller. It is
+licensed under the following license:
+
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller at courtesan.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+===============================================================================
+
+Some of the help documentation text used in Vidalia is derived from the TorFAQ
+Wiki <http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ>. It is licensed
+under the MIT license as follows:
+
+ Copyright (c) 2003-2007 Roger Dingledine
+ Copyright (c) 2004-2005 Nick Mathewson
+ Copyright (c) 2004 Douglas F. Calvert
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+===============================================================================
+
+This product includes GeoIP data created by MaxMind, available from
+http://maxmind.com. It is licensed as follows:
+
+OPEN DATA LICENSE (GeoLite Country and GeoLite City databases)
+
+Copyright (c) 2007 MaxMind LLC. All Rights Reserved.
+
+All advertising materials and documentation mentioning features or use of
+this database must display the following acknowledgment:
+"This product includes GeoLite data created by MaxMind, available from
+http://maxmind.com/"
+
+Redistribution and use with or without modification, are permitted provided
+that the following conditions are met:
+1. Redistributions must retain the above copyright notice, this list of
+conditions and the following disclaimer in the documentation and/or other
+materials provided with the distribution.
+2. All advertising materials and documentation mentioning features or use of
+this database must display the following acknowledgement:
+"This product includes GeoLite data created by MaxMind, available from
+http://maxmind.com/"
+3. "MaxMind" may not be used to endorse or promote products derived from this
+database without specific prior written permission.
+
+THIS DATABASE IS PROVIDED BY MAXMIND.COM ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL MAXMIND.COM BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+===============================================================================
+
+Vidalia uses the MiniUPnPc library for UPnP support. It is licensed as
+follows:
+
+ Copyright (c) 2005-2007, Thomas BERNARD
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials
+ provided with the distribution.
+
+ * Neither the names of the copyright owners nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/LICENSE-GPLV2 b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/LICENSE-GPLV2
new file mode 100644
index 0000000..3912109
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/LICENSE-GPLV2
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/LICENSE-GPLV3 b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/LICENSE-GPLV3
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/LICENSE-GPLV3
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/LICENSE-LGPLV3 b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/LICENSE-LGPLV3
new file mode 100644
index 0000000..fc8a5de
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/LICENSE-LGPLV3
@@ -0,0 +1,165 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/LICENSE-OPENSSL b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/LICENSE-OPENSSL
new file mode 100644
index 0000000..ff99d97
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/LICENSE-OPENSSL
@@ -0,0 +1,127 @@
+
+ LICENSE ISSUES
+ ==============
+
+ The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
+ the OpenSSL License and the original SSLeay license apply to the toolkit.
+ See below for the actual license texts. Actually both licenses are BSD-style
+ Open Source licenses. In case of any license issues related to OpenSSL
+ please contact openssl-core at openssl.org.
+
+ OpenSSL License
+ ---------------
+
+/* ====================================================================
+ * Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ * software must display the following acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For written permission, please contact
+ * openssl-core at openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ * nor may "OpenSSL" appear in their names without prior written
+ * permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com). This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay at cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to. The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code. The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh at cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * "This product includes cryptographic software written by
+ * Eric Young (eay at cryptsoft.com)"
+ * The word 'cryptographic' can be left out if the rouines from the library
+ * being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ * the apps directory (application code) you must include an acknowledgement:
+ * "This product includes software written by Tim Hudson (tjh at cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed. i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/README b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/README
new file mode 100644
index 0000000..c546af2
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/README
@@ -0,0 +1,24 @@
+================================
+Overview
+================================
+Vidalia is a cross-platform controller GUI for Tor, built using the Qt
+framework. Using Vidalia, you can start and stop Tor, view the status of Tor
+at a glance, and monitor Tor's bandwidth usage. Vidalia also makes it easy to
+contribute to the Tor network by helping you set up and manage your own Tor
+server.
+
+Vidalia runs on most platforms supported by Qt 4.3 or later, including
+Windows, Mac OS X, and Linux or other Unix variants using the X11 window
+system.
+
+Vidalia is written by Matt Edman and Justin Hipple.
+See the LICENSE file for licensing information.
+
+================================
+Installation (Mac OS X)
+================================
+Installation is simple. Drag the Vidalia icon to Applications.
+
+In Finder, browse to Applications and then double-click the Vidalia
+icon.
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/README.breakpad b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/README.breakpad
new file mode 100644
index 0000000..3e5e7d6
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/README.breakpad
@@ -0,0 +1,94 @@
+
+ Building Vidalia with Breakpad-based Crash Reporting Support
+
+
+Windows
+--------
+Pre-requisites:
+ * Subversion
+ * CMake 2.4 or later (CMake >= 2.6 preferred)
+ * Microsoft Visual C++ Professional 2005 or later (VC++ >= 2008 preferred)
+ NOTE: Google Breakpad requires Microsoft's ATL, so users of Visual Studio
+ "Express" editions may need to install that separately (if even
+ supported).
+
+1. Download and build Qt with Visual Studio support
+ 1.1. Download the latest Qt source code for Windows from Qt's website:
+
+ http://get.qtsoftware.com/qt/source/
+
+ 1.2. Extract the .zip file to a directory
+ 1.3. Open a Visual Studio command prompt
+ 1.4. 'cd' to the location of your extract Qt source
+ 1.5. We want to enable building .pdb files for the release versions of the
+ Qt DLLs, since Breakpad derives its symbol information from the .pdb
+ files. To do so, unfortunately we have to edit the qmake.conf "mkspec"
+ for the compiler we're using. For example, if you're using Visual
+ Studio 2008, you would open the file
+
+ $QTDIR\mkspecs\win32-msvc2008\qmake.conf
+
+ (where $QTDIR is the location of your Qt source code) and add "-Zi" to
+ QMAKE_CFLAGS_RELEASE. The resulting line would look like:
+
+
+ QMAKE_CFLAGS_RELEASE = -Zi -O2 -MD -GL
+
+ You also need to add "/DEBUG /OPT:REF /OPT:ICF" to the list of linker
+ flags in QMAKE_LFLAGS_RELEASE. The resulting line should look like the
+ following:
+
+ QMAKE_LFLAGS_RELEASE = /DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO /LTCG
+
+ Different Visual Studio mkspecs may look slightly different and have
+ different sets of default flags. Save your changes to qmake.conf after
+ you're done.
+
+ 1.6. Configure the Qt source for a Visual Studio build, along with whatever
+ other options you want (e.g., OpenSSL support). As an example, I used
+ the following command to configure my Qt:
+
+ $ configure.exe -platform win32-msvc2008 \
+ -opensource -debug-and-release \
+ -fast -no-qt3support \
+ -nomake demos -nomake examples \
+ -openssl -I E:\OpenSSL\9.8k\include \
+ -L E:\OpenSSL\9.8k\lib\VC
+
+ 1.7. After configure.exe is finished running, simply run nmake.exe to build
+ Qt. The entire process may take several hours depending on the options
+ used and the speed of your machine.
+
+2. Download and build the latest Breakpad source from Subversion
+ 2.1. Fetch the latest Google Breakpad source code from Subversion
+
+ $ svn cp http://google-breakpad.googlecode.com/svn/trunk/ breakpad
+
+ 2.2. Open breakpad\src\client\windows\breakpad_client.sln
+ 2.3. Right-click on the "crash_generation" project and select 'Properties'
+ 2.4. Go to "Configuration Properties" -> "C/C++" -> "Language" and disable
+ "Treat wchar_t as Built-in Type".
+ 2.5. Repeat 2.2 and 2.3 for the "crash_report_sender" and "exception_handler"
+ projects as well.
+ 2.6. Right-click on the top-level solution and select "Build Solution" or
+ hit F7 to build the entire solution.
+
+3. Build Vidalia with Breakpad support enabled
+ 3.1. Fetch the latest 'breakpad' branch from Vidalia's Subversion repository.
+
+ $ svn co https://svn.vidalia-project.net/svn/vidalia/branches/breakpad vidalia-breakpad
+
+ 3.2. Use CMake to generate a Visual Studio .sln file for Vidalia with
+ Breakpad support enabled.
+
+ $ mkdir build-vs
+ $ cd build-vs
+ $ cmake.exe -DUSE_BREAKPAD=1 \
+ -DBREAKPAD_INCLUDE_DIR=E:\breakpad\src \
+ -DBREAKPAD_LIBRARY_DIR=E:\Breakpad\src\client\windows\Debug ..
+
+ You will need to adjust the paths above to point to the location of
+ the Breakpad source directory and binaries you built in Step 2.
+ 3.3. Open the solution file build-vs\Vidalia.sln with Visual Studio.
+ 3.4. Right-click on the top-level solution and select "Build Solution", or
+ hit F7 to build the entire solution.
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/README.marble b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/README.marble
new file mode 100644
index 0000000..a6be4be
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/README.marble
@@ -0,0 +1,62 @@
+
+Building Vidalia with KDE Marble Support
+----------------------------------------
+
+Vidalia recently added experimental support for replacing the existing 2D
+network map widget with the KDE Marble 3D globe widget. It is currently a
+compile-time option and is disabled by default.
+
+The following steps build Vidalia with the Marble widget.
+
+1. Download the patched version of Marble.
+
+ svn co https://svn.vidalia-project.net/svn/marble/trunk marble
+
+Hopefully these patches will soon be merged into Marble's trunk. For now, we
+still have to build with the Vidalia-specific patched Marble.
+
+2. Build the patched Marble.
+
+ OS X:
+ cd ~/marble
+ mkdir build && cd build
+ cmake -DCMAKE_INSTALL_PREFIX=. -DQTONLY=1 ..
+ make && make install
+
+ If you are building a Universal binary, you will need to make the following
+ changes to ~/marble/CMakeLists.txt before building Marble:
+
+ - #SET( CMAKE_OSX_ARCHITECTURES ppc;i386 ) #Comment out if not universal binary
+ - SET( CMAKE_OSX_ARCHITECTURES i386 ) #Comment out if universal binary
+ + SET( CMAKE_OSX_ARCHITECTURES ppc;i386 ) #Comment out if not universal binary
+ + #SET( CMAKE_OSX_ARCHITECTURES i386 ) #Comment out if universal binary
+
+ Everywhere else:
+ cd marble
+ mkdir build && cd build
+ cmake -DQTONLY=1 ..
+ make && make install
+
+3. Configure Vidalia with Marble support.
+
+ OS X & Windows:
+ cd vidalia (or wherever your Vidalia source tree lives)
+ mkdir build && cd build
+ 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 ..
+
+ Everywhere else:
+ cd vidalia (or wherever your Vidalia source tree lives)
+ mkdir build && cd build
+ cmake -DUSE_MARBLE=1 ..
+
+You will need to adjust each of the paths above according to where you checked
+out and installed Marble in Steps 1 and 2.
+
+4. Build Vidalia
+
+ See the INSTALL file included with Vidalia for details.
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/FindBreakpad.cmake b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/FindBreakpad.cmake
new file mode 100644
index 0000000..607d054
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/FindBreakpad.cmake
@@ -0,0 +1,50 @@
+##
+## $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.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.
+##
+
+## Tries to find the required Google Breakpad libraries. Once done this will
+## define the variable BREAKPAD_LIBRARIES.
+
+message(STATUS "Looking for Google Breakpad libraries")
+if (WIN32)
+ if (MSVC)
+ find_library(BREAKPAD_EXCEPTION_HANDLER_LIB
+ NAMES exception_handler
+ PATHS ${BREAKPAD_LIBRARY_DIR}
+ )
+ if (NOT BREAKPAD_EXCEPTION_HANDLER_LIB)
+ message(FATAL_ERROR
+ "Could not find Breakpad exception handler library")
+ endif(NOT BREAKPAD_EXCEPTION_HANDLER_LIB)
+
+ find_library(BREAKPAD_CRASH_GENERATION_LIB
+ NAMES crash_generation
+ PATHS ${BREAKPAD_LIBRARY_DIR}
+ )
+ if (NOT BREAKPAD_CRASH_GENERATION_LIB)
+ message(FATAL_ERROR
+ "Could not find Breakpad crash generation library")
+ endif(NOT BREAKPAD_CRASH_GENERATION_LIB)
+
+ set(BREAKPAD_LIBRARIES
+ ${BREAKPAD_EXCEPTION_HANDLER_LIB}
+ ${BREAKPAD_CRASH_GENERATION_LIB}
+ )
+ message(STATUS "Looking for Google Breakpad libraries - found")
+ else(MSVC)
+ message(FATAL_ERROR
+ "Breakpad support on Windows currently requires Visual Studio.")
+ endif(MSVC)
+else(WIN32)
+ message(FATAL_ERROR
+ "Breakpad support is not currently available on your platform.")
+endif(WIN32)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/FindMarble.cmake b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/FindMarble.cmake
new file mode 100644
index 0000000..148c3ca
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/FindMarble.cmake
@@ -0,0 +1,111 @@
+##
+## $Id: FindMarble.cmake 3588 2009-02-24 20:21:40Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+## This file incorporates work from the KDE Marble project, and is covered by
+## the following copyright and permission notice:
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions are
+## met:
+##
+## * Redistributions of source code must retain the above copyright notice,
+## this list of conditions and the following disclaimer.
+##
+## * Redistributions in binary form must reproduce the above copyright
+## notice, this list of conditions and the following disclaimer in the
+## documentation and/or other materials provided with the distribution.
+##
+## * Neither the names of the copyright owners nor the names of its
+## contributors may be used to endorse or promote products derived from
+## this software without specific prior written permission.
+##
+## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+## IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+## THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+## PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+## EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+## PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+## LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+## NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+## SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+##
+
+message(STATUS "Looking for Marble header files")
+find_path(MARBLE_INCLUDE_DIR
+ NAMES MarbleWidget.h
+ PATH_SUFFIXES marble
+)
+if (MARBLE_INCLUDE_DIR)
+ message(STATUS "Looking for Marble header files - found")
+else(MARBLE_INCLUDE_DIR)
+ message(FATAL_ERROR "Could not find Marble header files. If Marble is installed, you can run CMake again and specify its location with -DMARBLE_INCLUDE_DIR=<path>")
+endif(MARBLE_INCLUDE_DIR)
+
+
+message(STATUS "Looking for Marble libraries")
+find_library(MARBLEWIDGET_LIBRARY
+ NAMES marblewidget.7 marblewidget
+ PATHS ${MARBLE_LIBRARY_DIR}
+)
+if (MARBLEWIDGET_LIBRARY)
+ message(STATUS "Looking for Marble libraries - found")
+ set(MARBLE_LIBRARIES ${MARBLEWIDGET_LIBRARY})
+ get_filename_component(MARBLE_LIBRARY_DIR ${MARBLEWIDGET_LIBRARY} PATH)
+else(MARBLEWIDGET_LIBRARY)
+ message(FATAL_ERROR "Could not find Marble libraries. If Marble is installed, you can run CMake again and specify its location with -DMARBLE_LIBRARY_DIR=<path>")
+endif(MARBLEWIDGET_LIBRARY)
+
+
+if (APPLE OR WIN32)
+ message(STATUS "Looking for Marble data files")
+ find_path(MARBLE_DATA_DIR
+ NAMES srtm.dgml
+ PATH_SUFFIXES maps/earth/srtm
+ )
+ if (MARBLE_DATA_DIR)
+ message(STATUS "Looking for Marble data files - ${MARBLE_DATA_DIR}")
+ else (MARBLE_DATA_DIR)
+ message(FATAL_ERROR "Could not find Marble libraries. If Marble is installed, you can run CMake again and specify its location with -DMARBLE_DATA_DIR=<path>")
+ endif(MARBLE_DATA_DIR)
+
+
+ message(STATUS "Looking for Marble plugin widgets")
+ find_library(MARBLE_OVERVIEWMAP_PLUGIN
+ NAMES MarbleOverviewMap
+ PATHS ${MARBLE_PLUGIN_DIR}
+ PATH_SUFFIXES render/overviewmap
+ )
+ if (MARBLE_OVERVIEWMAP_PLUGIN)
+ message(STATUS "Looking for Marble plugin widgets - found overview map plugin")
+ set(MARBLE_PLUGINS ${MARBLE_PLUGINS}
+ ${MARBLE_OVERVIEWMAP_PLUGIN}
+ )
+ endif(MARBLE_OVERVIEWMAP_PLUGIN)
+
+ find_library(MARBLE_STARS_PLUGIN
+ NAMES MarbleStarsPlugin
+ PATHS ${MARBLE_PLUGIN_DIR}
+ PATH_SUFFIXES render/stars
+ )
+ if (MARBLE_STARS_PLUGIN)
+ message(STATUS "Looking for Marble plugin widgets - found stars plugin")
+ set(MARBLE_PLUGINS ${MARBLE_PLUGINS}
+ ${MARBLE_STARS_PLUGIN}
+ )
+ endif(MARBLE_STARS_PLUGIN)
+
+ if (NOT MARBLE_PLUGINS)
+ message(STATUS "Looking for Marble plugin widgets - none found")
+ endif(NOT MARBLE_PLUGINS)
+endif(APPLE OR WIN32)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/FindOpenSSL.cmake b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/FindOpenSSL.cmake
new file mode 100644
index 0000000..c489501
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/FindOpenSSL.cmake
@@ -0,0 +1,116 @@
+##
+## $Id: FindOpenSSL.cmake 2474 2008-04-02 02:00:24Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+## This file incorporates work covered by the following copyright and
+## permission notice:
+##
+## Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions are met:
+##
+## * Redistributions of source code must retain the above copyright notice,
+## this list of conditions and the following disclaimer.
+##
+## * Redistributions in binary form must reproduce the above copyright notice,
+## this list of conditions and the following disclaimer in the documentation
+## and/or other materials provided with the distribution.
+##
+## * Neither the names of the copyright owners nor the names of its
+## contributors may be used to endorse or promote products derived from this
+## software without specific prior written permission.
+##
+## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+## AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+## ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+## CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+## SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+## INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+## CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+## ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+## POSSIBILITY OF SUCH DAMAGE.
+##
+
+## Tries to find the required OpenSSL libraries. Once done this will define
+## the variable OPENSSL_LIBRARIES.
+
+message(STATUS "Looking for OpenSSL libraries")
+if (MSVC)
+ # /MD and /MDd are the standard values - if somone wants to use
+ # others, the libnames have to change here too
+ # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
+
+ find_library(OPENSSL_LIBSSL_DEBUG
+ NAMES ssleay32MDd ssl ssleay32
+ PATHS ${OPENSSL_LIBRARY_DIR}
+ )
+ find_library(OPENSSL_LIBSSL_RELEASE
+ NAMES ssleay32MD ssl ssleay32
+ PATHS ${OPENSSL_LIBRARY_DIR}
+ )
+ find_library(OPENSSL_LIBCRYPTO_DEBUG
+ NAMES libeay32MDd crypto libeay32
+ PATHS ${OPENSSL_LIBRARY_DIR}
+ )
+ find_library(OPENSSL_LIBCRYPTO_RELEASE
+ NAMES libeay32MD crypto libeay32
+ PATHS ${OPENSSL_LIBRARY_DIR}
+ )
+
+ if (MSVC_IDE)
+ if (NOT OPENSSL_LIBSSL_DEBUG OR NOT OPENSSL_LIBSSL_RELEASE)
+ message(FATAL_ERROR
+ "Could not find the debug and release version of libssl.")
+ endif(NOT OPENSSL_LIBSSL_DEBUG OR NOT OPENSSL_LIBSSL_RELEASE)
+ if (NOT OPENSSL_LIBCRYPTO_DEBUG OR NOT OPENSSL_LIBCRYPTO_RELEASE)
+ message(FATAL_ERROR
+ "Could not find the debug and release version of libcrypto.")
+ endif(NOT OPENSSL_LIBCRYPTO_DEBUG OR NOT OPENSSL_LIBCRYPTO_RELEASE)
+
+ set(OPENSSL_LIBSSL
+ optimized ${OPENSSL_LIBSSL_RELEASE}
+ debug ${OPENSSL_LIBSSL_DEBUG})
+ set(OPENSSL_LIBCRYPTO
+ optimized ${OPENSSL_LIBCRYPTO_RELEASE}
+ debug ${OPENSSL_LIBCRYPTO_DEBUG})
+ else(MSVC_IDE)
+ string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
+ if (CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+ set(OPENSSL_LIBSSL ${OPENSSL_LIBSSL_DEBUG})
+ set(OPENSSL_LIBCRYPTO ${OPENSSL_LIBCRYPTO_DEBUG})
+ else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+ set(OPENSSL_LIBSSL ${OPENSSL_LIBSSL_RELEASE})
+ set(OPENSSL_LIBCRYPTO ${OPENSSL_LIBCRYPTO_RELEASE})
+ endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+ endif(MSVC_IDE)
+ mark_as_advanced(OPENSSL_LIBSSL_DEBUG OPENSSL_LIBCRYPTO_DEBUG
+ OPENSSL_LIBSSL_RELEASE OPENSSL_LIBCRYPTO_RELEASE)
+else(MSVC)
+ find_library(OPENSSL_LIBSSL NAMES ssl ssleay32)
+ find_library(OPENSSL_LIBCRYPTO NAMES crypto libeay32)
+endif(MSVC)
+
+
+if (OPENSSL_LIBSSL AND OPENSSL_LIBCRYPTO)
+ set(OPENSSL_LIBRARIES ${OPENSSL_LIBSSL} ${OPENSSL_LIBCRYPTO})
+ mark_as_advanced(OPENSSL_LIBSSL OPENSSL_LIBCRYPTO)
+ mark_as_advanced(OPENSSL_LIBRARIES)
+ message(STATUS "Looking for OpenSSL libraries - found")
+else (OPENSSL_LIBSSL AND OPENSSL_LIBCRYPTO)
+ if (NOT OPENSSL_LIBSSL)
+ message(FATAL_ERROR "Could not find libssl.")
+ else (NOT OPENSSL_LIBSSL)
+ message(FATAL_ERROR "Could not find libcrypto.")
+ endif (NOT OPENSSL_LIBSSL)
+endif(OPENSSL_LIBSSL AND OPENSSL_LIBCRYPTO)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/FindWiX.cmake b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/FindWiX.cmake
new file mode 100644
index 0000000..e5d9396
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/FindWiX.cmake
@@ -0,0 +1,36 @@
+##
+## $Id: FindWiX.cmake 3371 2008-12-07 04:42:14Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+message(STATUS "Looking for WiX")
+## Search for candle.exe
+find_program(WIX_CANDLE_EXECUTABLE NAMES candle
+ PATHS ${WIX_BINARY_DIR}
+)
+
+## Search for light.exe
+find_program(WIX_LIGHT_EXECUTABLE NAMES light
+ PATHS ${WIX_BINARY_DIR}
+)
+
+if (WIX_CANDLE_EXECUTABLE AND WIX_LIGHT_EXECUTABLE)
+ message(STATUS "Looking for WiX - found")
+
+ ## Set the WiX binary directory variable, but only if it wasn't already
+ ## explicitly defined
+ if (NOT WIX_BINARY_DIR)
+ get_filename_component(WIX_BINARY_DIR ${WIX_LIGHT_EXECUTABLE} ABSOLUTE)
+ get_filename_component(WIX_BINARY_DIR ${WIX_BINARY_DIR} PATH)
+ endif(NOT WIX_BINARY_DIR)
+else (WIX_CANDLE_EXECUTABLE AND WIX_LIGHT_EXECUTABLE)
+ message(STATUS "Looking for WiX - not found.")
+endif(WIX_CANDLE_EXECUTABLE AND WIX_LIGHT_EXECUTABLE)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/ParseArgumentsMacro.cmake b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/ParseArgumentsMacro.cmake
new file mode 100644
index 0000000..574ddbf
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/ParseArgumentsMacro.cmake
@@ -0,0 +1,35 @@
+##
+## From http://www.cmake.org/Wiki/CMakeMacroParseArguments
+##
+
+MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
+ SET(DEFAULT_ARGS)
+ FOREACH(arg_name ${arg_names})
+ SET(${prefix}_${arg_name})
+ ENDFOREACH(arg_name)
+ FOREACH(option ${option_names})
+ SET(${prefix}_${option} FALSE)
+ ENDFOREACH(option)
+
+ SET(current_arg_name DEFAULT_ARGS)
+ SET(current_arg_list)
+ FOREACH(arg ${ARGN})
+ SET(larg_names ${arg_names})
+ LIST(FIND larg_names "${arg}" is_arg_name)
+ IF (is_arg_name GREATER -1)
+ SET(${prefix}_${current_arg_name} ${current_arg_list})
+ SET(current_arg_name ${arg})
+ SET(current_arg_list)
+ ELSE (is_arg_name GREATER -1)
+ SET(loption_names ${option_names})
+ LIST(FIND loption_names "${arg}" is_option)
+ IF (is_option GREATER -1)
+ SET(${prefix}_${arg} TRUE)
+ ELSE (is_option GREATER -1)
+ SET(current_arg_list ${current_arg_list} ${arg})
+ ENDIF (is_option GREATER -1)
+ ENDIF (is_arg_name GREATER -1)
+ ENDFOREACH(arg)
+ SET(${prefix}_${current_arg_name} ${current_arg_list})
+ENDMACRO(PARSE_ARGUMENTS)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/VidaliaMacros.cmake b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/VidaliaMacros.cmake
new file mode 100644
index 0000000..07b6580
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/cmake/VidaliaMacros.cmake
@@ -0,0 +1,289 @@
+##
+## $Id: VidaliaMacros.cmake 4067 2009-08-26 22:42:15Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+
+## Search for lrelease
+find_program(VIDALIA_LRELEASE_EXECUTABLE NAMES lrelease-qt4 lrelease
+ PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH
+)
+if (NOT VIDALIA_LRELEASE_EXECUTABLE)
+ message(FATAL_ERROR
+ "Vidalia could not find lrelease. Please make sure Qt >= ${QT_MIN_VERSION} is installed."
+ )
+endif(NOT VIDALIA_LRELEASE_EXECUTABLE)
+
+
+## Search for lupdate
+find_program(VIDALIA_LUPDATE_EXECUTABLE NAMES lupdate-qt4 lupdate
+ PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH
+)
+if (NOT VIDALIA_LUPDATE_EXECUTABLE)
+ message(FATAL_ERROR
+ "Vidalia could not find lupdate. Please make sure Qt >= ${QT_MIN_VERSION} is installed."
+ )
+endif(NOT VIDALIA_LUPDATE_EXECUTABLE)
+
+
+## We need windres.exe when building on Win32 to compile the .rc file
+if (WIN32 AND NOT MSVC)
+ find_program(WIN32_WINDRES_EXECUTABLE NAMES windres.exe ${QT_BINARY_DIR})
+ if (NOT WIN32_WINDRES_EXECUTABLE)
+ message(FATAL_ERROR
+ "Vidalia could not find windres. Please make sure MinGW is installed and its bin directory is in your PATH environment variable."
+ )
+ endif(NOT WIN32_WINDRES_EXECUTABLE)
+endif(WIN32 AND NOT MSVC)
+
+## Adds custom commands to the specified target that will update each of the
+## supplied .po files
+macro(VIDALIA_UPDATE_PO TARGET)
+ ## Gather a list of all the files that might contain translated strings
+ file(GLOB_RECURSE translate_SRCS ${Vidalia_SOURCE_DIR}/*.cpp)
+ file(GLOB_RECURSE translate_HDRS ${Vidalia_SOURCE_DIR}/*.h)
+ file(GLOB_RECURSE translate_UIS ${Vidalia_SOURCE_DIR}/*.ui)
+ set(translate_SRCS ${translate_SRCS} ${translate_HDRS} ${translate_UIS})
+ string(REPLACE ";" " " translate_SRCS "${translate_SRCS}")
+
+ foreach (it ${ARGN})
+ get_filename_component(po ${it} ABSOLUTE)
+ get_filename_component(podir ${it} PATH)
+ get_filename_component(outfile ${it} NAME_WE)
+
+ set(ts ${CMAKE_CURRENT_BINARY_DIR}/${outfile}.ts)
+ set(pro ${CMAKE_CURRENT_BINARY_DIR}/${outfile}.pro)
+ file(WRITE ${pro} "SOURCES = ${translate_SRCS}")
+
+ add_custom_command(TARGET ${TARGET}
+ # Convert the current .po files to .ts
+ COMMAND ${VIDALIA_PO2TS_EXECUTABLE}
+ ARGS -q -i ${po} -o ${ts}
+ # Update the .ts files
+ COMMAND ${VIDALIA_LUPDATE_EXECUTABLE}
+ ARGS -silent -noobsolete ${pro} -ts ${ts}
+ # Convert the updated .ts files back to .po
+ COMMAND ${VIDALIA_TS2PO_EXECUTABLE}
+ ARGS -q -i ${ts} -o ${po}
+ DEPENDS ${VIDALIA_TS2PO_EXECUTABLE} ${VIDALIA_PO2TS_EXECUTABLE}
+ COMMENT "Updating translation ${it}"
+ )
+ endforeach(it)
+ add_dependencies(${TARGET} ts2po)
+ add_dependencies(${TARGET} po2ts)
+endmacro(VIDALIA_UPDATE_PO)
+
+
+## Wraps the supplied .po files with commands to convert them to Qt's .qm
+## format
+macro(VIDALIA_ADD_PO outfiles)
+ foreach (it ${ARGN})
+ get_filename_component(po ${it} ABSOLUTE)
+ get_filename_component(outfile ${it} NAME_WE)
+
+ ## Create the .po -> .ts conversion step
+ set(ts ${CMAKE_CURRENT_BINARY_DIR}/${outfile}.ts)
+ set(qm ${CMAKE_CURRENT_BINARY_DIR}/${outfile}.qm)
+ add_custom_command(OUTPUT ${qm}
+ COMMAND ${VIDALIA_PO2TS_EXECUTABLE}
+ ARGS -q -i ${po} -o ${ts}
+ COMMAND ${VIDALIA_LRELEASE_EXECUTABLE}
+ ARGS -compress -silent -nounfinished ${ts} -qm ${qm}
+ MAIN_DEPENDENCY ${po}
+ DEPENDS ${VIDALIA_PO2TS_EXECUTABLE}
+ COMMENT "Generating ${outfile}.qm"
+ )
+ set(${outfiles} ${${outfiles}} ${qm})
+ endforeach(it)
+endmacro(VIDALIA_ADD_PO)
+
+
+## Wraps the input .po file specified by PO in a custom command to convert it
+## NSIS's language table format in a .nsh file. The language table is
+## specified by NSIS_LANGUAGE. The absolute path to the .nsh file will be
+## added to OUTFILES.
+macro(VIDALIA_ADD_NSH OUTFILES PO NSIS_LANGUAGE CHARSET)
+ get_filename_component(po ${PO} ABSOLUTE)
+ get_filename_component(outfile ${PO} NAME_WE)
+
+ ## Create the .po -> .nsh conversion step
+ set(nsh ${CMAKE_CURRENT_BINARY_DIR}/${outfile}.nsh)
+ add_custom_command(OUTPUT ${nsh}
+ COMMAND ${VIDALIA_PO2NSH_EXECUTABLE}
+ ARGS -q -i ${po} -f utf-8 -o ${nsh} -t ${CHARSET} -l ${NSIS_LANGUAGE}
+ MAIN_DEPENDENCY ${po}
+ DEPENDS ${VIDALIA_PO2NSH_EXECUTABLE}
+ COMMENT "Generating ${outfile}.nsh"
+ )
+ set(${OUTFILES} ${${OUTFILES}} ${nsh})
+endmacro(VIDALIA_ADD_NSH)
+
+
+## Wraps the input .po file specified by PO in a custom command to convert it
+## to WiX's localization XML document in a .wxl file. The culture name is
+## specified by CULTURE and codepage by CHARSET.
+## Note that CHARSET is not currently used to set codepage of String elements
+## but this may be necessary if Wix is not smart enough to do this right.
+macro(VIDALIA_ADD_WXL OUTFILES PO CULTURE CHARSET)
+ get_filename_component(po ${PO} ABSOLUTE)
+ get_filename_component(outfile ${PO} NAME_WE)
+
+ ## Create the .po -> .wxl conversion step
+ set(wxl ${CMAKE_CURRENT_BINARY_DIR}/${outfile}.wxl)
+ add_custom_command(OUTPUT ${wxl}
+ COMMAND ${VIDALIA_PO2WXL_EXECUTABLE}
+ ARGS -q -n ${CULTURE} -i ${po} -o ${wxl}
+ MAIN_DEPENDENCY ${po}
+ DEPENDS ${VIDALIA_PO2WXL_EXECUTABLE}
+ COMMENT "Generating ${outfile}.wxl"
+ )
+ set(${OUTFILES} ${${OUTFILES}} ${wxl})
+endmacro(VIDALIA_ADD_WXL)
+
+## Queries the specified TOR_EXECUTABLE for its version string using the
+## --version argument, parses its output and sets TOR_VERSION to the result.
+## If no version could be determined, ${TOR_VERSION} will be undefined.
+macro(VIDALIA_GET_TOR_VERSION TOR_VERSION TOR_EXECUTABLE)
+ get_filename_component(TOR_EXE_PATH ${TOR_EXECUTABLE} ABSOLUTE)
+ if (UNIX)
+ execute_process(
+ COMMAND ${TOR_EXE_PATH} --version
+ COMMAND tail -n 1
+ COMMAND awk "{print $3}"
+ COMMAND sed -e s/\\.$//
+ OUTPUT_VARIABLE ${TOR_VERSION}
+ )
+ else(UNIX)
+ message(FATAL_ERROR
+ "The vidalia_get_tor_version macro is not implemented for your platform")
+ endif(UNIX)
+ if (DEFINED ${TOR_VERSION})
+ string(STRIP ${${TOR_VERSION}} ${TOR_VERSION})
+ endif(DEFINED ${TOR_VERSION})
+endmacro(VIDALIA_GET_TOR_VERSION)
+
+if (APPLE)
+ include(${Vidalia_SOURCE_DIR}/cmake/ParseArgumentsMacro.cmake)
+
+ ## 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
+ ## VIDALIA_INSTALL_QT4_FRAMEWORK or VIDALIA_INSTALL_DYLIB when the given
+ ## build target is executed.
+ macro(VIDALIA_INSTALL_NAME_TOOL)
+ parse_arguments(INSTALL_NAME_TOOL "TARGET;LIBRARIES;FRAMEWORKS" "" ${ARGN})
+
+ foreach(bin ${INSTALL_NAME_TOOL_DEFAULT_ARGS})
+ foreach(it ${INSTALL_NAME_TOOL_FRAMEWORKS})
+ add_custom_command(TARGET ${INSTALL_NAME_TOOL_TARGET}
+ COMMAND install_name_tool -change
+ ${it} @executable_path/../Frameworks/${it} ${bin}
+ )
+ endforeach(it)
+ foreach(it ${INSTALL_NAME_TOOL_LIBRARIES})
+ get_filename_component(libname ${it} NAME)
+ add_custom_command(TARGET ${INSTALL_NAME_TOOL_TARGET}
+ COMMAND install_name_tool -change
+ ${it} @executable_path/lib/${libname} ${bin}
+ )
+ endforeach(it)
+ endforeach(bin)
+ endmacro(VIDALIA_INSTALL_NAME_TOOL)
+
+ ## Copies the specified Qt4 framework into the .app bundle, updates its
+ ## shared library identification name, and changes any dependent Qt4
+ ## framework or shared library names to reference a framework previously
+ ## installed in the .app bundle using VIDALIA_INSTALL_QT4_FRAMEWORK.
+ macro(VIDALIA_INSTALL_QT4_FRAMEWORK)
+ parse_arguments(INSTALL_QT4_FRAMEWORK
+ "NAME;TARGET;LIBRARY;APP_BUNDLE;DEPENDS_FRAMEWORKS;DEPENDS_LIBRARIES" ""
+ ${ARGN}
+ )
+ set(ditto_ARGS "--rsrc")
+ foreach (it ${CMAKE_OSX_ARCHITECTURES})
+ set(ditto_ARGS ${ditto_ARGS} --arch ${it})
+ endforeach(it)
+
+ set(framework "${INSTALL_QT4_FRAMEWORK_NAME}.framework/Versions/4")
+ set(outdir "${INSTALL_QT4_FRAMEWORK_APP_BUNDLE}/Contents/Frameworks/${framework}")
+ get_filename_component(libname "${INSTALL_QT4_FRAMEWORK_LIBRARY}" NAME)
+ add_custom_command(TARGET ${INSTALL_QT4_FRAMEWORK_TARGET}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${outdir}
+ COMMAND ditto ${ditto_ARGS}
+ ${INSTALL_QT4_FRAMEWORK_LIBRARY} ${outdir}/
+ COMMAND install_name_tool -id
+ @executable_path/../Frameworks/${framework}/${libname} ${outdir}/${libname}
+ )
+ vidalia_install_name_tool(${outdir}/${libname}
+ TARGET ${INSTALL_QT4_FRAMEWORK_TARGET}
+ LIBRARIES ${INSTALL_QT4_FRAMEWORK_DEPENDS_LIBRARIES}
+ FRAMEWORKS ${INSTALL_QT4_FRAMEWORK_DEPENDS_FRAMEWORKS}
+ )
+ set(${INSTALL_QT4_FRAMEWORK_DEFAULT_ARGS} ${framework}/${libname})
+ endmacro(VIDALIA_INSTALL_QT4_FRAMEWORK)
+
+ ## Copies the specified .dylib into the .app bundle, updates its shared
+ ## library identification name, and changes any dependent framework or
+ ## shared library names to reference a framework or shared library
+ ## previously installed in the .app bundle.
+ macro(VIDALIA_INSTALL_DYLIB)
+ parse_arguments(INSTALL_DYLIB
+ "TARGET;LIBRARY;APP_BUNDLE;DEPENDS_FRAMEWORKS;DEPENDS_LIBRARIES" ""
+ ${ARGN}
+ )
+ set(ditto_ARGS "--rsrc")
+ foreach (it ${CMAKE_OSX_ARCHITECTURES})
+ set(ditto_ARGS ${ditto_ARGS} --arch ${it})
+ endforeach(it)
+
+ set(outdir "${INSTALL_DYLIB_APP_BUNDLE}/Contents/MacOS/lib/")
+ get_filename_component(libname "${INSTALL_DYLIB_LIBRARY}" NAME)
+ add_custom_command(TARGET ${INSTALL_DYLIB_TARGET}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${outdir}
+ COMMAND ditto ${ditto_ARGS}
+ ${INSTALL_DYLIB_LIBRARY} ${outdir}/
+ COMMAND install_name_tool -id @executable_path/lib/${libname}
+ )
+ vidalia_install_name_tool(${outir}/${libname}
+ TARGET ${INSTALL_DYLIB_TARGET}
+ LIBRARIES ${INSTALL_DYLIB_DEPENDS_LIBRARIES}
+ FRAMEWORKS ${INSTALL_DYLIB_DEPENDS_FRAMEWORKS}
+ )
+ set(${INSTALL_DYLIB_DEFAULT_ARGS} "${libname}")
+ endmacro(VIDALIA_INSTALL_DYLIB)
+endif(APPLE)
+
+if (WIN32)
+ ## Wraps the supplied .rc files in windres commands if we're building
+ ## with MinGW. Otherwise, it just adds the .rc files directly to the
+ ## list of output files.
+ macro(WIN32_ADD_RC outfiles)
+ foreach(it ${ARGN})
+ if (NOT MSVC)
+ get_filename_component(it ${it} ABSOLUTE)
+ get_filename_component(outfile ${it} NAME_WE)
+ get_filename_component(rc_path ${it} PATH)
+
+ set(outfile
+ ${CMAKE_CURRENT_BINARY_DIR}/${outfile}_res${CMAKE_CXX_OUTPUT_EXTENSION}
+ )
+ add_custom_command(OUTPUT ${outfile}
+ COMMAND ${WIN32_WINDRES_EXECUTABLE}
+ ARGS -i ${it} -o ${outfile} --include-dir=${rc_path}
+ MAIN_DEPENDENCY ${it}
+ )
+ set(${outfiles} ${${outfiles}} ${outfile})
+ else (NOT MSVC)
+ set(${outfiles} ${${outfiles}} ${it})
+ endif(NOT MSVC)
+ endforeach(it)
+ endmacro(WIN32_ADD_RC)
+endif(WIN32)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/config.h.in b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/config.h.in
new file mode 100644
index 0000000..4fd2b64
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/config.h.in
@@ -0,0 +1,40 @@
+/*
+** $Id: config.h.in 3879 2009-06-23 22:53:29Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+**
+*/
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+
+#define VIDALIA_VERSION "@VERSION@"
+
+#cmakedefine HAVE_LIMITS_H
+
+#cmakedefine HAVE_SYS_LIMITS_H
+
+#cmakedefine HAVE_SIGNAL_H
+
+#cmakedefine HAVE_SIGACTION
+
+#cmakedefine HAVE_SIGNAL
+
+#cmakedefine SIZEOF_INT @SIZEOF_INT@
+
+#cmakedefine USE_MINIUPNPC
+
+#cmakedefine USE_AUTOUPDATE
+
+#cmakedefine USE_MARBLE
+
+#cmakedefine USE_BREAKPAD
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/contrib/geoip b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/contrib/geoip
new file mode 100755
index 0000000..cd07468
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/contrib/geoip
@@ -0,0 +1,104 @@
+#!/usr/bin/perl -w
+#
+# Vidalia is distributed under the following license:
+#
+# Copyright (C) 2006, Matt Edman, Justin Hipple
+# Modified slightly by Sasha Romanosky
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# The GeoIP Perl Library is licensed under the GPL. For details
+# see the COPYING file.
+#################################################################
+
+use strict;
+use Geo::IP;
+
+my $VERSION = "05-06";
+my $GEODATA = "/home/vidalia/geodata/GeoLiteCity-$VERSION.dat";
+my $GI = Geo::IP->open($GEODATA, GEOIP_STANDARD);
+
+my $uri = "";
+my %fields = ();
+my @params = ();
+
+###############################################################
+print "Content-type: text/plain\n\n";
+
+# Parse the URI parameters
+my $method = $ENV{"REQUEST_METHOD"};
+if ($method eq "POST") {
+ my $query = "";
+ read(STDIN, $query, $ENV{'CONTENT_LENGTH'});
+
+ # Request came in the form of a POST
+ @params = split /&/, $query;
+} elsif ($method eq "GET") {
+ # Method is a GET request
+ if ($ENV{"REQUEST_URI"} && $ENV{"REQUEST_URI"} =~/\?/) {
+ ($uri = $ENV{"REQUEST_URI"}) =~ s/.*\?//g;
+ }
+ @params = split /&/, $uri;
+} else {
+ # It wasn't a GET or POST, so we'd better bail.
+ print "Bad Request\n";
+ exit 0;
+}
+
+# Parse the parameters and values
+foreach (@params) {
+ my ($key, $val) = split /=/, $_;
+ $fields{$key} = $val;
+}
+
+# first build addr list
+unless ($fields{"ip"}) {
+ # Get Geo info for requesting host
+ printGeoInfo($ENV{"REMOTE_ADDR"});
+}
+else {
+ # Resolve each IP in the request
+ my @addrs = split /,/, $fields{"ip"};
+ foreach (@addrs) {
+ my $addr = substr($_, 0, 15); # chop at max length of an IP address
+ if ($addr =~ /\d+\.\d+\.\d+\.\d+/) { # only select good IPs
+ printGeoInfo($addr);
+ }
+ else {
+ print "Bad IP\n";
+ }
+ }
+}
+
+# print the Geo info
+sub printGeoInfo {
+ my $addr = shift;
+ print "$addr,";
+ my $r = $GI->record_by_addr($addr);
+ if ($r) {
+ print join(",", $r->city,
+ $r->region,
+ $r->country_code,
+ $r->latitude,
+ $r->longitude);
+ }
+ else {
+ print "UNKNOWN";
+ }
+ print "\n";
+}
+
+#QED
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/contrib/geoip.py b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/contrib/geoip.py
new file mode 100755
index 0000000..f6de6c3
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/contrib/geoip.py
@@ -0,0 +1,105 @@
+#!/usr/bin/python
+##
+## $Id: geoip.py 3767 2009-05-13 18:54:28Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+from mod_python import apache
+from mod_python import util
+import GeoIP
+import os
+
+def escape_output(f):
+ if ' ' in f:
+ f.replace("\\", "\\\\")
+ f.replace("\"", "\\\"")
+ return ("\"%s\"" % f)
+ return f
+
+def is_valid_geoip_record(r):
+ if r == None:
+ return False
+ if not r.has_key('latitude') or r['latitude'] == None:
+ return False
+ if not r.has_key('longitude') or r['longitude'] == None:
+ return False
+ return True
+
+# Get the form fields
+def handler(req):
+ form = util.FieldStorage(req)
+
+ # Get the specified output format and verify it is a valid format. If
+ # none is specified, default to the old "short" output format.
+ format = form.getfirst("format", "short").lower()
+ if format not in ("short", "long"):
+ format = "short"
+
+ # Get a list of all IP addresses in this request. If none is specified,
+ # display the GeoIP information for the client's address.
+ iplist = []
+ if form.has_key("ip"):
+ for ip in form.getlist("ip"):
+ iplist.extend(ip.split(","))
+ else:
+ iplist.append(req.connection.remote_ip)
+
+ # Open the GeoIP database
+ gi = GeoIP.open("/var/lib/geoip/GeoLiteCity.dat", GeoIP.GEOIP_MEMORY_CACHE)
+
+ # Display the output according to the specified format
+ req.content_type = 'text/plain'
+
+ if format == "long":
+ for ip in iplist:
+ r = gi.record_by_addr(ip)
+ if is_valid_geoip_record(r):
+ fields = []
+ fields.append("IP=%s" % ip)
+ fields.append("LAT=%f" % r['latitude'])
+ fields.append("LON=%f" % r['longitude'])
+
+ if r.has_key('city') and r['city'] != None:
+ fields.append("CITY=%s" % escape_output(r['city']))
+ if r.has_key('region_name') and r['region_name'] != None:
+ fields.append("REGION=%s" % escape_output(r['region_name']))
+ if r.has_key('country_name') and r['country_name'] != None:
+ fields.append("COUNTRY=%s" % escape_output(r['country_name']))
+ if r.has_key('country_code') and r['country_code'] != None:
+ fields.append("CC=%s" % escape_output(r['country_code']))
+
+ r = gi.range_by_ip(ip)
+ if len(r) == 2:
+ fields.append("FROM=%s" % r[0])
+ fields.append("TO=%s" % r[1])
+
+ response = " ".join(fields)
+ req.write(response + "\n")
+
+ elif format == "short":
+ for ip in iplist:
+ r = gi.record_by_addr(ip)
+ if is_valid_geoip_record(r):
+ city = region = cc = ""
+ if r.has_key('city') and r['city'] != None:
+ city = r['city'].replace(",", " ")
+ if r.has_key('region') and r['region'] != None:
+ region = r['region']
+ if r.has_key('country_code') and r['country_code'] != None:
+ cc = r['country_code']
+
+ response = "%s,%s,%s,%s,%f,%f" % (ip, city, region, cc,
+ r['latitude'],r['longitude'])
+ req.write(response + "\n")
+ else:
+ req.write(ip + ",UNKNOWN" + "\n")
+
+ return apache.OK
+
diff --git a/debian/0.2.x/FAQ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/FAQ
similarity index 100%
copy from debian/0.2.x/FAQ
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/FAQ
diff --git a/debian/0.2.x/README.Debian b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/README.Debian
similarity index 95%
copy from debian/0.2.x/README.Debian
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/README.Debian
index 53dbbe1..1754d24 100644
--- a/debian/0.2.x/README.Debian
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/README.Debian
@@ -4,7 +4,6 @@ Vidalia for Debian
There are currently two ways of communication supported between
Tor daemon (carried with 'tor' package), and Vidalia interface:
-
1. Letting Vidalia start Tor process on its own.
---------------------------------------------
@@ -15,8 +14,6 @@ Tor daemon (carried with 'tor' package), and Vidalia interface:
longer wish to have Vidalia control Tor, and want to re-enable Tor's ability to
start when your machine boots, dpkg-reconfigure vidalia and choose 'no'.
-
-
2. Enable Tor to use a control port to communicate with Vidalia.
-------------------------------------------------------------
@@ -42,5 +39,5 @@ Tor daemon (carried with 'tor' package), and Vidalia interface:
(as you pass it with --hash-password, not the hash).
- -- Ulises Vitulli <dererk at debian.org> Wed, 17 Sep 2008 17:24:06 -0300
+ -- Ulises Vitulli <uvitulli at fi.uba.ar> Wed, 17 Sep 2008 17:24:06 -0300
(Updated by Erinn Clark <erinn at torproject.org> Sun, 04 Apr 2010 20:16:07 -0700)
diff --git a/debian/0.2.x/README.source b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/README.source
similarity index 100%
copy from debian/0.2.x/README.source
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/README.source
diff --git a/debian/0.2.x/changelog b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/changelog
similarity index 94%
copy from debian/0.2.x/changelog
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/changelog
index 220f104..d12dc07 100644
--- a/debian/0.2.x/changelog
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/changelog
@@ -1,22 +1,12 @@
-vidalia (0.2.10-2) unstable; urgency=low
+vidalia (0.2.9-1+squeeze1) testing-proposed-updates; urgency=low
- * Improved debconf templates interaction and set a default answer case
+ * Improved debconf templates and set a default answer case
(Closes: #592773).
- * Update Standard-version to 3.9.1 (no changes needed).
-
- -- Ulises Vitulli <dererk at debian.org> Fri, 24 Sep 2010 11:18:20 -0300
-
-vidalia (0.2.10-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Erinn Clark <erinn at torproject.org> Thu, 09 Sep 2010 01:21:19 -0700
-
-vidalia (0.2.9-2) unstable; urgency=low
-
* Cleaning unrequired build-deps, since we know use quilt source format.
+ * Update Standard-version to 3.9.1 (no changes needed).
+ * Include Vcs-* fields on control file.
- -- Ulises Vitulli <dererk at debian.org> Mon, 31 May 2010 18:52:47 -0300
+ -- Ulises Vitulli <dererk at debian.org> Sat, 25 Sep 2010 07:30:17 -0300
vidalia (0.2.9-1) unstable; urgency=low
diff --git a/debian/0.2.x/compat b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/compat
similarity index 100%
copy from debian/0.2.x/compat
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/compat
diff --git a/debian/0.2.x/config b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/config
similarity index 100%
copy from debian/0.2.x/config
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/config
diff --git a/debian/0.2.x/control b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/control
similarity index 100%
copy from debian/0.2.x/control
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/control
diff --git a/debian/0.2.x/copyright b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/copyright
similarity index 100%
copy from debian/0.2.x/copyright
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/copyright
diff --git a/debian/0.2.x/default.tor-off b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/default.tor-off
similarity index 100%
copy from debian/0.2.x/default.tor-off
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/default.tor-off
diff --git a/debian/0.2.x/default.tor-on b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/default.tor-on
similarity index 100%
copy from debian/0.2.x/default.tor-on
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/default.tor-on
diff --git a/debian/0.2.x/docs b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/docs
similarity index 100%
copy from debian/0.2.x/docs
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/docs
diff --git a/debian/0.2.x/menu b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/menu
similarity index 100%
copy from debian/0.2.x/menu
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/menu
diff --git a/debian/0.2.x/patches/debians-tor-binary-path.patch b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/patches/debians-tor-binary-path.patch
similarity index 100%
copy from debian/0.2.x/patches/debians-tor-binary-path.patch
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/patches/debians-tor-binary-path.patch
diff --git a/debian/0.2.x/patches/series b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/patches/series
similarity index 100%
copy from debian/0.2.x/patches/series
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/patches/series
diff --git a/debian/0.2.x/po/POTFILES.in b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/POTFILES.in
similarity index 100%
copy from debian/0.2.x/po/POTFILES.in
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/POTFILES.in
diff --git a/debian/0.2.x/po/ca.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/ca.po
similarity index 100%
copy from debian/0.2.x/po/ca.po
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/ca.po
diff --git a/debian/0.2.x/po/cs.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/cs.po
similarity index 100%
copy from debian/0.2.x/po/cs.po
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/cs.po
diff --git a/debian/0.2.x/po/da.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/da.po
similarity index 100%
copy from debian/0.2.x/po/da.po
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/da.po
diff --git a/debian/0.2.x/po/de.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/de.po
similarity index 100%
copy from debian/0.2.x/po/de.po
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/de.po
diff --git a/debian/0.2.x/po/es.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/es.po
similarity index 100%
copy from debian/0.2.x/po/es.po
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/es.po
diff --git a/debian/0.2.x/po/fi.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/fi.po
similarity index 100%
copy from debian/0.2.x/po/fi.po
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/fi.po
diff --git a/debian/0.2.x/po/fr.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/fr.po
similarity index 100%
copy from debian/0.2.x/po/fr.po
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/fr.po
diff --git a/debian/0.2.x/po/it.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/it.po
similarity index 100%
copy from debian/0.2.x/po/it.po
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/it.po
diff --git a/debian/0.2.x/po/pt.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/pt.po
similarity index 100%
copy from debian/0.2.x/po/pt.po
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/pt.po
diff --git a/debian/0.2.x/po/ru.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/ru.po
similarity index 100%
copy from debian/0.2.x/po/ru.po
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/ru.po
diff --git a/debian/0.2.x/po/sv.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/sv.po
similarity index 100%
copy from debian/0.2.x/po/sv.po
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/sv.po
diff --git a/debian/0.2.x/po/templates.pot b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/templates.pot
similarity index 100%
copy from debian/0.2.x/po/templates.pot
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/templates.pot
diff --git a/debian/0.2.x/po/vi.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/vi.po
similarity index 100%
copy from debian/0.2.x/po/vi.po
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/vi.po
diff --git a/debian/0.2.x/po/zh_CN.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/zh_CN.po
similarity index 100%
copy from debian/0.2.x/po/zh_CN.po
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/zh_CN.po
diff --git a/debian/0.2.x/po/zh_TW.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/zh_TW.po
similarity index 100%
copy from debian/0.2.x/po/zh_TW.po
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/po/zh_TW.po
diff --git a/debian/0.2.x/postinst b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/postinst
similarity index 100%
copy from debian/0.2.x/postinst
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/postinst
diff --git a/debian/0.2.x/postrm b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/postrm
similarity index 100%
copy from debian/0.2.x/postrm
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/postrm
diff --git a/debian/0.2.x/rules b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/rules
similarity index 100%
copy from debian/0.2.x/rules
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/rules
diff --git a/debian/0.2.x/source/format b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/source/format
similarity index 100%
copy from debian/0.2.x/source/format
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/source/format
diff --git a/debian/0.2.x/templates b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/templates
similarity index 100%
copy from debian/0.2.x/templates
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/templates
diff --git a/debian/0.2.x/vidalia.desktop b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/vidalia.desktop
similarity index 100%
copy from debian/0.2.x/vidalia.desktop
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/vidalia.desktop
diff --git a/debian/0.2.x/vidalia.install b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/vidalia.install
similarity index 100%
copy from debian/0.2.x/vidalia.install
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/vidalia.install
diff --git a/debian/0.2.x/vidalia.lintian-overrides b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/vidalia.lintian-overrides
similarity index 100%
copy from debian/0.2.x/vidalia.lintian-overrides
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/vidalia.lintian-overrides
diff --git a/debian/0.2.x/vidalia.xpm b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/vidalia.xpm
similarity index 100%
copy from debian/0.2.x/vidalia.xpm
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/vidalia.xpm
diff --git a/debian/0.2.x/watch b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/watch
similarity index 100%
copy from debian/0.2.x/watch
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/debian/watch
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/CMakeLists.txt
new file mode 100644
index 0000000..057e716
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/CMakeLists.txt
@@ -0,0 +1,32 @@
+##
+## $Id: CMakeLists.txt 3739 2009-04-28 23:27:12Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/vidalia.1.in
+ ${CMAKE_CURRENT_SOURCE_DIR}/vidalia.1
+)
+
+set(DOXYGEN_INPUT_DIR ${Vidalia_SOURCE_DIR})
+set(DOXYGEN_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
+ ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+)
+
+include(FindDoxygen)
+if (DOXYGEN_FOUND)
+ add_custom_target(doxygen
+ COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+ )
+endif(DOXYGEN_FOUND)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/Doxyfile.in b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/Doxyfile.in
new file mode 100644
index 0000000..095f907
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/Doxyfile.in
@@ -0,0 +1,236 @@
+# Doxyfile 1.4.6
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME = Vidalia
+PROJECT_NUMBER = @VERSION@
+OUTPUT_DIRECTORY = @DOXYGEN_OUTPUT_DIR@
+CREATE_SUBDIRS = NO
+OUTPUT_LANGUAGE = English
+USE_WINDOWS_ENCODING = NO
+BRIEF_MEMBER_DESC = YES
+REPEAT_BRIEF = YES
+ABBREVIATE_BRIEF = "The $name class" \
+ "The $name widget" \
+ "The $name file" \
+ is \
+ provides \
+ specifies \
+ contains \
+ represents \
+ a \
+ an \
+ the
+ALWAYS_DETAILED_SEC = NO
+INLINE_INHERITED_MEMB = NO
+FULL_PATH_NAMES = NO
+STRIP_FROM_PATH =
+STRIP_FROM_INC_PATH =
+SHORT_NAMES = NO
+JAVADOC_AUTOBRIEF = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP = NO
+INHERIT_DOCS = YES
+SEPARATE_MEMBER_PAGES = NO
+TAB_SIZE = 8
+ALIASES =
+OPTIMIZE_OUTPUT_FOR_C = NO
+OPTIMIZE_OUTPUT_JAVA = NO
+BUILTIN_STL_SUPPORT = NO
+DISTRIBUTE_GROUP_DOC = NO
+SUBGROUPING = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL = YES
+EXTRACT_PRIVATE = YES
+EXTRACT_STATIC = YES
+EXTRACT_LOCAL_CLASSES = YES
+EXTRACT_LOCAL_METHODS = NO
+HIDE_UNDOC_MEMBERS = NO
+HIDE_UNDOC_CLASSES = NO
+HIDE_FRIEND_COMPOUNDS = NO
+HIDE_IN_BODY_DOCS = NO
+INTERNAL_DOCS = NO
+CASE_SENSE_NAMES = NO
+HIDE_SCOPE_NAMES = NO
+SHOW_INCLUDE_FILES = YES
+INLINE_INFO = YES
+SORT_MEMBER_DOCS = YES
+SORT_BRIEF_DOCS = NO
+SORT_BY_SCOPE_NAME = NO
+GENERATE_TODOLIST = YES
+GENERATE_TESTLIST = YES
+GENERATE_BUGLIST = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS =
+MAX_INITIALIZER_LINES = 30
+SHOW_USED_FILES = YES
+SHOW_DIRECTORIES = YES
+FILE_VERSION_FILTER =
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET = NO
+WARNINGS = YES
+WARN_IF_UNDOCUMENTED = YES
+WARN_IF_DOC_ERROR = YES
+WARN_NO_PARAMDOC = NO
+WARN_FORMAT = "$file:$line: $text"
+WARN_LOGFILE =
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT = @DOXYGEN_INPUT_DIR@
+FILE_PATTERNS = *.cpp \
+ *.h
+RECURSIVE = YES
+EXCLUDE =
+EXCLUDE_SYMLINKS = NO
+EXCLUDE_PATTERNS = moc_* \
+ qrc_* \
+ ui_*
+EXAMPLE_PATH =
+EXAMPLE_PATTERNS = *
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_PATTERNS =
+FILTER_SOURCE_FILES = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER = YES
+INLINE_SOURCES = NO
+STRIP_CODE_COMMENTS = NO
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION = YES
+USE_HTAGS = NO
+VERBATIM_HEADERS = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX = YES
+COLS_IN_ALPHA_INDEX = 5
+IGNORE_PREFIX =
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML = YES
+HTML_OUTPUT = html
+HTML_FILE_EXTENSION = .html
+HTML_HEADER =
+HTML_FOOTER =
+HTML_STYLESHEET =
+HTML_ALIGN_MEMBERS = YES
+GENERATE_HTMLHELP = NO
+CHM_FILE =
+HHC_LOCATION =
+GENERATE_CHI = NO
+BINARY_TOC = NO
+TOC_EXPAND = NO
+DISABLE_INDEX = NO
+ENUM_VALUES_PER_LINE = 4
+GENERATE_TREEVIEW = NO
+TREEVIEW_WIDTH = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX = NO
+LATEX_OUTPUT = latex
+LATEX_CMD_NAME = latex
+MAKEINDEX_CMD_NAME = makeindex
+COMPACT_LATEX = NO
+PAPER_TYPE = a4wide
+EXTRA_PACKAGES =
+LATEX_HEADER =
+PDF_HYPERLINKS = NO
+USE_PDFLATEX = NO
+LATEX_BATCHMODE = NO
+LATEX_HIDE_INDICES = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF = NO
+RTF_OUTPUT = rtf
+COMPACT_RTF = NO
+RTF_HYPERLINKS = NO
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN = NO
+MAN_OUTPUT = man
+MAN_EXTENSION = .3
+MAN_LINKS = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML = NO
+XML_OUTPUT = xml
+XML_SCHEMA =
+XML_DTD =
+XML_PROGRAMLISTING = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD = NO
+PERLMOD_LATEX = NO
+PERLMOD_PRETTY = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = NO
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES = YES
+INCLUDE_PATH =
+INCLUDE_FILE_PATTERNS =
+PREDEFINED =
+EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+TAGFILES =
+GENERATE_TAGFILE =
+ALLEXTERNALS = NO
+EXTERNAL_GROUPS = YES
+PERL_PATH = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS = YES
+HIDE_UNDOC_RELATIONS = YES
+HAVE_DOT = NO
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = YES
+GROUP_GRAPHS = YES
+UML_LOOK = YES
+TEMPLATE_RELATIONS = NO
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
+CALL_GRAPH = NO
+GRAPHICAL_HIERARCHY = YES
+DIRECTORY_GRAPH = YES
+DOT_IMAGE_FORMAT = png
+DOT_PATH =
+DOTFILE_DIRS =
+MAX_DOT_GRAPH_WIDTH = 1024
+MAX_DOT_GRAPH_HEIGHT = 1024
+MAX_DOT_GRAPH_DEPTH = 1000
+DOT_TRANSPARENT = NO
+DOT_MULTI_TARGETS = NO
+GENERATE_LEGEND = YES
+DOT_CLEANUP = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = NO
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/feature-spec.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/feature-spec.txt
new file mode 100644
index 0000000..7d3e8f2
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/feature-spec.txt
@@ -0,0 +1,248 @@
+$Id: feature-spec.txt 1563 2006-12-26 06:06:04Z edmanm $
+
+ Vidalia Feature Specification
+
+0. Introduction
+
+The purpose of this document is to give an overview of Vidalia's design goals,
+as well as a general description of what features must be present in Vidalia.
+In addition, this document contains descriptions of features which we have
+considered, but which Vidalia does not currently implement either for
+technical reasons or because there simply isn't any demand for a feature.
+
+
+1. Design Overview
+
+Vidalia aims for a "minimalist" interface, meaning that its use should be
+unobtrusive wihle the user is doing other tasks on her machine, while still
+providing adequate information about the status of their Tor process.
+
+Vidalia also does not aim to support every configuration option offered by
+Tor. Tor's configuration file (the user's 'torrc' file) supports a plethora of
+configuration options, allowing the user extensive customization over the
+behavior of their Tor process; however, not all users need or want to
+configure every aspect of Tor. Additionally, it has been the author's
+experience that few users actually understand all of Tor's configuration
+options nor do they understand the implications of changing those
+configuration options (e.g., changing the set of default authoritative
+directory servers or allowing only nodes from a specified country).
+
+Vidalia should be able to run Tor with a standard set of default arguments
+that allow the user to run Tor without doing any complex initial
+configuration. Also, Vidalia users should be able to use and configure Tor
+without having to understand details of Tor's inner-workings.
+
+
+2. Required Features
+
+Items described in this section represent features or functionality that MUST
+be present in Vidalia. These features are considered necessary for
+providing a useful Tor controller.
+
+2.1. Tor Process Management
+
+Vidalia must support starting and stopping Tor at the user's request, without
+the user having to repeatedly specify the location of their Tor executable. In
+addition, Vidalia must be able to monitor the status of the Tor process and
+alert the user should Tor exit unexpectedly.
+
+Information about the status of Tor should be reflected in an icon on the
+user's screen in an area appropriate for their operating system (e.g., the
+system tray on Windows or the menu bar on Mac OS X). Hovering over the icon
+should give the user a brief description of what the currently displayed icon
+indicates (e.g., "Tor is stopped"). Any status indicators the user did not
+explicitly ask for, such as a notification balloon on Windows, should be able
+to be disabled at the user's discretion.
+
+2.2. Tor Log Messages
+
+Tor has the ability to notify a controller about what it's doing by asking for
+a configurable set of log message severity levels. These messages should be
+displayed for the user in a single dialog, able to be hidden at the user's
+request while continuing to accept log messages from Tor in the background.
+Vidalia must also allow the user to configure the severity of messages in
+which he is interested.
+
+NOTE: It is entirely possible that the user's Tor process could terminate
+before the controller has the ability to connect to Tor's control port,
+meaning the user has no way of knowing why their Tor process exited
+unexpectedly. In such case, Vidalia must provide an alternative way to view
+Tor's output, such as capturing messages logged to stdout.
+
+2.3. Tor Configuration
+
+Vidalia must provide a screen (or set of screens) through which the user can
+configure their Tor. As mentioned in Section 1, Vidalia does not need to
+support every possible configuratino option, but rather should allow the user
+to configure the most often modified options. Configuration options that are
+not often changed or have security implications should be placed on an
+"Advanced" configuration screen.
+
+With each configuration option displayed, Vidalia must provide a way for the
+user to read a text description of what the configuration option represents
+and how changing that option affects their Tor process.
+
+2.4. Bandwidth Monitoring
+
+Users are often interested in the rate at which they are currently sending and
+receiving through the Tor network. Vidalia must provide a graph of the user's
+current transfer rates, based on the amount of data sent and received roughly
+each second as reported by Tor via the control protocol.
+
+The bandwidth graph must have an intuitive default appearance and
+interpretation, but should also be configurable should the user not like the
+defaults. The bandwidth graph must also be able to be resized and "docked"
+in a region of the user's screen.
+
+2.5. Current Circuit Information
+
+Vidalia must provide a screen allowing the user to see a list of their
+currently opened circuits, including a list of Tor routers which are in each
+circuit. The user must be able to select one of the routers in a circuit and
+view detailed information about that router, as parsed from its server
+descriptor. Such information should include the router's nickname as chosen by
+the router operator, the router operator's contact information, that router's
+exit policy, etc.
+
+Vidalia should allow the user to see which streams are currently attached to
+which circuits. Vidalia may also provide information about the geographic
+location of the exit node for each circuit, since outbound connections from
+that circuit will appear to originate in the country of that circuit's exit
+node.
+
+Vidalia may also give users the ability to destroy a specific circuit should
+the user decide that the nodes in that circuit are not providing adequate
+performance.
+
+2.6. Tor Network Status
+
+Vidalia must provide a way to view a list of routers currently in the Tor
+network and information about each router, such as its nickname, exit policy,
+uptime, or bandwidth. In essence, this is a compacted and more intuitive view
+of Tor's directory.
+
+Users should be able to search the list of current routers for a specific
+nickname or for a router that allows exiting to a specified port. In addition,
+users should be able to order the list of available routers by statistics such
+as uptime and bandwidth.
+
+2.7. Server Management
+
+2.7.1. Server Setup
+
+The Tor network depends on volunteers to run the Tor routers in the network.
+To further encourage users to run a router (server), server setup must be
+simple. A small form that prompts the user for necessary information, such as
+a nickname for the user's server or contact information, should be displayed.
+After completing the form and confirming the entered information, the user's
+Tor process should automatically be configured to run as a server with the
+information just entered.
+
+2.7.2. Exit Policy Configuration
+
+Many server operators prefer to limit the types of traffic that they will
+relay for the Tor network. Since traffic from an exit node appears to
+originate from that machine's IP address, server operators may want to try to
+cut down on traffic that could get them in trouble, such as file-sharing
+traffic. Tor supports this through an ``exit policy'' at each router, which
+defines IPs and ports that the operator may either accept or reject. Server
+operators may also opt to be a ``middleman node'', who doesn't allow traffic
+to exit the Tor network from their node but is willing to relay traffic
+between other Tor routers.
+
+Vidalia must make configuring an exit policy easy and intuitive. Vidalia may
+also display helpful information for the user, such as what ports are commonly
+associated with what sorts of network traffic.
+
+2.7.3. Rate-limiting Configuration
+
+In addition to exit policies, Tor also allows server operators to specify how
+much of their bandwidth they are willing to devote to relaying Tor traffic;
+however, users may want to devote varying amounts of bandwidth depending on
+the time of day. As an example, a server operator may be willing to devote all
+of his available bandwidth to the Tor network at night while he is sleeping,
+but only a small fraction of it during the day when he is using his machine
+for his own activities.
+
+Vidalia must allow server operators to easily schedule rate-limiting depending
+on the current date and time. Vidalia could also allow the user to configure
+``rate-limiting profiles''. Examples of a profile may include ``weekday''
+which would all Tor to use all available bandwidth while the user is at work
+and during the evening, ``weekend'' which is similar to ``weekday'' except the
+user keeps most of his bandwidth to himself during the day, or ``vacation''
+which devotes all bandwidth to Tor all the time.
+
+2.8. Signals
+
+On non-Windows machines, Tor performs a certain action when it receives a
+signal. For instance, Tor will reload its torrc if it receives a SIGHUP.
+Unfortunately, Windows users are unable to send Tor such signals.
+
+Vidalia must allow the user to simulate sending signals to Tor by using the
+SIGNAL feature of the control protocol. Vidalia should also include
+descriptions informing the user what each signal does and what it is used for.
+
+
+3. Desired Features
+
+Features in this section are currently considered useful, but whose design has
+yet to be fully considered and planned. These features would be nice to have
+in Vidalia, but whose absence would not seriously adversely affect the
+usability or utility of Vidalia.
+
+3.1. Graphical display of current circuits
+
+The user should be able to see a map of the world with indicators pointing to
+the rough geographic location of each router in the Tor network. Circuits will
+be represented by drawing a link between router indicators on the map.
+Hovering over an indicator on the map will display information about the
+router, as was mentioned in Section 2.5.
+
+The primary difficulty with this feature is finding a free, accurate database
+used to map an IP address to a latitude and longitude. Another difficulty with
+this is how to represent situations where multiple routers are run at the same
+geographic location. For example, there are currently three routers being run
+at MIT; the user should be able to easily distinguish between the three.
+
+3.2. Circuit latency information
+
+Users are often interested in how their current circuit is performing, so they
+may be interested to see the additional delay added by routing their traffic
+through the Tor network. One could imagine an implementation as follows:
+
+ Vidalia creates a circuit using the same sequence of nodes in the circuit
+ whose performance we wish to measure. Vidalia then connects to itself
+ through that circuit and sends small chunks of data to itself, measuring the
+ delay between the time the chunk of data is sent and the time it is
+ received. Vidalia is essentially "pinging" itself through a circuit.
+
+A technical problem with the above approach is that, if the user has a
+firewall configured, it must accept connections from the exit node of the
+circuit being measured otherwise Vidalia would be unable to connect back to
+itself. Also, an adversary who can observe the user would see that a Tor
+exit node is connecting back to the user and sending these "pings", yielding
+the identity of this user's exit node.
+
+
+4. Questionable Features
+
+Features in this section may or may not be useful. We might consider
+implementing them pending a number of users who desire such features.
+
+4.1. Support for running Vidalia on a separate machine than Tor
+
+Tor gives users the ability to run their Tor process on a server on a LAN
+and then point their browser's proxy settings to that server from other
+machines on the LAN. In such cases, users of the machines on the LAN not
+running Tor would still want to know about the status of the Tor process on
+the server but Vidalia would be unable to monitor the process on a remote
+machine.
+
+A possible solution for this would be to have an "agent" running on the server
+that monitored the state of the Tor process. Vidalia would then connect to
+this agent and ask the agent for the state of its Tor process. Vidalia could
+also tell the agent to start and stop Tor, forward control messages, etc.
+
+This is probably not worth the effort unless we hear an uproar from users
+demanding this feature.
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/geoip-spec.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/geoip-spec.txt
new file mode 100644
index 0000000..684347a
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/geoip-spec.txt
@@ -0,0 +1,170 @@
+$Id: geoip-spec.txt 3349 2008-11-24 16:05:58Z edmanm $
+
+0. Introduction.
+
+ Vidalia tracks geographic coordinates of the IP addresses for Tor
+ servers, so it can display them in its Network Map window. This
+ document describes the actual lookup and caching mechanism, and also
+ lays out some of the security questions and future directions.
+
+1. Fetching and caching.
+
+ When we learn one or more new descriptors, we check to see if we have
+ a cached mapping for each IP address to some geographic location. An
+ example mapping is:
+
+ 206.124.149.146,Bellevue,WA,US,47.6051,-122.1134
+
+ If we don't have a cached answer, we send an HTTP request to a perl
+ script located on our geographic information server, asking about one
+ or more IP addresses.
+
+ As of Vidalia 0.1.0, if Vidalia is built against Qt 4.3 or later with
+ OpenSSL support, the requests are done over an SSL connection and sent to
+
+ https://geoip.vidalia-project.net:1443/cgi-bin/geoip
+
+ The server has a CACert-issued certificate and CACert's root certificate
+ is included in Vidalia's signed packages. Prior to Vidalia 0.1.0, or
+ when Vidalia is built against a Qt without OpenSSL support, requests
+ are unauthenticated and unencrypted. The requests are sent to
+
+ http://geoip.vidalia-project.net/cgi-bin/geoip
+
+ which is currently hardcoded into Vidalia's source code.
+
+ Request logs are not kept on the geographic information servers.
+
+ Each server maintains a GeoLite City database from MaxMind which
+ allows lookup of geographic location information for a given IP
+ address. Database lookups are done using a Perl database API, also
+ provided by MaxMind. More information on the GeoLite City database
+ can be found at http://www.maxmind.com/app/geolitecity.
+
+ Requests can be formatted as either HTTP GET or POST requests. A GET
+ request for geographic information is applicable for small requests
+ consisting of only a few IP addresses. An example of a GET request
+ for geographic information for a single IP address (128.213.11.48)
+ is:
+
+ http://geoip.vidalia-project.net/cgi-bin/geoip?ip=128.213.11.48
+
+ which returns the following information:
+
+ 128.213.11.48,Troy,NY,US,42.7495,-73.5951
+
+ Geographic information is formatted in the body of an HTTP response as
+
+ IPAddress,City,State,Country,Latitude,Longitude
+
+ Multiple IP addresses in a single GET request are separated by commas.
+ For example:
+
+ geoip?ip=128.213.11.48,18.244.0.188,128.2.220.167
+
+ which would return the following information in the body of a standard
+ HTTP response:
+
+ 128.213.11.48,Troy,NY,US,42.7495,-73.5951
+ 18.244.0.188,Cambridge,MA,US,42.3646,-71.1028
+ 128.2.220.167,Pittsburgh,PA,US,40.4439,-79.9562
+
+ Requests can also be formatted as HTTP POST requests, suitable for
+ requesting geographic information for a large number of IP addresses.
+ The request is formatted in a similar manner as for an HTTP GET request,
+ but with the list of IP addresses placed in the body of the request.
+
+ POST /cgi-bin/geoip HTTP/1.0
+ Host: geoip.vidalia-project.net
+ Content-Length: 42
+
+ ip=128.213.11.48,18.244.0.188,128.2.220.167
+
+ Vidalia always uses HTTP POST requests to request geographic location
+ information.
+
+ The order of results returned IS NOT guaranteed to be the same as
+ the order of IP addresses given in the original request. If the
+ geographic information database does not contain any information for
+ an IP address given in a request, the string "UNKNOWN" follows that
+ IP address in the response, separated by a comma
+ (e.g., "1.2.3.4,UNKNOWN").
+
+ If no IP addresses are provided in a request, geographic information
+ for the IP address of the requester is returned. Vidalia currently
+ does not use this feature.
+
+ We cache geographic information in an unsorted text file called
+ "~/.vidalia/geoip-cache" (on Windows, the cache file is stored in
+ %APPDATA%\Vidalia\geoip-cache) along with an optional Unix
+ timestamp, such as:
+
+ 206.124.149.146,Bellevue,WA,US,47.6051,-122.1134:1159123625
+
+ If no timestamp is associated with a particular cache entry, the
+ current date and time will be used. We load the cache file on
+ startup, discard all entries that are over a month old, and write
+ a new version. After that the cache file is append-only.
+
+ The requests are done over Tor, as ordinary socks requests to the
+ local Tor client. Vidalia will query the local Tor client for its
+ socks listening address and port via Tor's controller interface.
+
+ Once Vidalia queues a request for geographic information, we wait
+ MIN_RESOLVE_QUEUE_DELAY (currently 10 seconds) after the last
+ queued request, but no longer than MAX_RESOLVE_QUEUE_DELAY
+ (currently 30 seconds) after the first queued request, before actually
+ launching the connection. This way we lump them together and send
+ one larger request instead of several little ones. If Vidalia's network
+ map window is not currently visible, the requests are queued until
+ either the queue contains requests for at least 1/4 of all known
+ servers, or the network map window becomes visible again.
+
+ If we don't get an answer, we don't retry -- if we don't have
+ geographic information for a server, it simply doesn't get mapped.
+
+2. Security and anonymity questions.
+
+ First, can the operator of the above URLs track popularity and
+ spreading of servers? Yes. Does this buy him anything? I'm not sure.
+
+3. Future directions.
+
+3.1. Tor servers could include geoip data in network statuses.
+
+ Rather than having separate geoip services that Vidalia maintains,
+ we could instead integrate the geoip data into the Tor network
+ status documents. The Tor directory authorities would learn this
+ information and the users would learn it through their ordinary
+ directory downloads.
+
+ This would make life easier for Vidalia, but it would also increase
+ the bandwidth overhead of network-status downloads -- rather than
+ caching the geoip information, users would fetch it at every update.
+
+3.2. Map networks, not individual IP addresses.
+
+ We should stop mapping individual IP addresses. For servers that have
+ dynamic IP addresses, we end up with something like
+
+ 68.179.33.128,Toronto,ON,CA,43.6667,-79.4168:1155698575
+ 68.179.33.129,Toronto,ON,CA,43.6667,-79.4168:1155696448
+ 68.179.33.131,Toronto,ON,CA,43.6667,-79.4168:1157209955
+
+ Instead we should just cache
+
+ 68.179.33.0/24,Toronto,ON,CA,43.6667,-79.4168:1155698575
+
+ Ideally we would have a database, similar to our current GeoLite City
+ database, that can provide network prefix information given an IP
+ address. In the absence of such a database, simply matching on /24
+ might be easiest and sufficient.
+
+3.3. What else is geoip information for?
+
+ What other uses do we have for this information? Is it only useful
+ for drawing maps of the Tor network?
+
+ Once we start letting users control their circuits based on geographic
+ data, the security questions in Section 2 become more challenging.
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/status-events-ui.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/status-events-ui.txt
new file mode 100644
index 0000000..11b1073
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/status-events-ui.txt
@@ -0,0 +1,227 @@
+
+ Adding an Interface for Tor Status Events
+
+
+1. Introduction & Motivation
+
+This document is intended to describe the addition of an interface to display
+summaries of Tor status events in Vidalia. The status event interface is
+intended to supplant the existing message log interface. The messages that
+appear in the message log are often useful for developers helping users
+determine why their Tor is not functioning as expected, but the messages
+themselves are usually too confusing for average users.
+
+The goal of the status event interface is to provide two functions. First, it
+should promptly notify users when their Tor process is not working properly
+(e.g., unable to fetch any directory information). Currently, relevant error
+messages from Tor are simply appended to the message log without any
+indication to the user that there is something in the log they should look at.
+Second, in the case of a warning or error status event, the status event
+interface should help the user understand what the problem is and make
+specific suggestions for the user to correct the problem.
+
+
+2. Overview
+
+2.1. Main Interface
+
+The main Vidalia UI will be a single window with multiple tabs or toolbar
+buttons at the top. The first tab will always be a "Home" tab. The Home tab
+displays general information on Tor, such as whether or not Tor is running,
+Tor version information (if Tor is running), whether Vidalia is also running a
+proxy application (e.g., Polipo), and information on whether the user is
+currently running a Tor relay.
+
+Below the general information is where the status event information will be
+located. Status events will be added as a series of items to a QListBox. Each
+item in the list box has a 48x48 icon indicating the type of status event.
+Available types are STATUS_GENERAL, STATUS_CLIENT and STATUS_SERVER. If the
+event has a WARN or ERR, a "badge" will be added to the lower-right corner of
+the status event icon. WARN events will have a "yellow triangle with a black
+exclamation point" badge. ERR events will have a "red circle with white X"
+badge added to the status event icon.
+
+To the right of the icon (or to the left, if the current translation is a RTL
+language), will be two to three lines of text. The first line will be in a
+bold typeface and will contain a short, one sentence summary of the event. For
+example, "Your Tor server is inaccessible" could be the summary sentence for
+REACHABILITY_FAILED events.
+
+Below the summary line is up to two lines of descriptive text. In the event of
+WARN or ERR status events, the descriptive text gives the user possible
+suggestions as to what caused the status event and how they can fix it. If the
+descriptive text does not fit in two lines, the part of the message that does
+not fit will be replaced with an ellipses ("..."). Clicking on the status
+event once will expand the QListBox item vertically allowing the item's full
+descriptive text to be seen. Hovering over an item will also display the full
+text in a tooltip.
+
+On the far right (or, again, far left in the case of RTL languages), will be a
+clickable gray "X". Users can click on the "X" to remove the associated event
+from the QListBox. Some events may be removed from the list automatically,
+since they can be superseded by another event. As an example, consider an item
+representing a REACHABILITY_FAILED status event indicating to the user that
+their Tor relay is not reachable from outside their network. If Tor
+subsequently emits a REACHABILITY_SUCCEEDED status event, the
+REACHABILITY_FAILED event is no longer relevant or accurate and may be removed
+from the list. In any case, the list of status events will automatically be
+cleared each time Tor is restarted.
+
+The list of status events can also be filtered by the user in order to display
+only WARN and/or ERR events. The filtering is accomplished via three clickable
+QAction buttons near the status event list. Each button is labeled with the
+same badge icon that is used to denote status event severity on the list
+item's icon.
+
+
+2.2. Tray Icon Notifications
+
+As mentioned earlier, currently important warning or error messages are simply
+appended to the user's message log without any indication to the user that
+they should go look at the log. Consequently, we will use badges on the tray
+or dock icon to indicate to the user that there are status event messages they
+should look at more closely.
+
+In the case of ERR or WARN status events, a message "balloon" or "bubble" may
+also be displayed if the user's window manager permits it. While icon badges
+are common on OS X dock icons, dock icons do not support message balloons.
+Instead, we will make the dock icon bounce in order to get the user's
+attention, which is a common notification mechanism on OS X.
+
+
+3. Displayed Status Events
+
+Tor currently exposes many status events via its control interface. Like log
+messages, however, not all of them are of interest to the user. In this
+section, we describe the particular set of status events that will be handled
+and displayed to the user in the status event summary interface. Note that
+some status events, such as BOOTSTRAP and DANGEROUS_VERSION events are already
+handled by Vidalia and displayed to the user via other means, such as a
+progress bar or a message boxes, respectively.
+
+
+3.1. DIR_ALL_UNREACHABLE
+
+Tor sends this events when it is unable to connect to any of the known
+directory servers, likely because the user's local network is down. Vidalia
+should suggest to the user that they verify their computer is connected to the
+Internet.
+
+
+3.3. ENOUGH_DIR_INFO
+
+This event indicates that Tor has enough directory information to begin
+building circuits, but hasn't built one yet. This event can be superseded by a
+subsequent CIRCUIT_ESTABLISHED event.
+
+
+3.4. NOT_ENOUGH_DIR_INFO
+
+Tor sends this event when it believes it does not have sufficient directory
+information to build circuits.
+
+
+3.5. CIRCUIT_ESTABLISHED
+
+This event indicates that Tor has successfully retrieved enough directory
+information and has constructed a circuit. No further user action needs to be
+taken, but a status event message should still be added indicating to the user
+that their Tor client is functioning properly. Additionally, Vidalia currently
+changes its tray or dock to green when this event is received.
+
+
+3.6. CHECKING_REACHABILITY
+ "ORADDRESS=IP:port"
+ "DIRADDRESS=IP:port"
+
+This status event will indicate to the user that Tor is checking to see if
+their Tor relay is accessible from outside their network. No further action
+needs to be taken unless a REACHABILITY_FAILED status event is subsequently
+received.
+
+
+3.7. REACHABILITY_FAILED
+ "ORADDRESS=IP:port"
+ "DIRADDRESS=IP:port"
+
+When Vidalia receives a REACHABILITY_FAILED status event, it will notify the
+user and suggest ways to make their relay reachable by Tor clients. Most often
+this means they have a NAT or firewall that needs the user's ORPort and
+possibly DirPort opened. Vidalia could offer to use its UPnP functionality to
+attempt to configure the user's network for them.
+
+
+3.8. REACHABILITY_SUCCEEDED
+ "ORADDRESS=IP:port"
+ "DIRADDRESS=IP:port
+
+This event should indicate to the user that their relay was found to be
+reachable. No further user action needs to be taken.
+
+
+3.9. GOOD_SERVER_DESCRIPTOR and ACCEPTED_SERVER_DESCRIPTOR
+ "DIRAUTH=addr:port"
+Tor will send these event after the user's Tor relay has successfully uploaded
+its server descriptor to at least one of the directory authorities. This
+typically means that the user's relay is functioning properly. No further user
+action needs to be taken.
+
+
+3.10. BAD_SERVER_DESCRIPTOR
+ "DIRAUTH=addr:port"
+ "REASON=string"
+
+When Vidalia receives this event, it should notify the user. The most likely
+reason for this problem is the user's clock is not set correctly. The status
+event text should suggest to the user that they should verify their system's
+clock is accurate.
+
+
+3.11. BUG
+ "REASON=STRING"
+
+Tor sends this status event when an internal check has indicated that there is
+likely a Tor software bug. The descriptive text will suggest to the user how
+and where to report the bug, as well as what information to include in the bug
+report. It may also be useful to generate additional information
+automatically, such as the user's operating system version, Tor software
+version, etc. The user can then just copy-paste that information into the bug
+report.
+
+It is possible that a bug can be triggered repeatedly, so Vidalia will make
+sure that only one status event for a particular bug will be displayed. Bug
+status events will be compared based on the string provided in the event's
+REASON field.
+
+
+3.12. CLOCK_SKEW
+ SKEW="+" / "-" SECONDS
+ MIN_SKEW="+" / "-" SECONDS.
+ SOURCE="DIRSERV:IP:Port" / "NETWORKSTATUS:IP:PORT" / "CONSENSUS"
+
+If the user's clock skew is high relative to the directory authorities,
+Vidalia should notify the user and suggest that they check the accuracy of
+their system clock. If the skew is low, then this event should be ignored and
+no further action needs to be taken.
+
+
+4. Unhandled Status Events
+
+The status events described in the previous section are a subset of the status
+events Tor currently is capable of reporting. Further, it is quite likely that
+Tor will add status events after a particular Vidalia version is released.
+Since all status events follow a similar, well-defined interface, it is
+possible for Vidalia to still parse these and display them to the user in some
+generic format; however, this is not likely to be useful to the user. Recall
+that the purpose of adding the status event interface is to be able to provide
+specific and directed suggestions to users about how to fix a particular
+problem that occurs with their Tor process. If Vidalia just blindly displays
+some status events without adding any details on the problem or how to fix it,
+the interface is not likely to be any more useful than the existing message
+log interface.
+
+As a result, the default behavior should be for Vidalia to simply discard
+status events that it does not recognize. We may want to consider adding a
+"verbose" option that does display all status events for the user. It's not
+clear that this would be benefical to the user, though.
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/version-spec.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/version-spec.txt
new file mode 100644
index 0000000..d045ef6
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/version-spec.txt
@@ -0,0 +1,33 @@
+$Id: version-spec.txt 1563 2006-12-26 06:06:04Z edmanm $
+
+ Vidalia Version Specification
+
+Vidalia releases will follow the following versioning convention:
+
+ Version ::= <MAJOR>.<MINOR>.<MICRO>[-svn]
+ MAJOR ::= Integer >= 0
+ MINOR ::= Integer >= 0
+ MICRO ::= Integer >= 0
+
+ MICRO will start at 1 and increase monotonically until a stable release, at
+ which point MINOR will be inremented MICRO will be set to 0 for a stable
+ release and reset to 1 for the subsequent testing release.
+
+ MAJOR will be incremented following several MINOR stable releases in which
+ extensive functionality has been added or modified. Developers will use
+ their discretion in determining MAJOR releases.
+
+ The -svn flag will be used to denote the latest snapshot in the Subversion
+ repository. It will be removed for an official release. For example,
+ 0.0.2-svn would become 0.0.2 when it is officially released.
+
+ An example of a possible sequence of versions is as follows:
+
+ 0.0.1
+ 0.0.2
+ 0.0.3
+ 0.1.0 <-- Stable
+ 0.1.1
+ 0.1.2
+ 0.1.3
+ 1.0.0 <-- Stable
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/vidalia.1.in b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/vidalia.1.in
new file mode 100644
index 0000000..ff17542
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/doc/vidalia.1.in
@@ -0,0 +1,57 @@
+.TH VIDALIA "1" "June 2006" "@VERSION@"
+
+.SH NAME
+vidalia \- Controller GUI for tor
+
+.SH SYNOPSIS
+.B vidalia
+.RI [ options ]
+.br
+
+.SH DESCRIPTION
+Vidalia allows you to start and stop Tor, view the status of Tor at a
+glance, and monitor Tor's bandwidth usage. Vidalia also makes it easy to
+contribute to the Tor network by helping you setup a Tor server, if you wish.
+To find more information about what Tor is and how to use it, see the Tor
+homepage: https://www.torproject.org/
+.SH OPTIONS
+\fB\-help\fR
+Displays this usage message and exits.
+.TP
+\fB\-reset\fR
+Resets ALL stored Vidalia settings.
+.TP
+\fB\-datadir \fI<directory>\fR
+Sets Vidalia's datadir to \fI<directory>\fR
+.TP
+\fB\-pidfile \fI<directory/pidfile>\fR
+Sets Vidalia's pidfile to \fI<directory/pidfile>\fR
+.TP
+\fB\-logfile \fI<file>\fR
+Sets the name and location of Vidalia's log file. If this option is specified
+without a \fIloglevel\fR, the default level of 'notice' will be used.
+.TP
+\fB\-loglevel \fI[debug|info|notice|warn|error]\fR
+Sets the verbosity of Vidalia's logging. If this option is specified without a
+\fIlogfile\fR, the log messages will be printed to stdout.
+.TP
+\fB\-style \fI<directory>\fR
+Sets Vidalia's interface style. [Windows|Motif|CDE|Plastique]
+.TP
+\fB\-lang \fI<langcode>\fR
+Sets Vidalia's language. Run Vidalia with the \fI-help\fR option to see a list
+of available language codes.
+
+.SH SEE ALSO
+.BR tor (1)
+
+.BR http://www.vidalia-project.net/
+
+.SH AUTHORS
+Matt Edman <edmanm at vidalia-project.net>
+.br
+Justin Hipple <hipplej at vidalia-project.net>
+
+This manpage was written by Alexander Wirt <formorer at debian.org> for the
+Debian Distribution (but may be used by others).
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/CMakeLists.txt
new file mode 100644
index 0000000..3037f05
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/CMakeLists.txt
@@ -0,0 +1,44 @@
+##
+## $Id: CMakeLists.txt 3904 2009-06-28 15:53:49Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+if (APPLE)
+ add_subdirectory(osx)
+endif(APPLE)
+if (UNIX)
+ add_subdirectory(rpm)
+endif(UNIX)
+if (WIN32)
+ add_subdirectory(win32)
+endif(WIN32)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/package.sh
+ ${CMAKE_CURRENT_BINARY_DIR}/package.sh
+ COPYONLY
+)
+
+set(basename "vidalia-${VERSION}")
+set(tarname "${basename}.tar.gz")
+add_custom_target(dist
+ COMMAND svn export
+ ${Vidalia_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${basename}
+ COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR}
+ tar czf ${tarname} ${basename}/
+ COMMAND ${CMAKE_COMMAND} -E copy
+ ${CMAKE_CURRENT_BINARY_DIR}/${tarname} ${Vidalia_BINARY_DIR}
+ COMMAND ${CMAKE_COMMAND} -E remove -f
+ ${CMAKE_CURRENT_BINARY_DIR}/${tarname}
+ COMMAND ${CMAKE_COMMAND} -E remove_directory
+ ${CMAKE_CURRENT_BINARY_DIR}/${basename}
+ COMMENT "Creating ${tarname}"
+)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/build-geoip-cache.sh b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/build-geoip-cache.sh
new file mode 100755
index 0000000..7ab506d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/build-geoip-cache.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+##
+## $Id: build-geoip-cache.sh 2362 2008-02-29 04:30:11Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+
+DIRURL="http://tor.noreply.org/tor/status/all"
+GEOIPURL="http://geoip.vidalia-project.net/cgi-bin/geoip"
+CACHEFILE="geoip-cache"
+
+if [ "$1" == "-notimestamp" -o "$1" == "--notimestamp" ]; then
+ timestamp=""
+else
+ timestamp=":$(date +%s)"
+fi
+
+# Fetch a list of server IP addresses
+ipaddrs=$(wget -q -O - "$DIRURL" | awk '$1 == "r" { print $7 }' | sort | uniq | tr "\n" ",")
+
+# Get GeoIP information for each IP address
+geoips=$(wget -q -O - --post-data="ip=$ipaddrs" "$GEOIPURL")
+
+# Cache the GeoIP information with timestamps
+IFS=$'\n'
+rm -f $CACHEFILE
+for geoip in $geoips; do
+ echo "$geoip""$timestamp" >> "$CACHEFILE"
+done
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/geoip-cache b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/geoip-cache
new file mode 100644
index 0000000..7a3f370
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/geoip-cache
@@ -0,0 +1,1435 @@
+1.106.108.74,UNKNOWN
+1.33.51.172,UNKNOWN
+1.40.197.194,UNKNOWN
+100.0.2.29,UNKNOWN
+12.206.244.188,Philadelphia,PA,US,39.9524,-75.1653
+12.30.222.65,Lindon,UT,US,40.3220,-111.7467
+121.206.24.169,UNKNOWN
+121.232.39.81,Beijing,22,CN,39.9289,116.3883
+121.30.139.29,Taiyuan,24,CN,37.8694,112.5603
+122.162.162.135,UNKNOWN
+123.115.176.85,UNKNOWN
+123.115.2.82,UNKNOWN
+123.116.128.122,UNKNOWN
+123.116.196.92,UNKNOWN
+124.120.235.93,Bangkok,40,TH,13.7500,100.5167
+125.115.10.204,Beijing,22,CN,39.9289,116.3883
+125.116.21.148,Beijing,22,CN,39.9289,116.3883
+125.120.196.26,Beijing,22,CN,39.9289,116.3883
+125.201.84.208,Tokyo,40,JP,35.6850,139.7514
+125.226.37.243,Taipei,03,TW,25.0392,121.5250
+125.229.115.35,Taipei,03,TW,25.0392,121.5250
+125.64.92.16,Beijing,22,CN,39.9289,116.3883
+128.12.146.126,Stanford,CA,US,37.4178,-122.1720
+128.12.71.22,Stanford,CA,US,37.4178,-122.1720
+128.12.84.16,Stanford,CA,US,37.4178,-122.1720
+128.12.91.111,Stanford,CA,US,37.4178,-122.1720
+128.135.121.104,Chicago,IL,US,41.7804,-87.6027
+128.138.207.48,Boulder,CO,US,40.0878,-105.3736
+128.2.141.33,Pittsburgh,PA,US,40.4439,-79.9562
+128.31.0.34,Cambridge,MA,US,42.3646,-71.1028
+128.39.141.245,Stavanger,14,NO,58.9667,5.7500
+128.83.114.63,Austin,TX,US,30.2961,-97.7369
+129.187.150.131,Muenchen,02,DE,48.1500,11.5833
+129.2.168.220,Alexandria,VA,US,38.7909,-77.0947
+129.241.146.124,Trondheim,16,NO,63.4167,10.4167
+129.93.140.190,Lincoln,NE,US,40.8211,-96.7118
+130.126.141.153,Urbana,IL,US,40.1095,-88.2123
+130.133.110.134,Berlin,16,DE,52.5167,13.4000
+130.89.160.179,Enschede,15,NL,52.2167,6.9000
+130.89.161.226,Enschede,15,NL,52.2167,6.9000
+131.114.79.140,Centro,20,IT,45.6833,13.0667
+131.155.109.174,Eindhoven,06,NL,51.4500,5.4667
+131.155.141.98,Eindhoven,06,NL,51.4500,5.4667
+131.155.71.110,Eindhoven,06,NL,51.4500,5.4667
+131.246.89.15,Kaiserslautern,08,DE,49.4500,7.7500
+134.100.194.4,Hamburg,04,DE,53.5500,10.0000
+134.102.204.241,Bremen,03,DE,53.0833,8.8000
+134.130.57.18,Aachen,07,DE,50.7708,6.1053
+134.169.156.140,Braunschweig,06,DE,52.2667,10.5333
+134.169.164.172,Braunschweig,06,DE,52.2667,10.5333
+134.53.24.52,Oxford,OH,US,39.4792,-84.7130
+134.93.142.188,Mainz,08,DE,50.0000,8.2711
+134.93.142.48,Mainz,08,DE,50.0000,8.2711
+137.226.13.2,Aachen,07,DE,50.7708,6.1053
+137.226.181.149,Aachen,07,DE,50.7708,6.1053
+138.26.117.12,Birmingham,AL,US,33.5446,-86.9292
+140.112.23.186,Taipei,03,TW,25.0392,121.5250
+140.112.247.53,Taipei,03,TW,25.0392,121.5250
+140.113.94.101,Taipei,03,TW,25.0392,121.5250
+140.129.68.124,Taipei,03,TW,25.0392,121.5250
+140.142.38.109,Seattle,WA,US,47.6606,-122.2919
+140.180.163.6,Princeton,NJ,US,40.3756,-74.6597
+140.247.60.64,Cambridge,MA,US,42.3800,-71.1329
+141.149.128.197,Buffalo,NY,US,42.9096,-78.8291
+141.31.15.96,Stuttgart,01,DE,48.7667,9.1833
+143.89.220.238,Hong Kong,00,HK,22.2833,114.1500
+145.18.230.38,Amsterdam,07,NL,52.3500,4.9167
+145.97.228.167,Utrecht,09,NL,52.0833,5.1333
+147.102.1.42,Athens,35,GR,37.9833,23.7332
+147.251.52.140,Brno,78,CZ,49.2000,16.6333
+147.32.120.36,Prague,52,CZ,50.0833,14.4667
+148.204.7.193,Mexico,09,MX,19.4342,-99.1386
+149.9.0.27,Washington,DC,US,38.9144,-77.0763
+149.9.0.57,Washington,DC,US,38.9144,-77.0763
+149.9.0.58,Washington,DC,US,38.9144,-77.0763
+149.9.0.59,Washington,DC,US,38.9144,-77.0763
+150.140.191.108,Patras,38,GR,38.2444,21.7344
+150.214.190.58,Sevilla,51,ES,37.3772,-5.9869
+151.118.168.120,Littleton,CO,US,39.5975,-105.0141
+151.37.69.211,Strada,05,IT,44.3000,11.0333
+151.73.160.23,Milano,09,IT,45.4667,9.2000
+151.76.155.181,Milano,09,IT,45.4667,9.2000
+152.13.233.17,Greensboro,NC,US,36.0661,-79.8068
+154.20.36.9,Edmonton,AB,CA,53.5500,-113.5000
+156.17.2.222,Wroclaw,72,PL,51.1000,17.0333
+156.56.105.20,Bloomington,IN,US,39.2499,-86.4555
+159.148.138.159,Riga,25,LV,56.9500,24.1000
+159.149.105.57,Milano,09,IT,45.4667,9.2000
+159.149.155.89,Milano,09,IT,45.4667,9.2000
+159.149.71.27,Milano,09,IT,45.4667,9.2000
+160.75.15.46,Istanbul,34,TR,41.0186,28.9647
+161.53.160.104,Zagreb,21,HR,45.8000,16.0000
+163.13.112.191,Taipei,03,TW,25.0392,121.5250
+163.20.168.168,Taipei,03,TW,25.0392,121.5250
+163.26.225.249,Taipei,03,TW,25.0392,121.5250
+166.111.249.39,,,CN,35.0000,105.0000
+166.70.207.2,Salt Lake City,UT,US,40.7561,-111.8837
+166.70.99.91,Salt Lake City,UT,US,40.7242,-111.8787
+168.103.69.43,Denver,CO,US,39.7437,-104.9793
+168.150.251.36,Davis,CA,US,38.4829,-121.6398
+168.150.251.39,Davis,CA,US,38.4829,-121.6398
+171.64.40.65,Stanford,CA,US,37.4178,-122.1720
+172.134.101.74,,,US,38.0000,-97.0000
+172.178.107.80,,,US,38.0000,-97.0000
+172.181.95.60,,,US,38.0000,-97.0000
+172.201.41.232,,,US,38.0000,-97.0000
+18.100.0.68,Cambridge,MA,US,42.3646,-71.1028
+18.152.2.242,Cambridge,MA,US,42.3646,-71.1028
+18.187.1.68,Cambridge,MA,US,42.3646,-71.1028
+18.243.0.74,Cambridge,MA,US,42.3646,-71.1028
+18.243.2.53,Cambridge,MA,US,42.3646,-71.1028
+18.244.3.24,Cambridge,MA,US,42.3646,-71.1028
+18.246.1.160,Cambridge,MA,US,42.3646,-71.1028
+18.26.0.25,Cambridge,MA,US,42.3646,-71.1028
+18.42.0.124,Cambridge,MA,US,42.3646,-71.1028
+18.85.1.13,Cambridge,MA,US,42.3646,-71.1028
+189.129.3.104,Mexico,09,MX,19.4342,-99.1386
+189.29.64.184,,,BR,-10.0000,-55.0000
+190.140.62.223,UNKNOWN
+190.31.247.174,UNKNOWN
+192.108.114.19,X�nthi,03,GR,41.1414,24.8836
+192.150.94.81,Utrecht,09,NL,52.0833,5.1333
+192.255.255.253,UNKNOWN
+192.35.156.12,San Diego,CA,US,32.7977,-117.1322
+192.67.63.148,Plano,TX,US,33.0260,-96.6990
+193.110.91.7,London,P5,GB,51.5000,-0.1167
+193.111.87.20,,,CY,35.0000,33.0000
+193.167.127.81,Espoo,13,FI,60.2167,24.6667
+193.19.77.145,Toulouse,B3,FR,43.6000,1.4333
+193.196.182.215,L�rrach,01,DE,47.6167,7.6667
+193.198.207.6,Zagreb,21,HR,45.8000,16.0000
+193.201.52.133,Hann�ver,06,DE,53.1833,8.5167
+193.202.88.3,Budapest,05,HU,47.5000,19.0833
+193.219.115.200,UNKNOWN
+193.219.28.244,Warsaw,67,PL,52.2500,21.0000
+193.224.70.6,Budapest,05,HU,47.5000,19.0833
+193.224.70.7,Budapest,05,HU,47.5000,19.0833
+193.34.68.132,UNKNOWN
+193.55.112.121,Paris,A8,FR,48.8667,2.3333
+193.93.3.6,Muenster,07,DE,51.9667,7.6333
+194.109.206.212,Amsterdam,07,NL,52.3500,4.9167
+194.152.123.48,Vienna,09,AT,48.2000,16.3667
+194.169.192.183,UNKNOWN
+194.171.167.147,Utrecht,09,NL,52.0833,5.1333
+194.177.96.78,Codogno,05,IT,45.1500,9.7000
+194.187.213.89,Espoo,13,FI,60.2167,24.6667
+194.231.188.66,,,DE,51.0000,9.0000
+194.46.243.32,,,IE,53.0000,-8.0000
+194.88.217.156,Wien,09,AT,48.2000,16.3667
+194.97.160.186,Leithe,07,DE,51.4667,7.1167
+195.111.98.214,Budapest,05,HU,47.5000,19.0833
+195.113.141.130,�st� Nad Labem,89,CZ,50.6667,14.0333
+195.113.36.49,Prague,52,CZ,50.0833,14.4667
+195.14.235.213,Cologne,07,DE,50.9333,6.9500
+195.140.191.14,Odessa,17,UA,46.4667,30.7333
+195.146.244.253,Croix,B4,FR,50.6667,3.1500
+195.158.167.56,Hamburg,04,DE,53.5500,10.0000
+195.158.167.63,Hamburg,04,DE,53.5500,10.0000
+195.165.82.253,Lappeenranta,13,FI,61.0667,28.1833
+195.169.205.25,Nijmegen,03,NL,51.8333,5.8667
+195.177.250.222,Wien,09,AT,48.2000,16.3667
+195.230.168.95,Eisenstadt,01,AT,47.8500,16.5167
+195.234.100.13,Graz,06,AT,47.0667,15.4500
+195.36.241.63,,,FR,46.0000,2.0000
+195.37.132.28,Franken,08,DE,50.5000,7.2332
+195.70.150.44,Praha,52,CZ,50.0833,14.4667
+195.71.8.10,Verl,07,DE,51.8833,8.5167
+195.71.90.10,Verl,07,DE,51.8833,8.5167
+195.85.225.145,Zaandam,07,NL,52.4500,4.8333
+196.2.121.177,Johannesburg,06,ZA,-26.2000,28.0833
+196.206.223.240,Rabat,24,MA,34.0253,-6.8361
+196.206.41.113,Rabat,24,MA,34.0253,-6.8361
+198.145.242.242,Vancouver,WA,US,45.6023,-122.5167
+199.201.145.178,Brookline,MA,US,42.3326,-71.1282
+2.254.46.95,UNKNOWN
+200.177.0.46,Porto Alegre,23,BR,-30.0333,-51.2000
+200.188.241.228,Florian�polis,26,BR,-27.5833,-48.5667
+200.94.91.115,La Paz,03,MX,24.1667,-110.3000
+201.233.192.128,UNKNOWN
+201.243.138.187,Caracas,25,VE,10.5000,-66.9167
+201.29.181.237,Rio De Janeiro,21,BR,-22.9000,-43.2333
+201.37.205.200,S�o Paulo,27,BR,-23.5333,-46.6167
+202.113.118.250,Tianjin,28,CN,39.1422,117.1767
+202.156.177.215,Singapore,00,SG,1.2931,103.8558
+202.173.141.155,Hillcrest,04,AU,-17.3667,145.6000
+202.196.113.125,Zhengzhou,09,CN,34.7578,113.6486
+202.69.68.58,Hong Kong,00,HK,22.2833,114.1500
+202.71.232.26,Chung Kwai Chung,00,HK,22.3667,114.1333
+203.155.165.248,Bangkok,40,TH,13.7500,100.5167
+203.218.215.38,Central District,00,HK,22.2833,114.1500
+204.11.104.245,Berkeley,CA,US,37.8670,-122.2400
+204.13.236.244,Red Oak,TX,US,32.5227,-96.8048
+204.15.133.171,Dana Point,CA,US,33.4782,-117.7064
+204.253.162.11,San Francisco,CA,US,37.7645,-122.4294
+205.244.242.67,Orlando,FL,US,28.5037,-81.3306
+206.174.19.25,Fairbanks,AK,US,64.8834,-147.4985
+206.222.29.14,Columbus,OH,US,40.0842,-82.9378
+206.231.255.250,Silver Spring,MD,US,39.0046,-77.0369
+206.55.74.0,Milwaukee,WI,US,43.0362,-87.9170
+207.160.159.85,Columbia,MO,US,38.8896,-92.2236
+207.174.191.134,Berthoud,CO,US,40.2912,-105.0816
+207.210.74.165,Atlanta,GA,US,33.7516,-84.3915
+207.224.113.38,Denver,CO,US,39.7525,-104.9995
+207.36.232.16,Fort Lauderdale,FL,US,26.1882,-80.1711
+207.38.252.195,Rego Park,NY,US,40.7235,-73.8612
+207.44.180.3,Houston,TX,US,29.9342,-95.4057
+207.7.145.213,San Francisco,CA,US,37.7758,-122.4128
+208.106.21.4,Santa Rosa,CA,US,38.3928,-122.7507
+208.116.11.54,Clifton,NJ,US,40.8326,-74.1307
+208.40.218.131,Orland Park,IL,US,41.6044,-87.8895
+208.51.51.165,Edmond,OK,US,35.6784,-97.4944
+208.64.36.69,Troy,MI,US,42.5563,-83.1769
+208.69.181.9,San Jose,CA,US,37.3857,-121.8993
+208.75.85.115,UNKNOWN
+208.75.85.208,UNKNOWN
+209.147.127.221,Tacoma,WA,US,47.2626,-122.4413
+209.160.32.149,Washington,DC,US,38.9097,-77.0231
+209.162.39.130,San Luis Obispo,CA,US,35.2678,-120.6591
+209.172.52.78,Cave Creek,AZ,US,33.8045,-111.9318
+209.205.236.49,San Ysidro,CA,US,32.5675,-116.9740
+209.221.138.34,Seattle,WA,US,47.5951,-122.3326
+209.221.193.39,Palmdale,CA,US,34.5200,-118.0835
+209.223.236.238,Dallas,TX,US,32.8796,-96.7043
+209.237.230.67,San Francisco,CA,US,37.7758,-122.4128
+209.242.227.89,Milwaukee,WI,US,43.0522,-87.9650
+209.51.169.86,Fremont,CA,US,37.5155,-121.8962
+209.59.180.78,Lansing,MI,US,42.7257,-84.6360
+209.8.40.177,Centreville,VA,US,38.8159,-77.4607
+209.97.215.240,Kelowna,BC,CA,49.9000,-119.4833
+210.224.92.251,,,JP,36.0000,138.0000
+211.157.109.95,Beijing,22,CN,39.9289,116.3883
+211.162.29.86,Nanjing,04,CN,32.0617,118.7778
+212.108.197.46,Budapest,05,HU,47.5000,19.0833
+212.112.235.78,,,DE,51.0000,9.0000
+212.112.241.137,,,DE,51.0000,9.0000
+212.112.241.44,,,DE,51.0000,9.0000
+212.112.242.159,,,DE,51.0000,9.0000
+212.112.242.21,,,DE,51.0000,9.0000
+212.112.242.89,,,DE,51.0000,9.0000
+212.118.15.221,Amman,11,JO,31.9500,35.9333
+212.118.59.154,Penza,57,RU,53.1958,45.0000
+212.149.225.3,Kuopio,14,FI,62.9000,27.6833
+212.168.190.8,,,DE,51.0000,9.0000
+212.17.83.217,Vienna,09,AT,48.2000,16.3667
+212.187.48.185,Lelystad,16,NL,52.5167,5.4500
+212.202.177.81,Bargstedt,10,DE,54.1667,9.7667
+212.202.233.2,Koeln,07,DE,50.9333,6.9500
+212.227.108.114,Karlsruhe,01,DE,49.0047,8.3858
+212.227.49.27,Karlsruhe,01,DE,49.0047,8.3858
+212.24.168.178,Szeged,19,HU,46.2500,20.1667
+212.246.67.151,,,FI,64.0000,26.0000
+212.35.1.141,Uitikon,01,CH,47.3667,8.4667
+212.42.236.140,Sandstedt,06,DE,53.3667,8.5333
+212.56.241.116,,,EU,47.0000,8.0000
+212.99.207.80,Ohlsdorf,04,DE,53.6167,10.0333
+213.100.254.167,Fr�lunda,28,SE,57.3333,13.0167
+213.100.3.233,Kista,26,SE,59.4500,17.9167
+213.112.9.121,G�teborg,28,SE,57.7167,11.9667
+213.113.162.17,,,SE,62.0000,15.0000
+213.114.68.170,,,SE,62.0000,15.0000
+213.130.162.253,Amsterdam,07,NL,52.3500,4.9167
+213.133.126.124,Gunzenhausen,02,DE,49.1000,10.7500
+213.141.77.131,G�vle,03,SE,60.6667,17.1667
+213.144.140.50,Zuchwil,18,CH,47.2000,7.5667
+213.146.114.96,Kamp,07,DE,50.9333,7.7833
+213.17.104.91,Utrecht,09,NL,52.0833,5.1333
+213.186.233.196,Pori,15,FI,61.4833,21.7833
+213.196.252.236,Cologne,07,DE,50.9333,6.9500
+213.202.139.32,Clonmel,26,IE,52.3550,-7.7039
+213.203.156.22,Rome,07,IT,41.9000,12.4832
+213.203.214.130,Euskirchen,07,DE,50.6667,6.7833
+213.220.233.230,Prague,52,CZ,50.0833,14.4667
+213.226.88.188,Gravryd,28,SE,57.7667,13.1333
+213.228.241.143,London,P5,GB,51.5000,-0.1167
+213.231.98.136,Barcelona,56,ES,41.3833,2.1833
+213.239.193.119,Gunzenhausen,02,DE,49.1000,10.7500
+213.239.202.232,Gunzenhausen,02,DE,49.1000,10.7500
+213.239.206.174,Gunzenhausen,02,DE,49.1000,10.7500
+213.239.207.67,Gunzenhausen,02,DE,49.1000,10.7500
+213.239.211.148,Gunzenhausen,02,DE,49.1000,10.7500
+213.239.212.133,Gunzenhausen,02,DE,49.1000,10.7500
+213.239.215.85,Gunzenhausen,02,DE,49.1000,10.7500
+213.246.63.134,Verdun,B2,FR,49.1667,5.3833
+213.25.76.12,Sokolka,24,PL,53.4167,23.5000
+213.251.169.20,Roubaix,B4,FR,50.7000,3.1667
+213.254.226.25,Madrid,29,ES,40.4000,-3.6833
+213.39.164.160,Hamburg,04,DE,53.5500,10.0000
+213.41.242.132,Paris,A8,FR,48.8667,2.3333
+213.44.61.87,,,FR,46.0000,2.0000
+213.65.146.100,,,SE,62.0000,15.0000
+213.67.207.73,,,SE,62.0000,15.0000
+213.84.147.225,Castricum,07,NL,52.5500,4.6667
+213.84.192.84,Rijswijk,11,NL,52.0167,4.3333
+213.84.46.114,The Hague,11,NL,52.0833,4.3000
+213.9.1.108,Duisburg,07,DE,51.4333,6.7500
+216.110.217.24,West Linn,OR,US,45.3422,-122.6639
+216.127.93.186,Houston,TX,US,29.9342,-95.4057
+216.137.65.86,Cedar Rapids,IA,US,41.9874,-91.6838
+216.139.253.42,Austin,TX,US,30.2643,-97.7139
+216.194.67.53,Edmonton,AB,CA,53.5500,-113.5000
+216.195.133.27,Manchester,NH,US,42.9841,-71.4487
+216.211.73.101,Thunder Bay,ON,CA,48.4000,-89.2333
+216.220.98.32,New York,NY,US,40.7619,-73.9763
+216.224.124.124,Aptos,CA,US,37.0082,-121.8777
+216.231.168.178,Pensacola,FL,US,30.4506,-87.2755
+216.231.47.120,Seattle,WA,US,47.5951,-122.3326
+216.239.81.232,Montr�al,QC,CA,45.5000,-73.5833
+216.27.181.158,Oakland,CA,US,37.7950,-122.2193
+216.39.137.58,Seattle,WA,US,47.5951,-122.3326
+216.54.123.80,Virginia Beach,VA,US,36.8061,-76.0612
+216.86.198.76,Long Beach,CA,US,33.7976,-118.1617
+217.10.142.173,Studley,Q4,GB,52.2667,-1.8833
+217.10.241.26,Plovdiv,51,BG,42.1500,24.7500
+217.11.248.50,Brno,78,CZ,49.2000,16.6333
+217.11.54.81,,,DE,51.0000,9.0000
+217.113.229.42,Lodz,53,PL,52.2667,16.7500
+217.114.79.30,Hamburg,04,DE,53.5500,10.0000
+217.115.192.218,Amsterdam,07,NL,52.3500,4.9167
+217.115.204.25,Amsterdam,07,NL,52.3500,4.9167
+217.116.101.208,Warsaw,67,PL,52.2500,21.0000
+217.121.118.110,Leeuwarden,02,NL,53.2000,5.7833
+217.144.200.8,Tarn�w,64,PL,50.0167,20.9832
+217.149.34.124,Schiphol,07,NL,52.3000,4.7500
+217.155.230.230,Rochdale,L2,GB,53.6167,-2.1500
+217.16.65.190,Skopje,41,MK,42.0000,21.4333
+217.160.107.206,Karlsruhe,01,DE,49.0047,8.3858
+217.160.111.190,Karlsruhe,01,DE,49.0047,8.3858
+217.160.169.57,Karlsruhe,01,DE,49.0047,8.3858
+217.160.176.49,Karlsruhe,01,DE,49.0047,8.3858
+217.160.203.26,Karlsruhe,01,DE,49.0047,8.3858
+217.160.254.116,,OH,US,40.3914,-82.7526
+217.160.78.171,Karlsruhe,01,DE,49.0047,8.3858
+217.172.183.219,,,DE,51.0000,9.0000
+217.172.47.18,Frankfurt,05,DE,50.1167,8.6833
+217.173.129.76,Hofheim,05,DE,50.0833,8.4500
+217.196.64.205,Vienna,09,AT,48.2000,16.3667
+217.20.117.129,Frankfurt,05,DE,50.1167,8.6833
+217.20.117.240,Frankfurt,05,DE,50.1167,8.6833
+217.20.117.92,Frankfurt,05,DE,50.1167,8.6833
+217.20.121.40,Frankfurt,05,DE,50.1167,8.6833
+217.216.190.160,C�rdoba,51,ES,37.8833,-4.7668
+217.219.111.36,Iran,03,IR,32.0922,51.0289
+217.227.126.93,Laatzen,06,DE,52.3167,9.8000
+217.228.32.82,Krefeld,07,DE,51.3333,6.5667
+217.229.246.86,,,DE,51.0000,9.0000
+217.230.235.160,Berlin,16,DE,52.5167,13.4000
+217.231.16.67,Berlin,16,DE,52.5167,13.4000
+217.236.51.127,Wennigsen,06,DE,52.2667,9.5833
+217.238.156.119,,,DE,51.0000,9.0000
+217.7.67.156,Kissing,02,DE,48.3000,10.9832
+217.75.149.120,Sofia,42,BG,42.6833,23.3167
+217.79.87.238,Varna,61,BG,43.2167,27.9167
+217.80.235.159,Karlsfeld,02,DE,48.2167,11.4667
+217.80.83.121,Gr�nwald,02,DE,48.0500,11.5167
+217.87.40.57,,,DE,51.0000,9.0000
+217.93.142.168,Frankfurt Am Main,05,DE,50.1167,8.6833
+217.96.105.139,Rudnik,45,PL,50.9667,22.4500
+218.102.125.231,Central District,00,HK,22.2833,114.1500
+218.111.26.171,Kuala Lumpur,14,MY,3.1667,101.7000
+218.14.51.24,,,CN,35.0000,105.0000
+218.16.124.247,,,CN,35.0000,105.0000
+218.18.46.221,,,CN,35.0000,105.0000
+218.189.210.17,,,HK,22.2500,114.1667
+218.198.122.48,Zhengzhou,09,CN,34.7578,113.6486
+218.198.171.174,Zhengzhou,09,CN,34.7578,113.6486
+218.198.171.198,Zhengzhou,09,CN,34.7578,113.6486
+218.199.29.20,Wuhan,12,CN,30.5833,114.2667
+218.21.130.42,,,CN,35.0000,105.0000
+218.23.0.86,,,CN,35.0000,105.0000
+218.242.10.120,Shanghai,23,CN,31.2222,121.4581
+218.58.55.58,Shandong,07,CN,23.5878,117.3508
+218.61.138.246,,,CN,35.0000,105.0000
+218.79.19.151,Shanghai,23,CN,31.2222,121.4581
+218.81.181.205,Shanghai,23,CN,31.2222,121.4581
+218.83.249.182,Shanghai,23,CN,31.2222,121.4581
+218.83.76.52,Shanghai,23,CN,31.2222,121.4581
+218.87.61.229,Beijing,22,CN,39.9289,116.3883
+218.9.124.172,,,CN,35.0000,105.0000
+219.130.135.26,,,CN,35.0000,105.0000
+219.133.175.193,Shenzhen,30,CN,22.5333,114.1333
+219.136.170.69,,,CN,35.0000,105.0000
+219.156.117.214,Henan,31,CN,18.8572,109.8028
+219.234.99.168,Shenzhen,30,CN,22.5333,114.1333
+219.31.4.11,,,JP,36.0000,138.0000
+219.77.131.211,Central District,00,HK,22.2833,114.1500
+220.111.66.236,Tokyo,40,JP,35.6850,139.7514
+220.112.165.17,Shenzhen,30,CN,22.5333,114.1333
+220.112.233.194,Beijing,22,CN,39.9289,116.3883
+220.157.175.94,Asahi,04,JP,35.7167,140.6500
+220.171.216.136,,,CN,35.0000,105.0000
+220.200.181.80,Beijing,22,CN,39.9289,116.3883
+220.233.223.105,,,AU,-27.0000,133.0000
+220.237.0.68,Sydney,02,AU,-33.8833,151.2167
+220.239.77.129,Sydney,02,AU,-33.8833,151.2167
+221.126.153.59,,,HK,22.2500,114.1667
+221.129.229.167,Tianjin,28,CN,39.1422,117.1767
+221.15.133.163,Beijing,22,CN,39.9289,116.3883
+221.216.218.194,Beijing,22,CN,39.9289,116.3883
+221.219.216.31,Beijing,22,CN,39.9289,116.3883
+221.221.186.186,Beijing,22,CN,39.9289,116.3883
+221.225.100.185,Beijing,22,CN,39.9289,116.3883
+221.226.85.250,Beijing,22,CN,39.9289,116.3883
+221.236.52.34,Beijing,22,CN,39.9289,116.3883
+221.3.19.239,Shandong,07,CN,23.5878,117.3508
+221.85.38.18,,,JP,36.0000,138.0000
+222.104.35.79,Taegu,15,KR,35.8703,128.5911
+222.137.73.205,Beijing,22,CN,39.9289,116.3883
+222.170.13.7,Zhongshan,30,CN,22.5174,113.3661
+222.183.111.138,Beijing,22,CN,39.9289,116.3883
+222.209.138.223,Beijing,22,CN,39.9289,116.3883
+222.221.221.152,Beijing,22,CN,39.9289,116.3883
+222.248.118.45,Shenzhen,30,CN,22.5333,114.1333
+222.248.119.183,Shenzhen,30,CN,22.5333,114.1333
+222.39.26.33,Beijing,22,CN,39.9289,116.3883
+222.64.40.193,Shanghai,23,CN,31.2222,121.4581
+222.72.121.113,Beijing,22,CN,39.9289,116.3883
+222.77.71.70,Beijing,22,CN,39.9289,116.3883
+222.84.47.10,Beijing,22,CN,39.9289,116.3883
+222.89.82.130,Beijing,22,CN,39.9289,116.3883
+222.93.229.127,Beijing,22,CN,39.9289,116.3883
+23.238.141.138,UNKNOWN
+24.108.143.182,Saskatoon,SK,CA,52.1333,-106.6668
+24.128.11.252,Exeter,NH,US,42.9661,-70.9881
+24.128.119.4,Melrose,MA,US,42.4574,-71.0541
+24.13.139.93,Chicago,IL,US,41.8675,-87.6744
+24.16.125.194,Bellevue,WA,US,47.6027,-122.1557
+24.16.54.166,Bothell,WA,US,47.7953,-122.2018
+24.165.168.246,Newark,AR,US,35.7309,-91.3903
+24.168.217.245,Columbia,SC,US,34.0391,-80.9883
+24.17.31.211,Seattle,WA,US,47.5951,-122.3326
+24.179.15.82,Saint Louis,MO,US,38.6385,-90.3026
+24.180.171.103,Carol Stream,IL,US,41.9153,-88.1287
+24.202.116.60,Montr�al,QC,CA,45.5000,-73.5833
+24.202.5.70,Montr�al,QC,CA,45.5000,-73.5833
+24.208.96.212,Boca Raton,FL,US,26.3739,-80.1468
+24.21.175.100,Portland,OR,US,45.5184,-122.6554
+24.210.100.26,West Bloomfield,MI,US,42.5703,-83.3810
+24.211.163.249,Cary,NC,US,35.7821,-78.8177
+24.213.243.221,Clifton Park,NY,US,42.8571,-73.7993
+24.229.203.25,Palmerton,PA,US,40.8366,-75.5883
+24.238.239.34,Spring,TX,US,30.1145,-95.4729
+24.26.255.115,San Marcos,TX,US,29.8729,-98.0140
+24.29.193.226,Kent,OH,US,41.1413,-81.3339
+24.34.114.171,Exeter,NH,US,42.9661,-70.9881
+24.34.88.68,Old Saybrook,CT,US,41.3009,-72.3876
+24.4.230.89,Salinas,CA,US,36.6859,-121.6293
+24.4.89.16,San Mateo,CA,US,37.5488,-122.3124
+24.61.37.120,Dedham,MA,US,42.2451,-71.1840
+24.71.88.245,Calgary,AB,CA,51.0833,-114.0833
+24.9.34.95,Broomfield,CO,US,39.9147,-105.0809
+24.90.4.210,Woodhaven,NY,US,40.6931,-73.8575
+29.242.154.121,,,US,38.0000,-97.0000
+38.119.53.59,Washington,DC,US,38.9144,-77.0763
+39.233.11.126,UNKNOWN
+5.160.159.185,UNKNOWN
+5.171.228.221,UNKNOWN
+58.106.45.193,Sydney,02,AU,-33.8833,151.2167
+58.141.43.221,Seoul,11,KR,37.5664,126.9997
+58.153.18.172,Hong Kong,00,HK,22.2833,114.1500
+58.22.133.141,Putian,07,CN,25.4394,119.0103
+58.246.247.145,Beijing,22,CN,39.9289,116.3883
+58.63.109.78,Beijing,22,CN,39.9289,116.3883
+59.134.15.153,,,JP,36.0000,138.0000
+59.149.171.231,Hong Kong,00,HK,22.2833,114.1500
+59.149.206.178,Hong Kong,00,HK,22.2833,114.1500
+59.173.48.182,,,CN,35.0000,105.0000
+59.56.158.26,Beijing,22,CN,39.9289,116.3883
+59.60.134.153,Beijing,22,CN,39.9289,116.3883
+59.66.154.246,Beijing,22,CN,39.9289,116.3883
+59.78.26.83,Shanghai,23,CN,31.2222,121.4581
+59.78.51.42,Shanghai,23,CN,31.2222,121.4581
+59.78.51.43,Shanghai,23,CN,31.2222,121.4581
+60.168.81.239,Beijing,22,CN,39.9289,116.3883
+60.179.161.16,Ningbo,02,CN,29.8750,121.5419
+60.212.214.122,Beijing,22,CN,39.9289,116.3883
+60.234.134.113,Auckland,00,NZ,-36.8667,174.7667
+60.48.68.15,Kuala Lumpur,14,MY,3.1667,101.7000
+60.63.17.147,Shanghai,23,CN,31.2222,121.4581
+61.125.222.12,Asahi,04,JP,35.7167,140.6500
+61.145.42.177,,,CN,35.0000,105.0000
+61.207.170.220,,,JP,36.0000,138.0000
+61.239.134.197,Hong Kong,00,HK,22.2833,114.1500
+61.79.84.134,,,KR,37.0000,127.5000
+61.93.185.237,Hong Kong,00,HK,22.2833,114.1500
+62.10.4.57,Rome,07,IT,41.9000,12.4832
+62.111.240.11,Marki,67,PL,52.3167,21.1333
+62.111.245.119,Poznan,86,PL,52.4167,16.9667
+62.112.159.61,,,DE,51.0000,9.0000
+62.117.31.194,Wolfsburg,06,DE,52.4333,10.8000
+62.121.68.209,Warsaw,67,PL,52.2500,21.0000
+62.128.27.167,,,DE,51.0000,9.0000
+62.141.56.164,Erfurt,15,DE,50.9833,11.0333
+62.141.91.165,Moscow,48,RU,55.7522,37.6156
+62.142.248.53,Espoo,13,FI,60.2167,24.6667
+62.143.13.58,D�sseldorf,07,DE,51.2167,6.7667
+62.146.202.66,Schwabach,02,DE,49.3292,11.0256
+62.149.12.179,Kiev,13,UA,50.4333,30.5167
+62.149.94.248,Riyadh,10,SA,24.6408,46.7728
+62.163.136.55,Amsterdam,07,NL,52.3500,4.9167
+62.163.50.62,Osdorp,07,NL,52.3667,4.7833
+62.166.240.67,Amsterdam,07,NL,52.3500,4.9167
+62.179.68.175,Warsaw,67,PL,52.2500,21.0000
+62.194.166.79,Amsterdam,07,NL,52.3500,4.9167
+62.197.40.155,Maidenhead,P9,GB,51.5167,-0.7000
+62.202.35.184,Muri,05,CH,46.9167,7.4832
+62.205.104.38,Brussels,11,BE,50.8333,4.3333
+62.206.156.59,Hamburg,04,DE,53.5500,10.0000
+62.206.43.161,Hamburg,04,DE,53.5500,10.0000
+62.214.197.207,Mittelheubronn,01,DE,47.8000,7.8167
+62.214.229.95,Oberf�hring,02,DE,48.1667,11.6333
+62.214.244.199,Schmargendorf,16,DE,52.4833,13.3000
+62.219.121.81,Qiryat Ono,02,IL,32.0636,34.8553
+62.219.46.202,Tel Aviv-Yafo,05,IL,32.0678,34.7647
+62.220.137.73,Z�rich,25,CH,47.3667,8.5500
+62.241.240.86,Lohja,13,FI,60.2500,24.0833
+62.245.233.242,Munich,02,DE,48.1500,11.5833
+62.47.166.185,Vienna,09,AT,48.2000,16.3667
+62.48.34.110,Firenze,16,IT,43.7667,11.2500
+62.48.42.77,Pietrasanta,16,IT,43.9500,10.2332
+62.75.142.20,,,DE,51.0000,9.0000
+62.75.150.90,,,DE,51.0000,9.0000
+62.75.163.23,,,DE,51.0000,9.0000
+62.75.185.82,,,DE,51.0000,9.0000
+62.75.186.127,,,DE,51.0000,9.0000
+62.75.202.231,,,DE,51.0000,9.0000
+62.75.223.163,,,DE,51.0000,9.0000
+62.75.252.130,,,DE,51.0000,9.0000
+63.228.65.81,Colorado Springs,CO,US,38.8326,-104.7405
+63.246.166.66,Austin,TX,US,30.3037,-97.7696
+63.85.194.6,Richardson,TX,US,32.9914,-96.6645
+64.122.12.107,Portland,OR,US,45.5184,-122.6554
+64.142.29.22,Richmond,CA,US,37.9426,-122.3457
+64.142.31.83,Concord,CA,US,37.9797,-122.0056
+64.142.98.231,Santa Rosa,CA,US,38.3928,-122.7507
+64.151.99.196,San Francisco,CA,US,37.7898,-122.3942
+64.157.15.26,Tampa,FL,US,27.9578,-82.4622
+64.158.128.204,Phoenix,AZ,US,33.5222,-112.0839
+64.159.76.19,Tampa,FL,US,27.9578,-82.4622
+64.161.78.226,,,US,38.0000,-97.0000
+64.164.59.200,Chino Hills,CA,US,33.9473,-117.7289
+64.185.20.210,Lubbock,TX,US,33.5663,-101.8830
+64.191.50.166,Scranton,PA,US,41.3731,-75.6837
+64.191.68.53,Scranton,PA,US,41.3731,-75.6837
+64.20.233.234,Austin,TX,US,30.4549,-97.7565
+64.22.103.213,UNKNOWN
+64.22.71.125,Atlanta,GA,US,33.7516,-84.3915
+64.222.126.240,Cranston,RI,US,41.7695,-71.4729
+64.230.38.120,Cottam,ON,CA,42.1333,-82.7500
+64.230.85.110,Ottawa,ON,CA,45.4167,-75.7000
+64.255.172.109,Santa Clara,CA,US,37.3501,-121.9854
+64.26.169.184,Ottawa,ON,CA,45.4167,-75.7000
+64.27.20.188,Los Angeles,CA,US,34.0619,-118.3098
+64.27.25.205,Los Angeles,CA,US,34.0619,-118.3098
+64.34.177.245,San Antonio,TX,US,29.4821,-98.4556
+64.5.53.220,Dallas,TX,US,32.7825,-96.8207
+64.5.53.254,Dallas,TX,US,32.7825,-96.8207
+64.62.231.86,Fremont,CA,US,37.5155,-121.8962
+64.74.207.50,Atlanta,GA,US,33.7516,-84.3915
+64.79.206.216,Bellevue,WA,US,47.5527,-122.1480
+64.81.160.72,Seattle,WA,US,47.6145,-122.3480
+64.81.53.19,Emeryville,CA,US,37.8342,-122.2897
+64.81.59.235,Burlingame,CA,US,37.5671,-122.3710
+64.95.64.86,Salem,MA,US,42.5153,-70.9075
+65.186.89.136,Hilliard,OH,US,40.0231,-83.1810
+65.249.164.72,Buffalo,NY,US,42.9096,-78.8291
+65.25.8.48,Youngstown,OH,US,41.0871,-80.6617
+65.255.217.11,Long Beach,CA,US,33.7542,-118.2019
+65.27.196.244,Cincinnati,OH,US,39.1699,-84.4859
+65.38.9.9,Tulsa,OK,US,36.1352,-95.9365
+65.39.86.51,Scottsdale,AZ,US,33.5984,-111.8669
+65.6.133.55,Atlanta,GA,US,33.8004,-84.3865
+65.94.134.233,Toronto,ON,CA,43.6667,-79.4168
+65.98.70.171,Clifton,NJ,US,40.8326,-74.1307
+65.99.219.91,Dallas,TX,US,32.8148,-96.8706
+66.111.43.137,Dacula,GA,US,33.9785,-83.8811
+66.114.178.133,Belvidere,IL,US,42.2491,-88.8331
+66.114.65.225,New York,NY,US,40.7619,-73.9763
+66.116.103.156,San Francisco,CA,US,37.7938,-122.4022
+66.117.13.120,UNKNOWN
+66.134.212.156,Los Angeles,CA,US,34.0416,-118.2988
+66.135.40.74,San Antonio,TX,US,29.4821,-98.4556
+66.150.225.107,Atlanta,GA,US,33.7516,-84.3915
+66.150.225.130,Atlanta,GA,US,33.7516,-84.3915
+66.161.188.33,Cincinnati,OH,US,39.1699,-84.4859
+66.175.215.123,UNKNOWN
+66.188.99.241,Madison,WI,US,43.0714,-89.3932
+66.191.239.246,Sevierville,TN,US,35.8003,-83.5210
+66.197.176.115,Moscow,48,RU,55.7522,37.6156
+66.199.184.254,Vancouver,BC,CA,49.2500,-123.1333
+66.199.236.130,Great River,NY,US,40.7263,-73.1577
+66.199.236.138,Great River,NY,US,40.7263,-73.1577
+66.199.240.50,Great River,NY,US,40.7263,-73.1577
+66.199.252.58,Great River,NY,US,40.7263,-73.1577
+66.219.161.166,Doylestown,OH,US,40.9603,-81.6975
+66.228.127.27,Carrollton,TX,US,33.0035,-96.9000
+66.229.224.108,Los Angeles,CA,US,34.0416,-118.2988
+66.23.214.241,Woodstock,GA,US,34.1190,-84.4477
+66.240.222.22,San Diego,CA,US,32.8073,-117.1324
+66.29.3.183,Parsippany,NJ,US,40.8597,-74.4026
+66.31.235.23,Fall River,MA,US,41.6950,-71.1443
+66.44.254.169,Mocksville,NC,US,35.8987,-80.5741
+66.70.10.53,Hoboken,NJ,US,40.7458,-74.0321
+66.92.13.212,San Francisco,CA,US,37.7645,-122.4294
+66.92.216.74,Los Angeles,CA,US,34.0530,-118.2642
+66.93.220.131,Chicago,IL,US,41.8998,-87.6368
+66.93.240.251,Chicago,IL,US,41.8998,-87.6368
+66.98.136.49,Houston,TX,US,29.9342,-95.4057
+66.98.208.43,Houston,TX,US,29.9342,-95.4057
+67.121.242.250,,,US,38.0000,-97.0000
+67.15.225.36,Houston,TX,US,29.9342,-95.4057
+67.171.72.181,Pittsburgh,PA,US,40.4456,-79.9794
+67.18.149.92,Dallas,TX,US,32.7825,-96.8207
+67.18.176.110,Dallas,TX,US,32.7825,-96.8207
+67.18.92.141,Dallas,TX,US,32.7825,-96.8207
+67.18.92.228,Dallas,TX,US,32.7825,-96.8207
+67.183.7.242,Bothell,WA,US,47.7953,-122.2018
+67.187.144.128,Seattle,WA,US,47.5951,-122.3326
+67.43.175.98,Venice,CA,US,33.9944,-118.4639
+67.43.74.54,Salem,OR,US,44.9500,-123.0198
+67.53.76.66,Eatontown,NJ,US,40.3039,-74.0703
+67.67.13.23,Dallas,TX,US,32.7791,-96.8028
+67.80.106.153,Wayne,NJ,US,40.9487,-74.2413
+67.81.49.158,Neptune,NJ,US,40.2182,-74.0710
+67.85.88.5,Spring Valley,NY,US,41.1163,-74.0460
+67.88.160.67,Claremont,NH,US,43.3592,-72.3363
+68.105.166.197,Gainesville,FL,US,29.6694,-82.3573
+68.107.36.62,San Diego,CA,US,32.7977,-117.1322
+68.107.79.224,San Diego,CA,US,32.7977,-117.1322
+68.117.130.197,Madison,WI,US,43.0714,-89.3932
+68.12.186.211,Oklahoma City,OK,US,35.4715,-97.5190
+68.144.77.32,Calgary,AB,CA,51.0833,-114.0833
+68.146.236.11,Calgary,AB,CA,51.0833,-114.0833
+68.178.205.201,Scottsdale,AZ,US,33.6119,-111.8907
+68.183.231.16,Winnetka,CA,US,34.2093,-118.5752
+68.47.174.246,Knoxville,TN,US,35.9724,-83.9595
+68.47.207.110,Knoxville,TN,US,35.9724,-83.9595
+68.52.222.138,Franklin,TN,US,35.9340,-86.8878
+68.53.110.153,Clarksville,TN,US,36.5090,-87.3396
+68.53.139.144,Hermitage,TN,US,36.1782,-86.6099
+68.62.77.70,Royal Oak,MI,US,42.5055,-83.1527
+68.63.98.46,Hamden,CT,US,41.3820,-72.9171
+68.93.137.39,Oklahoma City,OK,US,35.4715,-97.5190
+68.95.157.4,Dallas,TX,US,32.8098,-96.7993
+69.113.27.13,Eatontown,NJ,US,40.3039,-74.0703
+69.116.183.163,Hicksville,NY,US,40.7670,-73.5254
+69.12.150.55,Hayward,CA,US,37.6503,-122.0730
+69.12.180.247,Santa Rosa,CA,US,38.3928,-122.7507
+69.13.8.97,Fort Worth,TX,US,32.7492,-97.2205
+69.140.199.51,Washington,DC,US,38.9097,-77.0231
+69.16.139.103,Phoenix,AZ,US,33.5083,-112.0718
+69.20.97.236,San Jose,CA,US,37.3874,-121.9024
+69.207.190.123,Rochester,NY,US,43.1693,-77.6189
+69.209.180.140,Waterford,MI,US,42.6612,-83.3824
+69.230.8.156,Dallas,TX,US,32.7791,-96.8028
+69.243.35.48,Washington,DC,US,38.9097,-77.0231
+69.250.186.156,Greenbelt,MD,US,39.0027,-76.8807
+69.251.182.82,Bethesda,MD,US,38.9878,-77.1262
+69.253.173.96,Fort Monmouth,NJ,US,40.3139,-74.0481
+69.34.166.216,Denville,NJ,US,40.8841,-74.4863
+69.41.174.196,Dallas,TX,US,32.8120,-96.8143
+69.56.173.86,Dallas,TX,US,32.7825,-96.8207
+69.57.148.142,Houston,TX,US,29.9342,-95.4057
+69.88.231.232,Tacoma,WA,US,47.2626,-122.4413
+69.90.109.247,Richmond,BC,CA,49.1667,-122.9667
+69.93.121.162,Dallas,TX,US,32.7825,-96.8207
+69.93.127.87,Dallas,TX,US,32.7825,-96.8207
+70.101.164.134,Houston,TX,US,29.7755,-95.4152
+70.110.70.238,Valrico,FL,US,27.9158,-82.2290
+70.124.25.84,Palm Harbor,FL,US,28.0901,-82.7251
+70.128.42.34,Little Rock,AR,US,34.7338,-92.3665
+70.129.55.216,Houston,TX,US,29.7755,-95.4152
+70.130.181.234,Saint Louis,MO,US,38.6385,-90.3026
+70.133.145.225,Dallas,TX,US,32.7791,-96.8028
+70.157.53.151,Augusta,GA,US,33.4393,-82.0512
+70.160.183.40,Spring,TX,US,30.1145,-95.4729
+70.162.81.229,Mesa,AZ,US,33.4253,-111.7273
+70.167.192.250,Atlanta,GA,US,33.8767,-84.3342
+70.176.140.197,Phoenix,AZ,US,33.5222,-112.0839
+70.181.241.192,Escondido,CA,US,33.1349,-117.0416
+70.190.182.173,Scottsdale,AZ,US,33.5984,-111.8669
+70.20.57.202,,,US,38.0000,-97.0000
+70.236.219.137,Annapolis,MD,US,38.9861,-76.5137
+70.238.175.182,Saint Louis,MO,US,38.6385,-90.3026
+70.240.176.209,Houston,TX,US,29.7755,-95.4152
+70.45.56.242,,,PR,18.2500,-66.5000
+70.50.0.53,Ottawa,ON,CA,45.4167,-75.7000
+70.51.123.221,Toronto,ON,CA,43.6667,-79.4168
+70.51.184.16,Pierrefonds,QC,CA,45.4667,-73.8833
+70.63.156.102,,NC,US,35.6442,-79.8266
+70.80.131.48,Montr�al,QC,CA,45.5000,-73.5833
+70.83.10.158,Halifax,NS,CA,44.6500,-63.6000
+70.84.114.153,Dallas,TX,US,32.7825,-96.8207
+70.85.16.127,Dallas,TX,US,32.7825,-96.8207
+70.86.138.210,Dallas,TX,US,32.7825,-96.8207
+71.11.144.206,Saint Louis,MO,US,38.6385,-90.3026
+71.111.248.186,,,US,38.0000,-97.0000
+71.112.1.63,Bothell,WA,US,47.7953,-122.2018
+71.116.76.63,San Jose,CA,US,37.3073,-121.8569
+71.129.40.18,San Diego,CA,US,32.7977,-117.1322
+71.141.192.136,San Francisco,CA,US,37.7645,-122.4294
+71.162.144.139,,,US,38.0000,-97.0000
+71.179.166.230,,,US,38.0000,-97.0000
+71.197.166.180,Atlantic Beach,FL,US,30.3607,-81.4262
+71.197.28.33,Detroit,MI,US,42.3662,-83.1015
+71.199.226.121,,,US,38.0000,-97.0000
+71.215.154.165,Denver,CO,US,39.7525,-104.9995
+71.225.61.184,Blue Bell,PA,US,40.1576,-75.2757
+71.227.0.13,Indianapolis,IN,US,39.8062,-86.1407
+71.228.91.0,,,US,38.0000,-97.0000
+71.232.250.68,,,US,38.0000,-97.0000
+71.236.131.80,,OR,US,44.6044,-122.1155
+71.236.166.71,,OR,US,44.6044,-122.1155
+71.236.230.160,,OR,US,44.6044,-122.1155
+71.240.75.2,Norfolk,VA,US,36.8861,-76.2668
+71.28.231.114,Elizabethtown,KY,US,37.7153,-85.8565
+71.32.5.248,Denver,CO,US,39.7525,-104.9995
+71.42.46.180,Herndon,VA,US,38.9266,-77.3937
+71.80.27.17,Cleveland,TN,US,35.1468,-84.8710
+71.83.124.90,Bozeman,MT,US,45.7115,-111.0563
+72.1.154.66,Olathe,KS,US,38.8686,-94.8344
+72.1.217.148,Ottawa,ON,CA,45.4167,-75.7000
+72.128.43.18,Kansas City,MO,US,39.1024,-94.5502
+72.130.183.198,Herndon,VA,US,38.9266,-77.3937
+72.147.54.227,,,US,38.0000,-97.0000
+72.148.54.247,,,US,38.0000,-97.0000
+72.15.233.132,Charlotte,NC,US,35.2060,-80.8290
+72.160.105.204,Monroe,LA,US,32.5206,-92.1066
+72.193.22.68,Vancouver,WA,US,45.6676,-122.6063
+72.201.57.119,Atlanta,GA,US,33.8767,-84.3342
+72.204.33.195,Atlanta,GA,US,33.8767,-84.3342
+72.208.67.77,Atlanta,GA,US,33.8767,-84.3342
+72.22.92.63,Santa Monica,CA,US,34.0119,-118.4682
+72.225.234.118,New York,NY,US,40.7619,-73.9763
+72.226.235.52,Branford,CT,US,41.2864,-72.7956
+72.29.105.147,Carson City,NV,US,39.1496,-119.7178
+72.36.239.30,Dallas,TX,US,32.9988,-96.7831
+72.43.122.119,Chapel Hill,NC,US,35.9098,-79.0782
+72.5.28.193,Newton Highlands,MA,US,42.3169,-71.2082
+72.53.5.20,Calgary,AB,CA,51.0833,-114.0833
+72.53.58.70,Calgary,AB,CA,51.0833,-114.0833
+72.55.153.154,UNKNOWN
+72.64.0.100,,,US,38.0000,-97.0000
+72.8.103.205,UNKNOWN
+72.81.214.109,,,US,38.0000,-97.0000
+72.9.108.50,Great River,NY,US,40.7263,-73.1577
+74.100.7.19,,,CA,60.0000,-95.0000
+74.119.238.80,,,CA,60.0000,-95.0000
+74.120.203.162,,,CA,60.0000,-95.0000
+74.131.6.36,Louisville,KY,US,38.2552,-85.5459
+74.134.92.57,Louisville,KY,US,38.2552,-85.5459
+74.173.50.215,UNKNOWN
+74.222.211.186,UNKNOWN
+74.229.201.181,,,US,38.0000,-97.0000
+74.69.33.85,,NY,US,42.1436,-74.9306
+74.70.30.110,,NY,US,42.1436,-74.9306
+74.97.155.75,,,CA,60.0000,-95.0000
+75.111.235.5,Tyler,TX,US,32.3180,-95.2921
+75.14.59.81,Dallas,TX,US,32.7791,-96.8028
+75.161.136.251,UNKNOWN
+75.36.234.124,Dallas,TX,US,32.7791,-96.8028
+75.45.80.157,Dallas,TX,US,32.7791,-96.8028
+75.5.226.71,Kalamazoo,MI,US,42.2899,-85.5883
+75.51.57.169,UNKNOWN
+75.55.112.14,UNKNOWN
+75.58.103.3,UNKNOWN
+75.58.57.132,UNKNOWN
+75.61.108.179,UNKNOWN
+75.67.157.72,,,US,38.0000,-97.0000
+75.68.195.189,,,US,38.0000,-97.0000
+75.73.50.3,,,US,38.0000,-97.0000
+75.75.126.57,,,US,38.0000,-97.0000
+76.105.128.69,UNKNOWN
+76.105.225.71,UNKNOWN
+76.170.83.56,Herndon,VA,US,38.9266,-77.3937
+76.178.168.145,Herndon,VA,US,38.9266,-77.3937
+76.20.220.233,,,US,38.0000,-97.0000
+76.209.225.117,UNKNOWN
+76.64.49.112,UNKNOWN
+76.79.72.82,UNKNOWN
+76.83.101.176,UNKNOWN
+77.123.150.99,UNKNOWN
+77.129.115.108,UNKNOWN
+77.131.84.163,UNKNOWN
+77.176.244.133,UNKNOWN
+77.177.22.48,UNKNOWN
+77.180.47.162,UNKNOWN
+77.180.64.181,UNKNOWN
+77.181.87.247,UNKNOWN
+77.182.23.136,UNKNOWN
+77.216.44.44,UNKNOWN
+77.5.31.98,UNKNOWN
+77.57.26.53,UNKNOWN
+77.65.144.81,UNKNOWN
+78.47.226.66,UNKNOWN
+78.49.187.224,UNKNOWN
+78.62.86.70,UNKNOWN
+79.8.115.245,UNKNOWN
+80.108.1.149,Vienna,09,AT,48.2000,16.3667
+80.108.2.141,Vienna,09,AT,48.2000,16.3667
+80.108.43.194,Vienna,09,AT,48.2000,16.3667
+80.109.167.200,Innsbruck,07,AT,47.2667,11.4000
+80.121.57.247,Vienna,09,AT,48.2000,16.3667
+80.126.165.90,Amsterdam,07,NL,52.3500,4.9167
+80.133.110.241,Velbert,07,DE,51.3333,7.0500
+80.133.73.189,Ratingen,07,DE,51.3000,6.8500
+80.138.92.218,Frankfurt Am Main,05,DE,50.1167,8.6833
+80.142.69.172,Frankfurt,05,DE,50.1167,8.6833
+80.144.142.246,Scharrhof,08,DE,49.3500,7.5500
+80.145.203.217,Oldenburg,06,DE,53.1667,8.2000
+80.163.43.123,Odense,04,DK,55.4000,10.3833
+80.165.226.202,Aalborg,07,DK,57.0500,9.9333
+80.168.224.11,London,P5,GB,51.5000,-0.1167
+80.170.61.176,Tartaras,B9,FR,45.5500,4.6667
+80.171.114.66,Hamburg,04,DE,53.5500,10.0000
+80.171.14.143,Ohlsdorf,04,DE,53.6167,10.0333
+80.171.61.82,Graft,04,DE,53.5167,9.8833
+80.171.7.110,Graft,04,DE,53.5167,9.8833
+80.176.148.26,London,P5,GB,51.5000,-0.1167
+80.190.230.120,,,DE,51.0000,9.0000
+80.190.241.118,,,DE,51.0000,9.0000
+80.190.243.158,,,DE,51.0000,9.0000
+80.190.250.108,,,DE,51.0000,9.0000
+80.202.55.146,Oslo,12,NO,59.9167,10.7500
+80.203.248.68,Bergen,07,NO,60.3911,5.3247
+80.203.49.81,Stavanger,14,NO,58.9667,5.7500
+80.212.84.117,Ytre Okslia,09,NO,67.1500,14.3333
+80.219.249.40,Z�rich,25,CH,47.3667,8.5500
+80.219.250.158,K�sern,08,CH,47.0000,8.9333
+80.219.35.224,Z�rich,25,CH,47.3667,8.5500
+80.221.63.227,Gamlas,13,FI,60.2394,24.8878
+80.222.209.62,Helsinki,13,FI,60.1756,24.9342
+80.222.65.173,Helsinki,13,FI,60.1756,24.9342
+80.223.106.128,Kuopio,14,FI,62.9000,27.6833
+80.229.7.209,,,GB,54.0000,-2.0000
+80.237.156.59,Koeln,07,DE,50.9333,6.9500
+80.237.173.67,Koeln,07,DE,50.9333,6.9500
+80.237.200.9,Koeln,07,DE,50.9333,6.9500
+80.242.195.68,Frenkendorf,01,CH,47.5000,7.7167
+80.248.248.184,Espoo,13,FI,60.2167,24.6667
+80.248.254.68,Espoo,13,FI,60.2167,24.6667
+80.25.128.222,Madrid,29,ES,40.4000,-3.6833
+80.251.122.132,Moscow,48,RU,55.7522,37.6156
+80.252.209.6,G�teborg,28,SE,57.7167,11.9667
+80.48.203.67,Terespol,53,PL,52.0833,16.3000
+80.56.237.114,The Hague,11,NL,52.0833,4.3000
+80.68.125.111,V�gen,22,SE,59.5167,14.3000
+80.68.85.45,York,Q5,GB,53.9667,-1.0833
+80.86.174.49,Wuppertal,07,DE,51.2667,7.1833
+80.9.141.219,Orl�ans,A3,FR,47.9167,1.9000
+80.92.122.238,Hall,06,AT,47.6000,14.4500
+81.0.225.29,Prague,52,CZ,50.0833,14.4667
+81.0.246.9,Prague,52,CZ,50.0833,14.4667
+81.10.180.172,Linz,04,AT,48.3000,14.3000
+81.106.199.165,Alfreton,D3,GB,53.1000,-1.3833
+81.110.78.139,Leatherhead,B8,GB,51.2833,-0.3167
+81.155.111.72,Welling,A6,GB,51.4500,0.1000
+81.169.133.125,Berlin,16,DE,52.5167,13.4000
+81.169.136.161,Berlin,16,DE,52.5167,13.4000
+81.169.137.115,Berlin,16,DE,52.5167,13.4000
+81.169.137.209,Berlin,16,DE,52.5167,13.4000
+81.169.155.246,Berlin,16,DE,52.5167,13.4000
+81.169.156.213,Berlin,16,DE,52.5167,13.4000
+81.169.156.7,Berlin,16,DE,52.5167,13.4000
+81.169.157.6,Berlin,16,DE,52.5167,13.4000
+81.169.158.102,Berlin,16,DE,52.5167,13.4000
+81.169.168.142,Berlin,16,DE,52.5167,13.4000
+81.169.168.22,Berlin,16,DE,52.5167,13.4000
+81.169.168.60,Berlin,16,DE,52.5167,13.4000
+81.169.171.90,Berlin,16,DE,52.5167,13.4000
+81.169.173.120,Berlin,16,DE,52.5167,13.4000
+81.169.173.134,Berlin,16,DE,52.5167,13.4000
+81.169.174.124,Berlin,16,DE,52.5167,13.4000
+81.169.183.122,Berlin,16,DE,52.5167,13.4000
+81.169.183.77,Berlin,16,DE,52.5167,13.4000
+81.169.186.185,Berlin,16,DE,52.5167,13.4000
+81.169.186.252,Berlin,16,DE,52.5167,13.4000
+81.173.235.56,H�rth,07,DE,50.8667,6.8667
+81.190.198.94,Gdynia,31,PL,54.5000,18.5500
+81.197.100.57,Helsinki,13,FI,60.1756,24.9342
+81.208.101.62,Milano,09,IT,45.4667,9.2000
+81.216.158.19,Nora,26,SE,59.3167,18.5500
+81.219.244.211,Warszawa,67,PL,52.2500,21.0000
+81.220.85.19,Toulouse,B3,FR,43.6000,1.4333
+81.227.239.183,,,SE,62.0000,15.0000
+81.227.86.210,,,SE,62.0000,15.0000
+81.233.3.224,,,SE,62.0000,15.0000
+81.42.148.113,Aracena,51,ES,37.8833,-6.5500
+81.56.235.34,Pont Du Loup,B8,FR,43.7167,7.0000
+81.56.238.202,Paris,A8,FR,48.8667,2.3333
+81.56.76.118,Arcueil,A8,FR,48.8000,2.3333
+81.57.208.135,Gonesse,A8,FR,48.9833,2.4500
+81.57.229.242,Paris,A8,FR,48.8667,2.3333
+81.57.40.124,Paris,A8,FR,48.8667,2.3333
+81.65.70.116,Paris,A8,FR,48.8667,2.3333
+81.71.21.172,Heemskerk,07,NL,52.5167,4.6667
+81.88.14.199,Muggebo,16,SE,58.1500,15.6333
+81.96.187.26,Horley,A7,GB,52.0833,-1.3833
+82.10.187.218,Compton Abbas,D6,GB,50.7333,-2.6167
+82.101.219.246,Amsterdam,07,NL,52.3500,4.9167
+82.103.132.227,,,DK,56.0000,10.0000
+82.103.133.88,,,DK,56.0000,10.0000
+82.118.210.65,,,FI,64.0000,26.0000
+82.126.116.24,�ragny,A8,FR,49.0167,2.1000
+82.128.190.114,Oulu,08,FI,65.0167,25.4667
+82.135.4.187,Munich,02,DE,48.1500,11.5833
+82.135.5.220,Munich,02,DE,48.1500,11.5833
+82.135.71.193,Munich,02,DE,48.1500,11.5833
+82.146.73.51,Ofte,19,NO,58.1833,6.8000
+82.149.72.85,Heroldsberg,02,DE,49.5339,11.1556
+82.150.138.109,Groningen,04,NL,53.2167,6.5500
+82.165.144.169,,OH,US,40.3914,-82.7526
+82.165.180.112,,OH,US,40.3914,-82.7526
+82.165.184.7,,OH,US,40.3914,-82.7526
+82.171.69.175,Rijswijk,11,NL,52.0167,4.3333
+82.172.14.79,Rijnsburg,11,NL,52.1833,4.4500
+82.173.189.74,Rotterdam,11,NL,51.9167,4.5000
+82.182.109.115,M�lnlycke,28,SE,57.6500,12.1333
+82.182.15.84,S�dert�lje,26,SE,59.2000,17.6167
+82.182.59.155,Nacka,24,SE,62.4739,17.4161
+82.19.248.115,Bournemouth,B2,GB,50.7167,-1.8833
+82.199.205.254,Sofia,42,BG,42.6833,23.3167
+82.207.1.72,Kiev,13,UA,50.4333,30.5167
+82.208.160.36,Braila,08,RO,45.2667,27.9832
+82.21.60.203,London,H1,GB,51.5000,-0.1167
+82.210.142.40,Warsaw,67,PL,52.2500,21.0000
+82.214.2.226,G�teborg,28,SE,57.7167,11.9667
+82.216.67.187,Paris,A8,FR,48.8667,2.3333
+82.225.144.232,Paris,A8,FR,48.8667,2.3333
+82.225.192.198,Maisons-Alfort,A8,FR,48.8000,2.4333
+82.226.84.53,Rosny,A7,FR,49.0000,1.6333
+82.227.101.236,Montpellier,A9,FR,43.6000,3.8833
+82.227.12.18,Taverny,A8,FR,49.0333,2.2167
+82.228.101.7,Lyon,B9,FR,45.7500,4.8500
+82.228.20.246,Paris,A8,FR,48.8667,2.3333
+82.228.218.46,Saint-Mand�,A8,FR,48.8333,2.4167
+82.228.252.20,�ragny,A8,FR,49.0167,2.1000
+82.229.84.252,Beauvais,B6,FR,49.4333,2.0833
+82.231.111.160,Pont Du Loup,B8,FR,43.7167,7.0000
+82.231.59.44,Saint-Mand�,A8,FR,48.8333,2.4167
+82.231.61.186,Paris,A8,FR,48.8667,2.3333
+82.233.236.81,Entremont,B9,FR,45.4333,5.8833
+82.234.204.192,Beauvais,B6,FR,49.4333,2.0833
+82.236.48.236,Lille,B4,FR,50.6333,3.0667
+82.237.210.200,Bezons,A8,FR,48.9333,2.2167
+82.238.198.196,Gonfaron,B8,FR,43.3167,6.2833
+82.240.206.88,Rennes,A2,FR,48.0833,-1.6833
+82.240.214.49,Rennes,A2,FR,48.0833,-1.6833
+82.240.72.48,Orl�ans,A3,FR,47.9167,1.9000
+82.241.115.49,Saverne,C1,FR,48.7333,7.3667
+82.241.93.120,Paris,A8,FR,48.8667,2.3333
+82.244.46.148,Dijon,A1,FR,47.3167,5.0167
+82.245.214.104,Paris,A8,FR,48.8667,2.3333
+82.247.153.205,Paris,A8,FR,48.8667,2.3333
+82.247.33.105,Paris,A8,FR,48.8667,2.3333
+82.247.82.223,Paris,A8,FR,48.8667,2.3333
+82.249.121.65,Paris,A8,FR,48.8667,2.3333
+82.249.254.123,Vougeot,A1,FR,47.1667,4.9667
+82.250.164.196,Marly-sur-Seille,B2,FR,49.0667,6.1500
+82.250.84.177,Nantes,B5,FR,47.2167,-1.5500
+82.252.136.30,Ivry-sur-Seine,A8,FR,48.8167,2.3833
+82.253.227.151,Orgeval,B6,FR,49.5167,3.7000
+82.32.73.70,Wormleighton,P3,GB,52.1833,-1.3500
+82.33.45.32,,,GB,54.0000,-2.0000
+82.43.196.208,,,GB,54.0000,-2.0000
+82.43.96.136,Stevenage,I9,GB,51.9167,-0.2167
+82.49.95.122,Roma,07,IT,41.9000,12.4832
+82.53.86.11,Roma,07,IT,41.9000,12.4832
+82.54.207.221,Roma,07,IT,41.9000,12.4832
+82.59.80.75,Roma,07,IT,41.9000,12.4832
+82.6.104.255,,,GB,54.0000,-2.0000
+82.66.92.71,Tartaras,B9,FR,45.5500,4.6667
+82.76.242.25,Bucharest,10,RO,44.4333,26.1000
+82.77.101.170,Budapest,05,HU,47.5000,19.0833
+82.82.116.207,M�nchengladbach,07,DE,51.2000,6.4333
+82.82.64.226,Eschborn,05,DE,50.1333,8.5500
+82.83.224.96,Eschborn,05,DE,50.1333,8.5500
+82.84.168.60,Cagliari,14,IT,39.2167,9.1167
+82.92.197.115,Amsterdam,07,NL,52.3500,4.9167
+82.93.130.253,Rotterdam,11,NL,51.9167,4.5000
+82.93.181.15,Amsterdam,07,NL,52.3500,4.9167
+82.94.251.206,Amsterdam,07,NL,52.3500,4.9167
+82.95.236.50,Amsterdam,07,NL,52.3500,4.9167
+82.95.239.45,Amsterdam,07,NL,52.3500,4.9167
+82.99.212.175,Iran,03,IR,32.0922,51.0289
+83.113.188.31,Toulon,B8,FR,43.1167,5.9333
+83.125.32.209,Bocholt,07,DE,51.8333,6.6000
+83.125.33.127,Bocholt,07,DE,51.8333,6.6000
+83.125.40.111,,,EU,47.0000,8.0000
+83.133.125.189,Hausham,02,DE,47.7500,11.8500
+83.134.139.16,Leuven,12,BE,50.8833,4.7000
+83.135.213.119,Stuttgart,01,DE,48.7667,9.1833
+83.135.70.0,Bochum,07,DE,51.4833,7.2167
+83.140.180.23,Stockholm,26,SE,59.3333,18.0500
+83.142.221.25,Bedzin,35,PL,50.3333,19.1500
+83.148.114.19,,,BG,43.0000,25.0000
+83.149.231.208,Moscow,48,RU,55.7522,37.6156
+83.151.29.12,,,DE,51.0000,9.0000
+83.16.228.227,Bobolice,29,PL,50.6167,19.5000
+83.160.194.169,Rotterdam,11,NL,51.9167,4.5000
+83.168.118.109,Szczecin,87,PL,53.4167,14.5833
+83.171.147.18,Bochum,07,DE,51.4833,7.2167
+83.171.159.38,,,DE,51.0000,9.0000
+83.171.159.7,,,DE,51.0000,9.0000
+83.171.168.84,,,DE,51.0000,9.0000
+83.171.188.2,,,DE,51.0000,9.0000
+83.184.253.120,,,IT,42.8333,12.8333
+83.196.36.244,Nancy,B2,FR,48.6833,6.2000
+83.212.51.46,P�tra,38,GR,38.2444,21.7344
+83.216.204.134,Vienna,09,AT,48.2000,16.3667
+83.218.175.99,Imst,07,AT,47.2333,10.7332
+83.219.212.101,Malm�,27,SE,55.6000,13.0000
+83.228.112.250,Sofia,42,BG,42.6833,23.3167
+83.228.184.208,Pully,23,CH,46.5167,6.6500
+83.233.144.246,,,SE,62.0000,15.0000
+83.237.229.23,Moscow,48,RU,55.7522,37.6156
+83.24.130.47,Warsaw,67,PL,52.2500,21.0000
+83.240.24.205,Brno,78,CZ,49.2000,16.6333
+83.245.236.91,,,FI,64.0000,26.0000
+83.246.118.110,Hann�ver,06,DE,53.1833,8.5167
+83.246.64.164,Hann�ver,06,DE,53.1833,8.5167
+83.246.72.228,Hann�ver,06,DE,53.1833,8.5167
+83.246.94.31,Hann�ver,06,DE,53.1833,8.5167
+83.248.101.153,Stockholm,26,SE,59.3333,18.0500
+83.249.227.10,Stockholm,26,SE,59.3333,18.0500
+83.255.196.44,Strand,10,SE,60.4833,15.7332
+83.26.59.203,Lodz,53,PL,52.2667,16.7500
+83.28.38.19,Lublin,75,PL,51.2500,22.5667
+83.50.54.95,Madrid,29,ES,40.4000,-3.6833
+83.6.87.11,Warszawa,67,PL,52.2500,21.0000
+83.64.118.186,Wien,09,AT,48.2000,16.3667
+83.64.208.20,Lofer,05,AT,47.5833,12.6833
+83.67.143.62,Stoke Mandeville,B9,GB,51.7833,-0.7833
+83.70.200.103,Dublin,07,IE,53.3331,-6.2489
+84.100.139.126,Toulouse,B3,FR,43.6000,1.4333
+84.101.249.95,Arbis,97,FR,44.6667,-0.2500
+84.107.147.141,Utrecht,09,NL,52.0833,5.1333
+84.107.167.247,Utrecht,09,NL,52.0833,5.1333
+84.113.155.16,,,SE,62.0000,15.0000
+84.129.249.28,Bochum,07,DE,51.4833,7.2167
+84.131.137.54,Wennigsen,06,DE,52.2667,9.5833
+84.132.186.111,Berlin,16,DE,52.5167,13.4000
+84.134.82.179,Essen,07,DE,51.4500,7.0167
+84.141.101.17,Kiel,10,DE,54.3333,10.1333
+84.141.173.148,Hamburg,04,DE,53.5500,10.0000
+84.143.141.36,N�rnberg,02,DE,49.4478,11.0683
+84.144.161.8,,,DE,51.0000,9.0000
+84.145.110.29,Cologne,07,DE,50.9333,6.9500
+84.147.190.29,,,DE,51.0000,9.0000
+84.147.202.193,Hamburg,04,DE,53.5500,10.0000
+84.149.204.235,Gr�nwald,02,DE,48.0500,11.5167
+84.150.91.237,Wennigsen,06,DE,52.2667,9.5833
+84.154.194.232,Dorndorf,15,DE,50.7833,11.4500
+84.157.132.218,Waiblingen,01,DE,48.8333,9.3000
+84.159.118.16,M�nchengladbach,07,DE,51.2000,6.4333
+84.16.226.24,Frankfurt,05,DE,50.1167,8.6833
+84.16.229.137,Frankfurt,05,DE,50.1167,8.6833
+84.16.233.47,Frankfurt,05,DE,50.1167,8.6833
+84.16.234.128,Frankfurt,05,DE,50.1167,8.6833
+84.16.234.49,Frankfurt,05,DE,50.1167,8.6833
+84.16.236.173,Frankfurt,05,DE,50.1167,8.6833
+84.16.238.147,Frankfurt,05,DE,50.1167,8.6833
+84.16.238.86,Frankfurt,05,DE,50.1167,8.6833
+84.16.245.68,Frankfurt,05,DE,50.1167,8.6833
+84.16.249.198,Frankfurt,05,DE,50.1167,8.6833
+84.161.131.227,Waiblingen,01,DE,48.8333,9.3000
+84.162.97.22,,,DE,51.0000,9.0000
+84.165.73.75,Hamburg,04,DE,53.5500,10.0000
+84.167.119.66,Bochum,07,DE,51.4833,7.2167
+84.169.109.172,Eltville,05,DE,50.0333,8.1167
+84.177.24.240,Ginsheim-Gustavsburg,05,DE,49.9858,8.3425
+84.179.252.221,Dresden,13,DE,51.0500,13.7500
+84.180.48.190,,,DE,51.0000,9.0000
+84.181.66.18,,,DE,51.0000,9.0000
+84.184.143.17,Bochum,07,DE,51.4833,7.2167
+84.19.177.90,Erfurt,15,DE,50.9833,11.0333
+84.19.181.66,Erfurt,15,DE,50.9833,11.0333
+84.19.182.23,Erfurt,15,DE,50.9833,11.0333
+84.191.96.139,Berlin,16,DE,52.5167,13.4000
+84.220.115.17,Sabbioncello,20,IT,45.3667,11.9832
+84.221.196.201,Cagliari,14,IT,39.2167,9.1167
+84.221.197.117,Cagliari,14,IT,39.2167,9.1167
+84.244.189.19,Rotterdam,11,NL,51.9167,4.5000
+84.26.115.1,Nijmegen,03,NL,51.8333,5.8667
+84.38.64.155,,,DE,51.0000,9.0000
+84.40.199.218,Wroclaw,72,PL,51.1000,17.0333
+84.40.207.70,Wroclaw,72,PL,51.1000,17.0333
+84.41.177.144,Almere,16,NL,52.3667,5.1500
+84.44.211.166,H�rth,07,DE,50.8667,6.8667
+84.46.0.7,Norderstedt,10,DE,53.7000,10.0167
+84.51.135.171,Sheffield,L9,GB,53.3667,-1.5000
+84.56.26.190,Munich,02,DE,48.1500,11.5833
+84.57.236.39,Eschborn,05,DE,50.1333,8.5500
+84.57.98.213,Kabel,07,DE,51.4000,7.4832
+84.58.130.207,Bingen Am Rhein,08,DE,49.9667,7.9000
+84.58.140.71,Ginsheim-Gustavsburg,05,DE,49.9858,8.3425
+84.58.164.137,Mainz,08,DE,50.0000,8.2711
+84.58.222.75,Eschborn,05,DE,50.1333,8.5500
+84.59.97.158,Eschborn,05,DE,50.1333,8.5500
+84.60.24.26,Leithe,07,DE,51.4667,7.1167
+84.62.171.29,Eschborn,05,DE,50.1333,8.5500
+84.62.8.212,D�sseldorf,07,DE,51.2167,6.7667
+84.73.173.24,H�nenberg,24,CH,47.1667,8.4167
+84.73.183.152,Pully,23,CH,46.5167,6.6500
+84.73.20.236,Effretikon,25,CH,47.4333,8.6833
+84.75.209.86,Z�rich,25,CH,47.3667,8.5500
+84.75.246.166,Z�rich,25,CH,47.3667,8.5500
+84.75.65.248,Z�rich,25,CH,47.3667,8.5500
+84.85.160.44,Amersfoort,09,NL,52.1500,5.3833
+85.10.192.137,Gunzenhausen,02,DE,49.1000,10.7500
+85.10.198.236,Gunzenhausen,02,DE,49.1000,10.7500
+85.10.200.47,Gunzenhausen,02,DE,49.1000,10.7500
+85.10.225.4,Gunzenhausen,02,DE,49.1000,10.7500
+85.10.240.250,Gunzenhausen,02,DE,49.1000,10.7500
+85.114.128.112,,,DE,51.0000,9.0000
+85.114.130.50,,,DE,51.0000,9.0000
+85.115.168.138,Yekaterinburg,71,RU,56.8500,60.6000
+85.119.156.72,Warendorf,07,DE,51.9500,7.9832
+85.119.158.191,Homburg,09,DE,49.3167,7.3333
+85.124.36.94,Vienna,09,AT,48.2000,16.3667
+85.132.24.109,Baku,09,AZ,40.3953,49.8822
+85.14.217.51,Coburg,02,DE,50.2500,10.9667
+85.140.205.79,Moscow,48,RU,55.7522,37.6156
+85.141.66.217,Moscow,48,RU,55.7522,37.6156
+85.145.184.81,Amsterdam,07,NL,52.3500,4.9167
+85.176.134.208,Seevetal,06,DE,53.4000,9.9667
+85.176.203.186,Hamburg,04,DE,53.5500,10.0000
+85.176.231.187,Hamburg,04,DE,53.5500,10.0000
+85.176.65.16,Hamburg,04,DE,53.5500,10.0000
+85.176.92.8,Hamburg,04,DE,53.5500,10.0000
+85.177.166.213,Hamburg,04,DE,53.5500,10.0000
+85.177.2.161,Hamburg,04,DE,53.5500,10.0000
+85.177.225.113,Hamburg,04,DE,53.5500,10.0000
+85.178.106.73,Berlin,16,DE,52.5167,13.4000
+85.178.66.63,Berlin,16,DE,52.5167,13.4000
+85.178.89.24,Berlin,16,DE,52.5167,13.4000
+85.179.125.64,Hamburg,04,DE,53.5500,10.0000
+85.179.8.203,Hamburg,04,DE,53.5500,10.0000
+85.18.107.240,Padova,20,IT,45.4167,11.8833
+85.180.68.132,Hamburg,04,DE,53.5500,10.0000
+85.180.73.26,Hamburg,04,DE,53.5500,10.0000
+85.181.95.158,Mainz,08,DE,50.0000,8.2711
+85.186.13.252,Marius,32,RO,47.6667,23.1833
+85.187.152.189,Sofia,42,BG,42.6833,23.3167
+85.187.158.179,Sofia,42,BG,42.6833,23.3167
+85.193.8.34,Klasterec Nad Ohri,89,CZ,50.3833,13.1500
+85.2.179.80,Z�rich,25,CH,47.3667,8.5500
+85.204.85.4,Giurgiu,42,RO,43.8833,25.9667
+85.21.246.152,Saint Petersburg,66,RU,59.8944,30.2642
+85.211.71.137,Oxford,K2,GB,51.7500,-1.2500
+85.214.17.144,Berlin,16,DE,52.5167,13.4000
+85.214.18.16,Berlin,16,DE,52.5167,13.4000
+85.214.24.183,Berlin,16,DE,52.5167,13.4000
+85.214.26.150,Berlin,16,DE,52.5167,13.4000
+85.214.29.10,Berlin,16,DE,52.5167,13.4000
+85.214.29.33,Berlin,16,DE,52.5167,13.4000
+85.214.29.61,Berlin,16,DE,52.5167,13.4000
+85.214.36.108,Berlin,16,DE,52.5167,13.4000
+85.214.38.21,Berlin,16,DE,52.5167,13.4000
+85.214.41.167,Berlin,16,DE,52.5167,13.4000
+85.214.50.115,Berlin,16,DE,52.5167,13.4000
+85.214.54.254,Berlin,16,DE,52.5167,13.4000
+85.214.57.226,Berlin,16,DE,52.5167,13.4000
+85.214.63.253,Berlin,16,DE,52.5167,13.4000
+85.214.66.10,Berlin,16,DE,52.5167,13.4000
+85.214.66.61,Berlin,16,DE,52.5167,13.4000
+85.214.68.105,Berlin,16,DE,52.5167,13.4000
+85.214.68.148,Berlin,16,DE,52.5167,13.4000
+85.214.68.60,Berlin,16,DE,52.5167,13.4000
+85.214.69.239,Berlin,16,DE,52.5167,13.4000
+85.214.72.37,Berlin,16,DE,52.5167,13.4000
+85.214.78.217,Berlin,16,DE,52.5167,13.4000
+85.214.83.203,Berlin,16,DE,52.5167,13.4000
+85.214.85.116,Berlin,16,DE,52.5167,13.4000
+85.214.90.235,Berlin,16,DE,52.5167,13.4000
+85.214.91.152,Berlin,16,DE,52.5167,13.4000
+85.214.91.190,Berlin,16,DE,52.5167,13.4000
+85.214.94.149,Berlin,16,DE,52.5167,13.4000
+85.214.95.137,Berlin,16,DE,52.5167,13.4000
+85.214.95.75,Berlin,16,DE,52.5167,13.4000
+85.216.31.195,Baden,01,DE,48.7500,8.2500
+85.225.13.0,Stockholm,26,SE,59.3333,18.0500
+85.225.171.211,,,SE,62.0000,15.0000
+85.227.202.122,,,SE,62.0000,15.0000
+85.228.189.100,,,SE,62.0000,15.0000
+85.228.74.108,Tumba,26,SE,59.2000,17.8167
+85.233.44.120,Seevetal,06,DE,53.4000,9.9667
+85.234.130.43,London,P5,GB,51.5000,-0.1167
+85.234.136.20,,,GB,54.0000,-2.0000
+85.234.144.236,,,GB,54.0000,-2.0000
+85.243.25.32,Lisboa,14,PT,38.7167,-9.1333
+85.25.130.195,,,DE,51.0000,9.0000
+85.25.132.119,,,DE,51.0000,9.0000
+85.25.136.235,,,DE,51.0000,9.0000
+85.25.138.205,,,DE,51.0000,9.0000
+85.25.138.220,,,DE,51.0000,9.0000
+85.25.141.60,,,DE,51.0000,9.0000
+85.25.144.94,,,DE,51.0000,9.0000
+85.25.146.77,,,DE,51.0000,9.0000
+85.25.148.13,,,DE,51.0000,9.0000
+85.25.20.175,,,DE,51.0000,9.0000
+85.25.253.104,,,DE,51.0000,9.0000
+85.25.5.64,,,DE,51.0000,9.0000
+85.25.61.5,,,DE,51.0000,9.0000
+85.25.62.36,,,DE,51.0000,9.0000
+85.31.187.203,Jena,15,DE,50.9333,11.5833
+85.31.187.84,Jena,15,DE,50.9333,11.5833
+85.75.197.113,S�na,42,GR,36.8000,22.5000
+85.8.136.101,Castletown,V3,GB,58.5833,-3.3833
+85.84.33.31,Derio,59,ES,43.3000,-2.8667
+85.88.6.170,Oberhausen,07,DE,51.4667,6.8500
+85.89.179.43,Lodz,53,PL,52.2667,16.7500
+85.93.3.104,Oldenburg,06,DE,53.1667,8.2000
+86.106.254.231,Chisinau,48,MD,47.0056,28.8575
+86.130.3.94,Warrington,P2,GB,53.3833,-2.6000
+86.136.203.159,Leatherhead,B8,GB,51.2833,-0.3167
+86.15.239.219,,,GB,54.0000,-2.0000
+86.211.3.235,Nice,B8,FR,43.7000,7.2500
+86.217.194.216,Bordeaux,97,FR,44.8333,-0.5667
+86.33.232.99,,,AT,47.3333,13.3333
+86.42.177.73,Dublin,07,IE,53.3331,-6.2489
+86.49.49.126,Ceska,78,CZ,49.2833,16.5667
+86.56.100.79,Hann�ver,06,DE,53.1833,8.5167
+86.56.106.45,Hann�ver,06,DE,53.1833,8.5167
+86.59.21.38,Klosterneuburg,03,AT,48.3000,16.3167
+86.63.150.82,Lublin,75,PL,51.2500,22.5667
+86.63.201.9,Ceska Lipa,83,CZ,50.6833,14.5500
+86.71.5.81,Billancourt,B6,FR,49.7167,2.8833
+86.76.72.109,Billancourt,B6,FR,49.7167,2.8833
+86.88.140.156,Amersfoort,09,NL,52.1500,5.3833
+87.102.80.216,Kingston,N1,GB,52.8500,-1.9000
+87.105.192.100,Wroclaw,72,PL,51.1000,17.0333
+87.105.217.149,Wroclaw,72,PL,51.1000,17.0333
+87.106.27.17,Karlsruhe,01,DE,49.0047,8.3858
+87.106.34.45,Karlsruhe,01,DE,49.0047,8.3858
+87.106.4.7,Karlsruhe,01,DE,49.0047,8.3858
+87.106.77.37,Karlsruhe,01,DE,49.0047,8.3858
+87.106.79.175,Karlsruhe,01,DE,49.0047,8.3858
+87.106.9.89,Karlsruhe,01,DE,49.0047,8.3858
+87.108.34.217,,,FI,64.0000,26.0000
+87.118.100.187,Erfurt,15,DE,50.9833,11.0333
+87.118.110.163,Erfurt,15,DE,50.9833,11.0333
+87.118.218.16,Moscow,48,RU,55.7522,37.6156
+87.119.206.222,Steele,07,DE,51.4500,7.0833
+87.120.199.10,Sofia,42,BG,42.6833,23.3167
+87.122.5.21,Barmstedt,10,DE,53.7833,9.7667
+87.13.64.22,Roma,07,IT,41.9000,12.4832
+87.14.163.210,Roma,07,IT,41.9000,12.4832
+87.14.234.199,Roma,07,IT,41.9000,12.4832
+87.15.57.22,Roma,07,IT,41.9000,12.4832
+87.155.94.40,,,DE,51.0000,9.0000
+87.156.110.134,,,DE,51.0000,9.0000
+87.16.123.60,Roma,07,IT,41.9000,12.4832
+87.16.197.236,Roma,07,IT,41.9000,12.4832
+87.160.200.213,,,DE,51.0000,9.0000
+87.163.69.44,,,DE,51.0000,9.0000
+87.166.34.26,,,DE,51.0000,9.0000
+87.17.202.27,Roma,07,IT,41.9000,12.4832
+87.175.217.142,,,DE,51.0000,9.0000
+87.175.217.29,,,DE,51.0000,9.0000
+87.175.79.128,,,DE,51.0000,9.0000
+87.178.82.122,,,DE,51.0000,9.0000
+87.178.99.145,,,DE,51.0000,9.0000
+87.18.202.253,Roma,07,IT,41.9000,12.4832
+87.187.74.112,,,DE,51.0000,9.0000
+87.194.115.69,London,P5,GB,51.5000,-0.1167
+87.194.61.194,London,P5,GB,51.5000,-0.1167
+87.194.73.253,London,P5,GB,51.5000,-0.1167
+87.20.130.66,Roma,07,IT,41.9000,12.4832
+87.20.99.54,Roma,07,IT,41.9000,12.4832
+87.204.26.205,Warszawa,67,PL,52.2500,21.0000
+87.206.231.78,Krak�w,77,PL,50.0833,19.9167
+87.207.156.48,Opole,79,PL,50.6667,17.9500
+87.226.14.228,Riga,25,LV,56.9500,24.1000
+87.230.11.166,Koeln,07,DE,50.9333,6.9500
+87.230.17.81,H�st,07,DE,51.6500,6.1833
+87.230.18.148,H�st,07,DE,51.6500,6.1833
+87.230.18.23,H�st,07,DE,51.6500,6.1833
+87.230.20.231,H�st,07,DE,51.6500,6.1833
+87.234.125.8,Koeln,07,DE,50.9333,6.9500
+87.236.198.84,Praha,52,CZ,50.0833,14.4667
+87.240.62.234,Moscow,48,RU,55.7522,37.6156
+87.249.206.11,Wroclaw,72,PL,51.1000,17.0333
+87.4.248.219,Strada,05,IT,44.3000,11.0333
+87.68.206.112,,,IL,31.5000,34.7500
+87.79.236.163,Koeln,07,DE,50.9333,6.9500
+87.94.90.182,Tampere,15,FI,61.5000,23.7500
+87.99.27.160,Wroclaw,72,PL,51.1000,17.0333
+88.110.132.129,Warrington,P2,GB,53.3833,-2.6000
+88.110.25.128,Harbury,P3,GB,52.2333,-1.4500
+88.114.237.166,,,FI,64.0000,26.0000
+88.114.54.58,,,FI,64.0000,26.0000
+88.115.84.144,,,FI,64.0000,26.0000
+88.118.241.93,Vilnius,65,LT,54.6833,25.3167
+88.136.100.160,Paris,A8,FR,48.8667,2.3333
+88.137.127.226,Paris,A8,FR,48.8667,2.3333
+88.149.235.41,Settimo,12,IT,45.1500,7.7667
+88.154.39.10,,,IL,31.5000,34.7500
+88.157.70.125,Porto,17,PT,41.1500,-8.6167
+88.157.84.247,Porto,17,PT,41.1500,-8.6167
+88.160.179.6,Paris,A8,FR,48.8667,2.3333
+88.161.54.214,Paris,A8,FR,48.8667,2.3333
+88.162.149.207,Paris,A8,FR,48.8667,2.3333
+88.167.176.33,Paris,A8,FR,48.8667,2.3333
+88.168.152.11,Paris,A8,FR,48.8667,2.3333
+88.168.4.99,Paris,A8,FR,48.8667,2.3333
+88.191.13.5,Paris,A8,FR,48.8667,2.3333
+88.191.13.68,Paris,A8,FR,48.8667,2.3333
+88.191.14.223,Paris,A8,FR,48.8667,2.3333
+88.191.16.100,Paris,A8,FR,48.8667,2.3333
+88.191.19.192,Paris,A8,FR,48.8667,2.3333
+88.191.19.68,Paris,A8,FR,48.8667,2.3333
+88.191.23.111,Paris,A8,FR,48.8667,2.3333
+88.191.24.77,Paris,A8,FR,48.8667,2.3333
+88.191.26.157,Paris,A8,FR,48.8667,2.3333
+88.191.28.23,Paris,A8,FR,48.8667,2.3333
+88.191.33.169,Paris,A8,FR,48.8667,2.3333
+88.191.36.249,Paris,A8,FR,48.8667,2.3333
+88.191.37.194,Paris,A8,FR,48.8667,2.3333
+88.191.38.143,Paris,A8,FR,48.8667,2.3333
+88.191.51.214,Paris,A8,FR,48.8667,2.3333
+88.195.69.49,,,FI,64.0000,26.0000
+88.195.73.62,,,FI,64.0000,26.0000
+88.198.107.93,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.109.123,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.11.5,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.127.245,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.14.249,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.160.123,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.164.126,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.169.99,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.175.78,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.178.190,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.180.62,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.192.154,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.201.230,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.206.70,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.25.20,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.252.126,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.37.146,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.43.207,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.45.235,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.47.72,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.59.34,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.67.4,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.9.235,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.90.110,Gunzenhausen,02,DE,49.1000,10.7500
+88.198.95.67,Gunzenhausen,02,DE,49.1000,10.7500
+88.208.203.85,Gloucester,E6,GB,51.8333,-2.2500
+88.211.140.199,Almere,16,NL,52.3667,5.1500
+88.215.115.130,Muenchen,02,DE,48.1500,11.5833
+88.217.34.25,Muenchen,02,DE,48.1500,11.5833
+88.217.35.62,Muenchen,02,DE,48.1500,11.5833
+88.42.221.180,Montecchio Maggiore,20,IT,45.5000,11.4000
+88.64.136.102,Eschborn,05,DE,50.1333,8.5500
+88.65.252.3,Eschborn,05,DE,50.1333,8.5500
+88.66.27.207,Eschborn,05,DE,50.1333,8.5500
+88.70.85.176,Eschborn,05,DE,50.1333,8.5500
+88.72.194.98,Eschborn,05,DE,50.1333,8.5500
+88.72.201.38,Eschborn,05,DE,50.1333,8.5500
+88.72.206.241,Eschborn,05,DE,50.1333,8.5500
+88.73.105.85,Eschborn,05,DE,50.1333,8.5500
+88.73.119.137,Eschborn,05,DE,50.1333,8.5500
+88.73.159.16,Eschborn,05,DE,50.1333,8.5500
+88.73.41.80,Eschborn,05,DE,50.1333,8.5500
+88.73.94.62,Eschborn,05,DE,50.1333,8.5500
+88.76.176.148,Eschborn,05,DE,50.1333,8.5500
+88.76.250.147,Eschborn,05,DE,50.1333,8.5500
+88.80.12.78,,,SE,62.0000,15.0000
+88.84.142.165,Frankfurt,05,DE,50.1167,8.6833
+88.84.154.90,Frankfurt,05,DE,50.1167,8.6833
+88.84.155.37,Frankfurt,05,DE,50.1167,8.6833
+88.88.230.120,Fornebu,01,NO,59.9022,10.6292
+89.110.144.180,Montabaur,08,DE,50.4333,7.8333
+89.110.147.209,Montabaur,08,DE,50.4333,7.8333
+89.110.149.90,Montabaur,08,DE,50.4333,7.8333
+89.110.156.179,Montabaur,08,DE,50.4333,7.8333
+89.110.156.203,Montabaur,08,DE,50.4333,7.8333
+89.110.157.31,Montabaur,08,DE,50.4333,7.8333
+89.111.168.177,Moscow,48,RU,55.7522,37.6156
+89.13.55.4,Karlsruhe,01,DE,49.0047,8.3858
+89.133.16.43,Budapest,05,HU,47.5000,19.0833
+89.138.105.135,Haifa,04,IL,32.8156,34.9892
+89.14.86.115,UNKNOWN
+89.145.19.143,Schwedt,11,DE,53.0667,14.3000
+89.148.139.2,Fratte,06,IT,45.9081,12.7358
+89.149.194.143,Frankfurt,05,DE,50.1167,8.6833
+89.149.206.52,Frankfurt,05,DE,50.1167,8.6833
+89.149.207.172,Frankfurt,05,DE,50.1167,8.6833
+89.149.208.121,Frankfurt,05,DE,50.1167,8.6833
+89.149.59.75,Bucharest,10,RO,44.4333,26.1000
+89.15.41.45,UNKNOWN
+89.150.202.174,Halmstad,06,SE,56.6714,12.8556
+89.150.232.146,Halmstad,06,SE,56.6714,12.8556
+89.152.128.115,Lisboa,14,PT,38.7167,-9.1333
+89.159.17.187,,,FR,46.0000,2.0000
+89.163.145.20,Coburg,02,DE,50.2500,10.9667
+89.165.133.27,,,RO,46.0000,25.0000
+89.170.10.244,Billancourt,B6,FR,49.7167,2.8833
+89.178.0.53,Moscow,48,RU,55.7522,37.6156
+89.179.246.38,Moscow,48,RU,55.7522,37.6156
+89.190.215.162,Sofia,42,BG,42.6833,23.3167
+89.210.118.213,Athens,35,GR,37.9833,23.7332
+89.210.8.70,Athens,35,GR,37.9833,23.7332
+89.228.252.27,Kalisz,34,PL,51.7500,18.0833
+89.247.2.146,Stuttgart,01,DE,48.7667,9.1833
+89.32.28.7,Curtea De Arges,39,RO,45.1333,24.6833
+89.32.28.8,Curtea De Arges,39,RO,45.1333,24.6833
+89.32.86.122,Bucuresti,10,RO,44.4333,26.1000
+89.56.134.117,Kiel,10,DE,54.3333,10.1333
+89.57.223.231,Kiel,10,DE,54.3333,10.1333
+90.1.109.178,Lille,B4,FR,50.6333,3.0667
+90.16.151.170,Paris,A8,FR,48.8667,2.3333
+90.176.60.6,UNKNOWN
+90.199.170.50,Ripe,E2,GB,50.8500,0.1333
+90.21.154.198,Paris,A8,FR,48.8667,2.3333
+90.38.96.152,Paris,A8,FR,48.8667,2.3333
+90.41.217.11,Paris,A8,FR,48.8667,2.3333
+90.8.236.66,Paris,A8,FR,48.8667,2.3333
+91.0.92.60,,,DE,51.0000,9.0000
+91.109.121.231,,,GB,54.0000,-2.0000
+91.12.29.91,,,DE,51.0000,9.0000
+91.12.41.185,,,DE,51.0000,9.0000
+91.121.18.18,UNKNOWN
+91.121.6.52,UNKNOWN
+91.126.55.84,UNKNOWN
+91.152.87.55,UNKNOWN
+91.153.222.134,UNKNOWN
+91.165.80.65,Paris,A8,FR,48.8667,2.3333
+91.186.18.105,UNKNOWN
+91.23.234.250,,,DE,51.0000,9.0000
+91.4.63.72,,,DE,51.0000,9.0000
+91.4.82.200,,,DE,51.0000,9.0000
+91.64.139.199,Kabel,07,DE,51.4000,7.4832
+91.64.220.19,Kabel,07,DE,51.4000,7.4832
+91.7.3.81,,,DE,51.0000,9.0000
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/CMakeLists.txt
new file mode 100644
index 0000000..fa5fe67
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/CMakeLists.txt
@@ -0,0 +1,204 @@
+##
+## $Id: CMakeLists.txt 4283 2010-05-12 03:27:27Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+
+set(VIDALIA_APP_BUNDLE_ROOT ${Vidalia_BINARY_DIR}/src/vidalia/Vidalia.app)
+get_target_property(VIDALIA_EXECUTABLE Vidalia LOCATION)
+add_custom_target(dist-osx-libraries DEPENDS Vidalia)
+if (QT_USE_FRAMEWORKS)
+ vidalia_install_qt4_framework(QtCore
+ TARGET dist-osx-libraries NAME QtCore
+ LIBRARY ${QT_QTCORE_LIBRARY_RELEASE}/QtCore
+ APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
+ )
+ vidalia_install_qt4_framework(QtGui
+ TARGET dist-osx-libraries NAME QtGui
+ LIBRARY ${QT_QTGUI_LIBRARY_RELEASE}/QtGui
+ APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
+ DEPENDS_FRAMEWORKS ${QtCore}
+ )
+ vidalia_install_qt4_framework(QtNetwork
+ TARGET dist-osx-libraries NAME QtNetwork
+ LIBRARY ${QT_QTNETWORK_LIBRARY_RELEASE}/QtNetwork
+ APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
+ DEPENDS_FRAMEWORKS ${QtCore}
+ )
+ vidalia_install_qt4_framework(QtXml
+ TARGET dist-osx-libraries NAME QtXml
+ LIBRARY ${QT_QTXML_LIBRARY_RELEASE}/QtXml
+ APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
+ DEPENDS_FRAMEWORKS ${QtCore}
+ )
+ vidalia_install_name_tool(${VIDALIA_EXECUTABLE}
+ TARGET dist-osx-libraries
+ FRAMEWORKS ${QtCore} ${QtGui} ${QtNetwork} ${QtXml}
+ )
+ 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}
+ APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
+ DEPENDS_FRAMEWORKS ${QtCore} ${QtGui} ${QtNetwork} ${QtXml} ${QtSvg}
+ ${QtDBus} ${QtScript} ${QtWebKit}
+ )
+ vidalia_install_name_tool(${VIDALIA_EXECUTABLE}
+ TARGET dist-osx-libraries
+ FRAMEWORKS ${QtSvg} ${QtDBus} ${QtScript} ${QtWebKit}
+ LIBRARIES ${MARBLEWIDGET_LIBRARY}
+ )
+ endif(USE_MARBLE)
+endif(QT_USE_FRAMEWORKS)
+
+if (OSX_FAT_BINARY)
+ set(DMG_ARCH "universal")
+else(OSX_FAT_BINARY)
+ set(DMG_ARCH ${CMAKE_OSX_ARCHITECTURES})
+endif(OSX_FAT_BINARY)
+
+add_custom_target(dist-osx
+ COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/pkg-dmg
+ --source ${VIDALIA_APP_BUNDLE_ROOT}
+ --target ${Vidalia_BINARY_DIR}/vidalia-${VERSION}-${DMG_ARCH}.dmg
+ --sourcefile --volname "Vidalia ${VERSION}"
+ --icon ${Vidalia_SOURCE_DIR}/src/vidalia/res/icons/Vidalia.icns
+ --symlink "/Applications:/Drag to here"
+ --mkdir /.background
+ --copy ${CMAKE_CURRENT_SOURCE_DIR}/background.png:/.background/
+ --copy ${CMAKE_CURRENT_SOURCE_DIR}/nonbundle-ds_store:/.DS_Store
+ --copy ${CMAKE_CURRENT_SOURCE_DIR}/qt.conf:/Vidalia.app/Contents/Resources/qt.conf
+ --mkdir /Licenses
+ --copy ${Vidalia_SOURCE_DIR}/LICENSE:/Licenses/License.txt
+ --copy ${Vidalia_SOURCE_DIR}/LICENSE-GPLV2:/Licenses/License-GPLv2.txt
+ --copy ${Vidalia_SOURCE_DIR}/LICENSE-GPLV3:/Licenses/License-GPLv3.txt
+ --copy ${Vidalia_SOURCE_DIR}/LICENSE-OPENSSL:/Licenses/License-OpenSSL.txt
+ --copy ${Vidalia_SOURCE_DIR}/README:/ReadMe.txt
+ --copy ${Vidalia_SOURCE_DIR}/CHANGELOG:/Changes.txt
+ COMMENT "Creating vidalia-${VERSION}-${DMG_ARCH}.dmg"
+ VERBATIM
+)
+add_dependencies(dist-osx dist-osx-libraries)
+
+if (TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI)
+ get_filename_component(TOR_SOURCE_DIR ${TOR_SOURCE_DIR} ABSOLUTE)
+ get_filename_component(POLIPO_SOURCE_DIR ${POLIPO_SOURCE_DIR} ABSOLUTE)
+ get_filename_component(TORBUTTON_XPI ${TORBUTTON_XPI} ABSOLUTE)
+
+ ## Determine Tor's version string used to build the .dmg filename
+ vidalia_get_tor_version(TOR_VERSION "${TOR_SOURCE_DIR}/src/or/tor")
+ if (TOR_VERSION)
+ message(STATUS "Found Tor ${TOR_VERSION}")
+ else (TOR_VERSION)
+ message(FATAL_ERROR "Unable to determine version of ${TOR_SOURCE_DIR}/src/or/tor")
+ endif(TOR_VERSION)
+
+ ## Configure the Torbutton installation script file
+ get_filename_component(TORBUTTON_XPI_FILENAME ${TORBUTTON_XPI} NAME)
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/InstallTorbutton.scpt.in
+ ${CMAKE_CURRENT_BINARY_DIR}/InstallTorbutton.scpt
+ )
+
+ set(bundle_DMG "vidalia-bundle-${TOR_VERSION}-${VERSION}-${DMG_ARCH}.dmg")
+ add_custom_target(dist-osx-bundle
+ COMMAND osacompile
+ -o "${CMAKE_CURRENT_BINARY_DIR}/Install Torbutton for Firefox.app"
+ ${CMAKE_CURRENT_BINARY_DIR}/InstallTorbutton.scpt
+ COMMAND ${CMAKE_COMMAND} -E copy
+ ${TORBUTTON_XPI}
+ "${CMAKE_CURRENT_BINARY_DIR}/Install Torbutton for Firefox.app/"
+ COMMAND ${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
+ --symlink "/Applications:/Drag to here"
+ --mkdir /.background
+ --copy ${CMAKE_CURRENT_SOURCE_DIR}/bundle-background.png:/.background/
+ --copy ${CMAKE_CURRENT_SOURCE_DIR}/bundle-ds_store:/.DS_Store
+ --copy ${CMAKE_CURRENT_SOURCE_DIR}/vidalia.conf.sample:/Vidalia.app/Contents/Resources/vidalia.conf
+ --copy ${CMAKE_CURRENT_SOURCE_DIR}/qt.conf:/Vidalia.app/Contents/Resources/qt.conf
+ --mkdir /Licenses
+ --copy ${Vidalia_SOURCE_DIR}/LICENSE:/Licenses/License.txt
+ --copy ${Vidalia_SOURCE_DIR}/LICENSE-GPLV2:/Licenses/License-GPLv2.txt
+ --copy ${Vidalia_SOURCE_DIR}/LICENSE-GPLV3:/Licenses/License-GPLv3.txt
+ --copy ${Vidalia_SOURCE_DIR}/LICENSE-OPENSSL:/Licenses/License-OpenSSL.txt
+ --copy ${Vidalia_SOURCE_DIR}/CHANGELOG:/Changes.txt
+ --copy ${TOR_SOURCE_DIR}/src/or/tor:/Vidalia.app/Contents/MacOS/
+ --copy ${TOR_SOURCE_DIR}/src/tools/tor-checkkey:/Vidalia.app/Contents/MacOS/
+ --copy ${TOR_SOURCE_DIR}/src/tools/tor-gencert:/Vidalia.app/Contents/MacOS/
+ --copy ${TOR_SOURCE_DIR}/src/tools/tor-resolve:/Vidalia.app/Contents/MacOS/
+ --copy ${TOR_SOURCE_DIR}/src/config/geoip:/Vidalia.app/Contents/Resources/
+ --copy ${TOR_SOURCE_DIR}/src/config/torrc.sample:/Vidalia.app/Contents/Resources/
+ --copy ${POLIPO_SOURCE_DIR}/polipo:/Vidalia.app/Contents/MacOS/
+ --copy ${CMAKE_CURRENT_SOURCE_DIR}/polipo.conf:/Vidalia.app/Contents/Resources/
+ --copy "${CMAKE_CURRENT_BINARY_DIR}/Install Torbutton for Firefox.app:/"
+ COMMENT "Creating ${bundle_DMG}"
+ VERBATIM
+ )
+ add_dependencies(dist-osx-bundle dist-osx-libraries)
+
+ add_custom_target(dist-osx-split-bundle
+ COMMAND hdiutil segment -segmentSize 1.5m
+ -o "${Vidalia_BINARY_DIR}/split-${bundle_DMG}" "${Vidalia_BINARY_DIR}/${bundle_DMG}"
+ COMMENT "Creating split-${bundle_DMG}"
+ VERBATIM
+ )
+ add_dependencies(dist-osx-split-bundle dist-osx-bundle)
+else(TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI)
+ message("-- Skipping dist-osx-bundle build target")
+ add_custom_target(dist-osx-bundle
+ COMMAND ${CMAKE_COMMAND} -E echo
+ "!! The dist-osx-bundle target is not configured."
+ COMMAND ${CMAKE_COMMAND} -E echo
+ "!! You must set the -DTOR_SOURCE_DIR,-DPOLIPO_SOURCE_DIR and -DTORBUTTON_XPI CMake variables."
+ COMMAND ${CMAKE_COMMAND} -E echo "!! Quitting."
+ )
+ add_custom_target(dist-osx-split-bundle
+ COMMAND ${CMAKE_COMMAND} -E echo
+ "!! The dist-osx-split-bundle target is not configured. Quitting."
+ COMMAND ${CMAKE_COMMAND} -E echo
+ "!! You must set the -DTOR_SOURCE_DIR, -DPOLIPO_SOURCE_DIR and -DTORBUTTON_XPI CMake variables."
+ COMMAND ${CMAKE_COMMAND} -E echo "!! Quitting."
+ )
+endif(TOR_SOURCE_DIR AND POLIPO_SOURCE_DIR AND TORBUTTON_XPI)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/InstallTorbutton.scpt.in b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/InstallTorbutton.scpt.in
new file mode 100644
index 0000000..ffa0db8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/InstallTorbutton.scpt.in
@@ -0,0 +1,22 @@
+--
+-- $Id: InstallTorbutton.scpt.in 3930 2009-07-02 00:27:50Z edmanm $
+--
+-- This file is part of Vidalia, and is subject to the license terms in the
+-- LICENSE file, found in the top level directory of this distribution. If
+-- you did not 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.
+--
+
+try
+ set p to path to me
+ set p to POSIX path of p
+ do shell script "open -a Firefox " & quoted form of p & "@TORBUTTON_XPI_FILENAME@"
+on error errStr
+ display dialog
+ "We were unable to install Torbutton. Please make sure Firefox is installed and try again."
+ buttons {"OK"}
+end try
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/background.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/background.png
new file mode 100644
index 0000000..a3d42fa
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/background.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/build-bundle.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/build-bundle.txt
new file mode 100644
index 0000000..13d2ff3
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/build-bundle.txt
@@ -0,0 +1,100 @@
+ Building the Vidalia/Tor/Polipo OS X Bundle
+
+XCode
+0. You need the most recent version of XCode, including the 10.4 SDK.
+Download the latest XCode updates available from http://developer.apple.com and make sure
+you're installing 10.4 support.
+
+Libevent
+1. Download and extract the latest libevent source from
+ http://www.monkey.org/~provos/libevent/
+
+2. Configure libevent with the following:
+CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" \
+LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" \
+./configure --enable-static --disable-shared --disable-dependency-tracking CC="gcc-4.0"
+
+3. Build and install libevent as follows:
+ make && make install
+
+ You will need to be root to `make install`
+
+ NOTE: If you have previously installed a Libevent that was not configured with
+ the options above, you must remove those before building Tor, otherwise Tor
+ will link to the wrong Libevent.
+
+
+Qt
+4. Download and extract the open source version of Qt 4.3 or higher from
+ Trolltech at the following address:
+ http://qt.nokia.com/downloads/mac-os-cpp
+
+ Alternatively, download the open source Qt dmg and install. You can now skip 5
+and 6.
+
+5. Configure Qt with the following (OS X 10.4 or later):
+ export MACOSX_DEPLOYENT_TARGET=10.4
+ ./configure -static -release -universal -fast -no-qt3support \
+ -nomake demos -nomake examples -sdk /Developer/SDKs/MacOSX10.4u.sdk/
+
+6. Build and install Qt as follows:
+ make && make install
+
+
+Polipo
+7. Download the OS X Polipo source from:
+http://www.pps.jussieu.fr/~jch/software/files/polipo/.
+
+7a. Download the Tor modifications to Polipo from:
+https://git.torproject.org/checkout/tor/master/contrib/polipo/.
+
+Alternatively, download a tarball with the Polipo source and Tor
+modifications together from:
+http://interloper.org/tmp/polipo/polipo-1.0.4.1-with-mods.tar.gz
+
+8. Follow the directions to build polipo at
+ https://git.torproject.org/checkout/tor/master/contrib/polipo/README
+
+
+Tor
+9. Download and extract the latest Tor source from
+ https://www.torproject.org/download
+
+ Note the location to which you extract Tor's source, because you will need
+ to specify it in Step 12.
+
+10. Configure Tor with the following:
+CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386" \
+LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" \
+CONFDIR=/Applications/Vidalia.app \
+./configure --prefix=/Applications/Vidalia.app --bindir=/Applications/Vidalia.app \
+--sysconfdir=/Library --disable-dependency-tracking CC="gcc-4.0"
+
+11. Build Tor by running 'make'. You do NOT need to run 'make install'
+afterwards.
+
+
+Vidalia
+12. Configure Vidalia with the following:
+
+ export MACOSX_DEPLOYMENT_TARGET=10.4
+ mkdir build && cd build
+ cmake -DOSX_TIGER_COMPAT=1 \
+ -DQT_QMAKE_EXECUTABLE=/path/to/qmake \
+ -DTOR_SOURCE_DIR=<path-to-tor> \
+ -DPOLIPO_SOURCE_DIR=<path-to-polipo> \
+ -DTORBUTTON_XPI=<path-torbutton.xpi> ..
+
+13. Run `make dist-osx-bundle` to build Vidalia and package all of the
+components (Vidalia, Tor, Polipo and Torbutton) into a single .dmg. The resulting
+.dmg will be placed in the 'build' directory created in Step 11.
+
+14. (Optional) Run 'make dist-osx-split-bundle' if you would like to build
+the split OS X bundle.
+
+NOTE: Steps 1-6 only need to be done once initially, unless you need to
+change the packaged version of Libevent or Qt. Step 7 also only needs to
+be done once, unless Polipo ever gets updated. Steps 9-11 need to be
+repeated when the bundled version of Tor changes. Steps 12-13 need to be
+repeated when the bundled version of Vidalia changes.
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/bundle-background.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/bundle-background.png
new file mode 100644
index 0000000..00db8d1
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/bundle-background.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/bundle-ds_store b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/bundle-ds_store
new file mode 100644
index 0000000..429a14f
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/bundle-ds_store differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/nonbundle-ds_store b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/nonbundle-ds_store
new file mode 100644
index 0000000..6081b37
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/nonbundle-ds_store differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/pkg-dmg b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/pkg-dmg
new file mode 100755
index 0000000..b88fa1e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/pkg-dmg
@@ -0,0 +1,1520 @@
+#!/usr/bin/perl
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is pkg-dmg, a Mac OS X disk image (.dmg) packager
+#
+# The Initial Developer of the Original Code is
+# Mark Mentovai <mark at moxienet.com>.
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+use strict;
+use warnings;
+
+=pod
+
+=head1 NAME
+
+B<pkg-dmg> - Mac OS X disk image (.dmg) packager
+
+=head1 SYNOPSIS
+
+B<pkg-dmg>
+B<--source> I<source-folder>
+B<--target> I<target-image>
+[B<--format> I<format>]
+[B<--volname> I<volume-name>]
+[B<--tempdir> I<temp-dir>]
+[B<--mkdir> I<directory>]
+[B<--copy> I<source>[:I<dest>]]
+[B<--symlink> I<source>[:I<dest>]]
+[B<--license> I<file>]
+[B<--resource> I<file>]
+[B<--icon> I<icns-file>]
+[B<--attribute> I<a>:I<file>[:I<file>...]
+[B<--idme>]
+[B<--sourcefile>]
+[B<--verbosity> I<level>]
+[B<--dry-run>]
+
+=head1 DESCRIPTION
+
+I<pkg-dmg> takes a directory identified by I<source-folder> and transforms
+it into a disk image stored as I<target-image>. The disk image will
+occupy the least space possible for its format, or the least space that the
+authors have been able to figure out how to achieve.
+
+=head1 OPTIONS
+
+=over 5
+
+==item B<--source> I<source-folder>
+
+Identifies the directory that will be packaged up. This directory is not
+touched, a copy will be made in a temporary directory for staging purposes.
+See B<--tempdir>.
+
+==item B<--target> I<target-image>
+
+The disk image to create. If it exists and is not in use, it will be
+overwritten. If I<target-image> already contains a suitable extension,
+it will be used unmodified. If no extension is present, or the extension
+is incorrect for the selected format, the proper extension will be added.
+See B<--format>.
+
+==item B<--format> I<format>
+
+The format to create the disk image in. Valid values for I<format> are:
+ - UDZO - zlib-compressed, read-only; extension I<.dmg>
+ - UDBZ - bzip2-compressed, read-only; extension I<.dmg>;
+ create and use on 10.4 ("Tiger") and later only
+ - UDRW - read-write; extension I<.dmg>
+ - UDSP - read-write, sparse; extension I<.sparseimage>
+
+UDZO is the default format.
+
+See L<hdiutil(1)> for a description of these formats.
+
+=item B<--volname> I<volume-name>
+
+The name of the volume in the disk image. If not specified, I<volume-name>
+defaults to the name of the source directory from B<--source>.
+
+=item B<--tempdir> I<temp-dir>
+
+A temporary directory to stage intermediate files in. I<temp-dir> must
+have enough space available to accommodate twice the size of the files
+being packaged. If not specified, defaults to the same directory that
+the I<target-image> is to be placed in. B<pkg-dmg> will remove any
+temporary files it places in I<temp-dir>.
+
+=item B<--mkdir> I<directory>
+
+Specifies a directory that should be created in the disk image.
+I<directory> and any ancestor directories will be created. This is
+useful in conjunction with B<--copy>, when copying files to directories
+that may not exist in I<source-folder>. B<--mkdir> may appear multiple
+times.
+
+=item B<--copy> I<source>[:I<dest>]
+
+Additional files to copy into the disk image. If I<dest> is
+specified, I<source> is copied to the location I<dest> identifies,
+otherwise, I<source> is copied to the root of the new volume. B<--copy>
+provides a way to package up a I<source-folder> by adding files to it
+without modifying the original I<source-folder>. B<--copy> may appear
+multiple times.
+
+This option is useful for adding .DS_Store files and window backgrounds
+to disk images.
+
+=item B<--symlink> I<source>[:I<dest>]
+
+Like B<--copy>, but allows symlinks to point out of the volume. Empty symlink
+destinations are interpreted as "like the source path, but inside the dmg"
+
+This option is useful for adding symlinks to external resources,
+e.g. to /Applications.
+
+=item B<--license> I<file>
+
+A plain text file containing a license agreement to be displayed before
+the disk image is mounted. English is the only supported language. To
+include license agreements in other languages, in multiple languages,
+or to use formatted text, prepare a resource and use L<--resource>.
+
+=item B<--resource> I<file>
+
+A resource file to merge into I<target-image>. If I<format> is UDZO or
+UDBZ, the disk image will be flattened to a single-fork file that contains
+the resource but may be freely transferred without any special encodings.
+I<file> must be in a format suitable for L<Rez(1)>. See L<Rez(1)> for a
+description of the format, and L<hdiutil(1)> for a discussion on flattened
+disk images. B<--resource> may appear multiple times.
+
+This option is useful for adding license agreements and other messages
+to disk images.
+
+=item B<--icon> I<icns-file>
+
+Specifies an I<icns> file that will be used as the icon for the root of
+the volume. This file will be copied to the new volume and the custom
+icon attribute will be set on the root folder.
+
+=item B<--attribute> I<a>:I<file>[:I<file>...]
+
+Sets the attributes of I<file> to the attribute list in I<a>. See
+L<SetFile(1)>
+
+=item B<--idme>
+
+Enable IDME to make the disk image "Internet-enabled." The first time
+the image is mounted, if IDME processing is enabled on the system, the
+contents of the image will be copied out of the image and the image will
+be placed in the trash with IDME disabled.
+
+=item B<--sourcefile>
+
+If this option is present, I<source-folder> is treated as a file, and is
+placed as a file within the volume's root folder. Without this option,
+I<source-folder> is treated as the volume root itself.
+
+=item B<--verbosity> I<level>
+
+Adjusts the level of loudness of B<pkg-dmg>. The possible values for
+I<level> are:
+ 0 - Only error messages are displayed.
+ 1 - Print error messages and command invocations.
+ 2 - Print everything, including command output.
+
+The default I<level> is 2.
+
+=item B<--dry-run>
+
+When specified, the commands that would be executed are printed, without
+actually executing them. When commands depend on the output of previous
+commands, dummy values are displayed.
+
+=back
+
+=head1 NON-OPTIONS
+
+=over 5
+
+=item
+
+Resource forks aren't copied.
+
+=item
+
+The root folder of the created volume is designated as the folder
+to open when the volume is mounted. See L<bless(8)>.
+
+=item
+
+All files in the volume are set to be world-readable, only writable
+by the owner, and world-executable when appropriate. All other
+permissions bits are cleared.
+
+=item
+
+When possible, disk images are created without any partition tables. This
+is what L<hdiutil(1)> refers to as I<-layout NONE>, and saves a handful of
+kilobytes. The alternative, I<SPUD>, contains a partition table that
+is not terribly handy on disk images that are not intended to represent any
+physical disk.
+
+=item
+
+Read-write images are created with journaling off. Any read-write image
+created by this tool is expected to be transient, and the goal of this tool
+is to create images which consume a minimum of space.
+
+=back
+
+=head1 EXAMPLE
+
+pkg-dmg --source /Applications/DeerPark.app --target ~/DeerPark.dmg
+ --sourcefile --volname DeerPark --icon ~/DeerPark.icns
+ --mkdir /.background
+ --copy DeerParkBackground.png:/.background/background.png
+ --copy DeerParkDSStore:/.DS_Store
+ --symlink /Applications:"/Drag to here"
+
+=head1 REQUIREMENTS
+
+I<pkg-dmg> has been tested with Mac OS X releases 10.2 ("Jaguar")
+through 10.4 ("Tiger"). Certain adjustments to behavior are made
+depending on the host system's release. Mac OS X 10.3 ("Panther") or
+later are recommended.
+
+=head1 LICENSE
+
+MPL 1.1/GPL 2.0/LGPL 2.1. Your choice.
+
+=head1 AUTHOR
+
+Mark Mentovai
+
+=head1 SEE ALSO
+
+L<bless(8)>, L<diskutil(8)>, L<hdid(8)>, L<hdiutil(1)>, L<Rez(1)>,
+L<rsync(1)>, L<SetFile(1)>
+
+=cut
+
+use Fcntl;
+use POSIX;
+use Getopt::Long;
+
+sub argumentEscape(@);
+sub cleanupDie($);
+sub command(@);
+sub commandInternal($@);
+sub commandInternalVerbosity($$@);
+sub commandOutput(@);
+sub commandOutputVerbosity($@);
+sub commandVerbosity($@);
+sub copyFiles($@);
+sub diskImageMaker($$$$$$$$);
+sub giveExtension($$);
+sub hdidMountImage($@);
+sub isFormatCompressed($);
+sub licenseMaker($$);
+sub pathSplit($);
+sub setAttributes($@);
+sub trapSignal($);
+sub usage();
+
+# Variables used as globals
+my(@gCleanup, %gConfig, $gDarwinMajor, $gDryRun, $gVerbosity);
+
+# Use the commands by name if they're expected to be in the user's
+# $PATH (/bin:/sbin:/usr/bin:/usr/sbin). Otherwise, go by absolute
+# path. These may be overridden with --config.
+%gConfig = ('cmd_bless' => 'bless',
+ 'cmd_chmod' => 'chmod',
+ 'cmd_diskutil' => 'diskutil',
+ 'cmd_du' => 'du',
+ 'cmd_hdid' => 'hdid',
+ 'cmd_hdiutil' => 'hdiutil',
+ 'cmd_mkdir' => 'mkdir',
+ 'cmd_mktemp' => 'mktemp',
+ 'cmd_Rez' => '/Developer/Tools/Rez',
+ 'cmd_rm' => 'rm',
+ 'cmd_rsync' => 'rsync',
+ 'cmd_SetFile' => '/Developer/Tools/SetFile',
+
+ # create_directly indicates whether hdiutil create supports
+ # -srcfolder and -srcdevice. It does on >= 10.3 (Panther).
+ # This is fixed up for earlier systems below. If false,
+ # hdiutil create is used to create empty disk images that
+ # are manually filled.
+ 'create_directly' => 1,
+
+ # If hdiutil attach -mountpoint exists, use it to avoid
+ # mounting disk images in the default /Volumes. This reduces
+ # the likelihood that someone will notice a mounted image and
+ # interfere with it. Only available on >= 10.3 (Panther),
+ # fixed up for earlier systems below.
+ #
+ # This is presently turned off for all systems, because there
+ # is an infrequent synchronization problem during ejection.
+ # diskutil eject might return before the image is actually
+ # unmounted. If pkg-dmg then attempts to clean up its
+ # temporary directory, it could remove items from a read-write
+ # disk image or attempt to remove items from a read-only disk
+ # image (or a read-only item from a read-write image) and fail,
+ # causing pkg-dmg to abort. This problem is experienced
+ # under Tiger, which appears to eject asynchronously where
+ # previous systems treated it as a synchronous operation.
+ # Using hdiutil attach -mountpoint didn't always keep images
+ # from showing up on the desktop anyway.
+ 'hdiutil_mountpoint' => 0,
+
+ # hdiutil makehybrid results in optimized disk images that
+ # consume less space and mount more quickly. Use it when
+ # it's available, but that's only on >= 10.3 (Panther).
+ # If false, hdiutil create is used instead. Fixed up for
+ # earlier systems below.
+ 'makehybrid' => 1,
+
+ # hdiutil create doesn't allow specifying a folder to open
+ # at volume mount time, so those images are mounted and
+ # their root folders made holy with bless -openfolder. But
+ # only on >= 10.3 (Panther). Earlier systems are out of luck.
+ # Even on Panther, bless refuses to run unless root.
+ # Fixed up below.
+ 'openfolder_bless' => 1,
+
+ # It's possible to save a few more kilobytes by including the
+ # partition only without any partition table in the image.
+ # This is a good idea on any system, so turn this option off.
+ #
+ # Except it's buggy. "-layout NONE" seems to be creating
+ # disk images with more data than just the partition table
+ # stripped out. You might wind up losing the end of the
+ # filesystem - the last file (or several) might be incomplete.
+ 'partition_table' => 1,
+
+ # To create a partition table-less image from something
+ # created by makehybrid, the hybrid image needs to be
+ # mounted and a new image made from the device associated
+ # with the relevant partition. This requires >= 10.4
+ # (Tiger), presumably because earlier systems have
+ # problems creating images from devices themselves attached
+ # to images. If this is false, makehybrid images will
+ # have partition tables, regardless of the partition_table
+ # setting. Fixed up for earlier systems below.
+ 'recursive_access' => 1);
+
+# --verbosity
+$gVerbosity = 2;
+
+# --dry-run
+$gDryRun = 0;
+
+# %gConfig fix-ups based on features and bugs present in certain releases.
+my($ignore, $uname_r, $uname_s);
+($uname_s, $ignore, $uname_r, $ignore, $ignore) = POSIX::uname();
+if($uname_s eq 'Darwin') {
+ ($gDarwinMajor, $ignore) = split(/\./, $uname_r, 2);
+
+ # $major is the Darwin major release, which for our purposes, is 4 higher
+ # than the interesting digit in a Mac OS X release.
+ if($gDarwinMajor <= 6) {
+ # <= 10.2 (Jaguar)
+ # hdiutil create does not support -srcfolder or -srcdevice
+ $gConfig{'create_directly'} = 0;
+ # hdiutil attach does not support -mountpoint
+ $gConfig{'hdiutil_mountpoint'} = 0;
+ # hdiutil mkhybrid does not exist
+ $gConfig{'makehybrid'} = 0;
+ }
+ if($gDarwinMajor <= 7) {
+ # <= 10.3 (Panther)
+ # Can't mount a disk image and then make a disk image from the device
+ $gConfig{'recursive_access'} = 0;
+ # bless does not support -openfolder on 10.2 (Jaguar) and must run
+ # as root under 10.3 (Panther)
+ $gConfig{'openfolder_bless'} = 0;
+ }
+}
+else {
+ # If it's not Mac OS X, just assume all of those good features are
+ # available. They're not, but things will fail long before they
+ # have a chance to make a difference.
+ #
+ # Now, if someone wanted to document some of these private formats...
+ print STDERR ($0.": warning, not running on Mac OS X, ".
+ "this could be interesting.\n");
+}
+
+# Non-global variables used in Getopt
+my(@attributes, @copyFiles, @createSymlinks, $iconFile, $idme, $licenseFile,
+ @makeDirs, $outputFormat, @resourceFiles, $sourceFile, $sourceFolder,
+ $targetImage, $tempDir, $volumeName);
+
+# --format
+$outputFormat = 'UDZO';
+
+# --idme
+$idme = 0;
+
+# --sourcefile
+$sourceFile = 0;
+
+# Leaving this might screw up the Apple tools.
+delete $ENV{'NEXT_ROOT'};
+
+# This script can get pretty messy, so trap a few signals.
+$SIG{'INT'} = \&trapSignal;
+$SIG{'HUP'} = \&trapSignal;
+$SIG{'TERM'} = \&trapSignal;
+
+Getopt::Long::Configure('pass_through');
+GetOptions('source=s' => \$sourceFolder,
+ 'target=s' => \$targetImage,
+ 'volname=s' => \$volumeName,
+ 'format=s' => \$outputFormat,
+ 'tempdir=s' => \$tempDir,
+ 'mkdir=s' => \@makeDirs,
+ 'copy=s' => \@copyFiles,
+ 'symlink=s' => \@createSymlinks,
+ 'license=s' => \$licenseFile,
+ 'resource=s' => \@resourceFiles,
+ 'icon=s' => \$iconFile,
+ 'attribute=s' => \@attributes,
+ 'idme' => \$idme,
+ 'sourcefile' => \$sourceFile,
+ 'verbosity=i' => \$gVerbosity,
+ 'dry-run' => \$gDryRun,
+ 'config=s' => \%gConfig); # "hidden" option not in usage()
+
+if(@ARGV) {
+ # All arguments are parsed by Getopt
+ usage();
+ exit(1);
+}
+
+if($gVerbosity<0 || $gVerbosity>2) {
+ usage();
+ exit(1);
+}
+
+if(!defined($sourceFolder) || $sourceFolder eq '' ||
+ !defined($targetImage) || $targetImage eq '') {
+ # --source and --target are required arguments
+ usage();
+ exit(1);
+}
+
+# Make sure $sourceFolder doesn't contain trailing slashes. It messes with
+# rsync.
+while(substr($sourceFolder, -1) eq '/') {
+ chop($sourceFolder);
+}
+
+if(!defined($volumeName)) {
+ # Default volumeName is the name of the source directory.
+ my(@components);
+ @components = pathSplit($sourceFolder);
+ $volumeName = pop(@components);
+}
+
+my(@tempDirComponents, $targetImageFilename);
+ at tempDirComponents = pathSplit($targetImage);
+$targetImageFilename = pop(@tempDirComponents);
+
+if(defined($tempDir)) {
+ @tempDirComponents = pathSplit($tempDir);
+}
+else {
+ # Default tempDir is the same directory as what is specified for
+ # targetImage
+ $tempDir = join('/', @tempDirComponents);
+}
+
+# Ensure that the path of the target image has a suitable extension. If
+# it didn't, hdiutil would add one, and we wouldn't be able to find the
+# file.
+#
+# Note that $targetImageFilename is not being reset. This is because it's
+# used to build other names below, and we don't need to be adding all sorts
+# of extra unnecessary extensions to the name.
+my($originalTargetImage, $requiredExtension);
+$originalTargetImage = $targetImage;
+if($outputFormat eq 'UDSP') {
+ $requiredExtension = '.sparseimage';
+}
+else {
+ $requiredExtension = '.dmg';
+}
+$targetImage = giveExtension($originalTargetImage, $requiredExtension);
+
+if($targetImage ne $originalTargetImage) {
+ print STDERR ($0.": warning: target image extension is being added\n");
+ print STDERR (' The new filename is '.
+ giveExtension($targetImageFilename,$requiredExtension)."\n");
+}
+
+# Make a temporary directory in $tempDir for our own nefarious purposes.
+my(@output, $tempSubdir, $tempSubdirTemplate);
+$tempSubdirTemplate=join('/', @tempDirComponents,
+ 'pkg-dmg.'.$$.'.XXXXXXXX');
+if(!(@output = commandOutput($gConfig{'cmd_mktemp'}, '-d',
+ $tempSubdirTemplate)) || $#output != 0) {
+ cleanupDie('mktemp failed');
+}
+
+if($gDryRun) {
+ (@output)=($tempSubdirTemplate);
+}
+
+($tempSubdir) = @output;
+
+push(@gCleanup,
+ sub {commandVerbosity(0, $gConfig{'cmd_rm'}, '-rf', $tempSubdir);});
+
+my($tempMount, $tempRoot, @tempsToMake);
+$tempRoot = $tempSubdir.'/stage';
+$tempMount = $tempSubdir.'/mount';
+push(@tempsToMake, $tempRoot);
+if($gConfig{'hdiutil_mountpoint'}) {
+ push(@tempsToMake, $tempMount);
+}
+
+if(command($gConfig{'cmd_mkdir'}, @tempsToMake) != 0) {
+ cleanupDie('mkdir tempRoot/tempMount failed');
+}
+
+# This cleanup object is not strictly necessary, because $tempRoot is inside
+# of $tempSubdir, but the rest of the script relies on this object being
+# on the cleanup stack and expects to remove it.
+push(@gCleanup,
+ sub {commandVerbosity(0, $gConfig{'cmd_rm'}, '-rf', $tempRoot);});
+
+# If $sourceFile is true, it means that $sourceFolder is to be treated as
+# a file and placed as a file within the volume root, as opposed to being
+# treated as the volume root itself. rsync will do this by default, if no
+# trailing '/' is present. With a trailing '/', $sourceFolder becomes
+# $tempRoot, instead of becoming an entry in $tempRoot.
+if(command($gConfig{'cmd_rsync'}, '-a', '--copy-unsafe-links',
+ $sourceFolder.($sourceFile?'':'/'),$tempRoot) != 0) {
+ cleanupDie('rsync failed');
+}
+
+if(@makeDirs) {
+ my($makeDir, @tempDirsToMake);
+ foreach $makeDir (@makeDirs) {
+ if($makeDir =~ /^\//) {
+ push(@tempDirsToMake, $tempRoot.$makeDir);
+ }
+ else {
+ push(@tempDirsToMake, $tempRoot.'/'.$makeDir);
+ }
+ }
+ if(command($gConfig{'cmd_mkdir'}, '-p', @tempDirsToMake) != 0) {
+ cleanupDie('mkdir failed');
+ }
+}
+
+# copy files and/or create symlinks
+copyFiles($tempRoot, 'copy', @copyFiles);
+copyFiles($tempRoot, 'symlink', @createSymlinks);
+
+if($gConfig{'create_directly'}) {
+ # If create_directly is false, the contents will be rsynced into a
+ # disk image and they would lose their attributes.
+ setAttributes($tempRoot, @attributes);
+}
+
+if(defined($iconFile)) {
+ if(command($gConfig{'cmd_rsync'}, '-a', '--copy-unsafe-links', $iconFile,
+ $tempRoot.'/.VolumeIcon.icns') != 0) {
+ cleanupDie('rsync failed for volume icon');
+ }
+
+ # It's pointless to set the attributes of the root when diskutil create
+ # -srcfolder is being used. In that case, the attributes will be set
+ # later, after the image is already created.
+ if(isFormatCompressed($outputFormat) &&
+ (command($gConfig{'cmd_SetFile'}, '-a', 'C', $tempRoot) != 0)) {
+ cleanupDie('SetFile failed');
+ }
+}
+
+if(command($gConfig{'cmd_chmod'}, '-R', 'a+rX,a-st,u+w,go-w',
+ $tempRoot) != 0) {
+ cleanupDie('chmod failed');
+}
+
+my($unflattenable);
+if(isFormatCompressed($outputFormat)) {
+ $unflattenable = 1;
+}
+else {
+ $unflattenable = 0;
+}
+
+diskImageMaker($tempRoot, $targetImage, $outputFormat, $volumeName,
+ $tempSubdir, $tempMount, $targetImageFilename, defined($iconFile));
+
+if(defined($licenseFile) && $licenseFile ne '') {
+ my($licenseResource);
+ $licenseResource = $tempSubdir.'/license.r';
+ if(!licenseMaker($licenseFile, $licenseResource)) {
+ cleanupDie('licenseMaker failed');
+ }
+ push(@resourceFiles, $licenseResource);
+ # Don't add a cleanup object because licenseResource is in tempSubdir.
+}
+
+if(@resourceFiles) {
+ # Add resources, such as a license agreement.
+
+ # Only unflatten read-only and compressed images. It's not supported
+ # on other image times.
+ if($unflattenable &&
+ (command($gConfig{'cmd_hdiutil'}, 'unflatten', $targetImage)) != 0) {
+ cleanupDie('hdiutil unflatten failed');
+ }
+ # Don't push flatten onto the cleanup stack. If we fail now, we'll be
+ # removing $targetImage anyway.
+
+ # Type definitions come from Carbon.r.
+ if(command($gConfig{'cmd_Rez'}, 'Carbon.r', @resourceFiles, '-a', '-o',
+ $targetImage) != 0) {
+ cleanupDie('Rez failed');
+ }
+
+ # Flatten. This merges the resource fork into the data fork, so no
+ # special encoding is needed to transfer the file.
+ if($unflattenable &&
+ (command($gConfig{'cmd_hdiutil'}, 'flatten', $targetImage)) != 0) {
+ cleanupDie('hdiutil flatten failed');
+ }
+}
+
+# $tempSubdir is no longer needed. It's buried on the stack below the
+# rm of the fresh image file. Splice in this fashion is equivalent to
+# pop-save, pop, push-save.
+splice(@gCleanup, -2, 1);
+# No need to remove licenseResource separately, it's in tempSubdir.
+if(command($gConfig{'cmd_rm'}, '-rf', $tempSubdir) != 0) {
+ cleanupDie('rm -rf tempSubdir failed');
+}
+
+if($idme) {
+ if(command($gConfig{'cmd_hdiutil'}, 'internet-enable', '-yes',
+ $targetImage) != 0) {
+ cleanupDie('hdiutil internet-enable failed');
+ }
+}
+
+# Done.
+
+exit(0);
+
+# argumentEscape(@arguments)
+#
+# Takes a list of @arguments and makes them shell-safe.
+sub argumentEscape(@) {
+ my(@arguments);
+ @arguments = @_;
+ my($argument, @argumentsOut);
+ foreach $argument (@arguments) {
+ $argument =~ s%([^A-Za-z0-9_\-/.=+,])%\\$1%g;
+ push(@argumentsOut, $argument);
+ }
+ return @argumentsOut;
+}
+
+# cleanupDie($message)
+#
+# Displays $message as an error message, and then runs through the
+# @gCleanup stack, performing any cleanup operations needed before
+# exiting. Does not return, exits with exit status 1.
+sub cleanupDie($) {
+ my($message);
+ ($message) = @_;
+ print STDERR ($0.': '.$message.(@gCleanup?' (cleaning up)':'')."\n");
+ while(@gCleanup) {
+ my($subroutine);
+ $subroutine = pop(@gCleanup);
+ &$subroutine;
+ }
+ exit(1);
+}
+
+# command(@arguments)
+#
+# Runs the specified command at the verbosity level defined by $gVerbosity.
+# Returns nonzero on failure, returning the exit status if appropriate.
+# Discards command output.
+sub command(@) {
+ my(@arguments);
+ @arguments = @_;
+ return commandVerbosity($gVerbosity, at arguments);
+}
+
+# commandInternal($command, @arguments)
+#
+# Runs the specified internal command at the verbosity level defined by
+# $gVerbosity.
+# Returns zero(!) on failure, because commandInternal is supposed to be a
+# direct replacement for the Perl system call wrappers, which, unlike shell
+# commands and C equivalent system calls, return true (instead of 0) to
+# indicate success.
+sub commandInternal($@) {
+ my(@arguments, $command);
+ ($command, @arguments) = @_;
+ return commandInternalVerbosity($gVerbosity, $command, @arguments);
+}
+
+# commandInternalVerbosity($verbosity, $command, @arguments)
+#
+# Run an internal command, printing a bogus command invocation message if
+# $verbosity is true.
+#
+# If $command is unlink:
+# Removes the files specified by @arguments. Wraps unlink.
+#
+# If $command is symlink:
+# Creates the symlink specified by @arguments. Wraps symlink.
+sub commandInternalVerbosity($$@) {
+ my(@arguments, $command, $verbosity);
+ ($verbosity, $command, @arguments) = @_;
+ if($command eq 'unlink') {
+ if($verbosity || $gDryRun) {
+ print(join(' ', 'rm', '-f', argumentEscape(@arguments))."\n");
+ }
+ if($gDryRun) {
+ return $#arguments+1;
+ }
+ return unlink(@arguments);
+ }
+ elsif($command eq 'symlink') {
+ if($verbosity || $gDryRun) {
+ print(join(' ', 'ln', '-s', argumentEscape(@arguments))."\n");
+ }
+ if($gDryRun) {
+ return 1;
+ }
+ my($source, $target);
+ ($source, $target) = @arguments;
+ return symlink($source, $target);
+ }
+}
+
+# commandOutput(@arguments)
+#
+# Runs the specified command at the verbosity level defined by $gVerbosity.
+# Output is returned in an array of lines. undef is returned on failure.
+# The exit status is available in $?.
+sub commandOutput(@) {
+ my(@arguments);
+ @arguments = @_;
+ return commandOutputVerbosity($gVerbosity, @arguments);
+}
+
+# commandOutputVerbosity($verbosity, @arguments)
+#
+# Runs the specified command at the verbosity level defined by the
+# $verbosity argument. Output is returned in an array of lines. undef is
+# returned on failure. The exit status is available in $?.
+#
+# If an error occurs in fork or exec, an error message is printed to
+# stderr and undef is returned.
+#
+# If $verbosity is 0, the command invocation is not printed, and its
+# stdout is not echoed back to stdout.
+#
+# If $verbosity is 1, the command invocation is printed.
+#
+# If $verbosity is 2, the command invocation is printed and the output
+# from stdout is echoed back to stdout.
+#
+# Regardless of $verbosity, stderr is left connected.
+sub commandOutputVerbosity($@) {
+ my(@arguments, $verbosity);
+ ($verbosity, @arguments) = @_;
+ my($pid);
+ if($verbosity || $gDryRun) {
+ print(join(' ', argumentEscape(@arguments))."\n");
+ }
+ if($gDryRun) {
+ return(1);
+ }
+ if (!defined($pid = open(*COMMAND, '-|'))) {
+ printf STDERR ($0.': fork: '.$!."\n");
+ return undef;
+ }
+ elsif ($pid) {
+ # parent
+ my(@lines);
+ while(!eof(*COMMAND)) {
+ my($line);
+ chop($line = <COMMAND>);
+ if($verbosity > 1) {
+ print($line."\n");
+ }
+ push(@lines, $line);
+ }
+ close(*COMMAND);
+ if ($? == -1) {
+ printf STDERR ($0.': fork: '.$!."\n");
+ return undef;
+ }
+ elsif ($? & 127) {
+ printf STDERR ($0.': exited on signal '.($? & 127).
+ ($? & 128 ? ', core dumped' : '')."\n");
+ return undef;
+ }
+ return @lines;
+ }
+ else {
+ # child; this form of exec is immune to shell games
+ if(!exec {$arguments[0]} (@arguments)) {
+ printf STDERR ($0.': exec: '.$!."\n");
+ exit(-1);
+ }
+ }
+}
+
+# commandVerbosity($verbosity, @arguments)
+#
+# Runs the specified command at the verbosity level defined by the
+# $verbosity argument. Returns nonzero on failure, returning the exit
+# status if appropriate. Discards command output.
+sub commandVerbosity($@) {
+ my(@arguments, $verbosity);
+ ($verbosity, @arguments) = @_;
+ if(!defined(commandOutputVerbosity($verbosity, @arguments))) {
+ return -1;
+ }
+ return $?;
+}
+
+# copyFiles($tempRoot, $method, @arguments)
+#
+# Copies files or create symlinks in the disk image.
+# See --copy and --symlink descriptions for details.
+# If $method is 'copy', @arguments are interpreted as source:target, if $method
+# is 'symlink', @arguments are interpreted as symlink:target.
+sub copyFiles($@) {
+ my(@fileList, $method, $tempRoot);
+ ($tempRoot, $method, @fileList) = @_;
+ my($file, $isSymlink);
+ $isSymlink = ($method eq 'symlink');
+ foreach $file (@fileList) {
+ my($source, $target);
+ ($source, $target) = split(/:/, $file);
+ if(!defined($target) and $isSymlink) {
+ # empty symlink targets would result in an invalid target and fail,
+ # but they shall be interpreted as "like source path, but inside dmg"
+ $target = $source;
+ }
+ if(!defined($target)) {
+ $target = $tempRoot;
+ }
+ elsif($target =~ /^\//) {
+ $target = $tempRoot.$target;
+ }
+ else {
+ $target = $tempRoot.'/'.$target;
+ }
+
+ my($success);
+ if($isSymlink) {
+ $success = commandInternal('symlink', $source, $target);
+ }
+ else {
+ $success = !command($gConfig{'cmd_rsync'}, '-a', '--copy-unsafe-links',
+ $source, $target);
+ }
+ if(!$success) {
+ cleanupDie('copyFiles failed for method '.$method);
+ }
+ }
+}
+
+# diskImageMaker($source, $destination, $format, $name, $tempDir, $tempMount,
+# $baseName, $setRootIcon)
+#
+# Creates a disk image in $destination of format $format corresponding to the
+# source directory $source. $name is the volume name. $tempDir is a good
+# place to write temporary files, which should be empty (aside from the other
+# things that this script might create there, like stage and mount).
+# $tempMount is a mount point for temporary disk images. $baseName is the
+# name of the disk image, and is presently unused. $setRootIcon is true if
+# a volume icon was added to the staged $source and indicates that the
+# custom volume icon bit on the volume root needs to be set.
+sub diskImageMaker($$$$$$$$) {
+ my($baseName, $destination, $format, $name, $setRootIcon, $source,
+ $tempDir, $tempMount);
+ ($source, $destination, $format, $name, $tempDir, $tempMount,
+ $baseName, $setRootIcon) = @_;
+ if(isFormatCompressed($format)) {
+ my($uncompressedImage);
+
+ if($gConfig{'makehybrid'}) {
+ my($hybridImage);
+ $hybridImage = giveExtension($tempDir.'/hybrid', '.dmg');
+
+ if(command($gConfig{'cmd_hdiutil'}, 'makehybrid', '-hfs',
+ '-hfs-volume-name', $name, '-hfs-openfolder', $source, '-ov',
+ $source, '-o', $hybridImage) != 0) {
+ cleanupDie('hdiutil makehybrid failed');
+ }
+
+ $uncompressedImage = $hybridImage;
+
+ # $source is no longer needed and will be removed before anything
+ # else can fail. splice in this form is the same as pop/push.
+ splice(@gCleanup, -1, 1,
+ sub {commandInternalVerbosity(0, 'unlink', $hybridImage);});
+
+ if(command($gConfig{'cmd_rm'}, '-rf', $source) != 0) {
+ cleanupDie('rm -rf failed');
+ }
+
+ if(!$gConfig{'partition_table'} && $gConfig{'recursive_access'}) {
+ # Even if we do want to create disk images without partition tables,
+ # it's impossible unless recursive_access is set.
+ my($rootDevice, $partitionDevice, $partitionMountPoint);
+
+ if(!(($rootDevice, $partitionDevice, $partitionMountPoint) =
+ hdidMountImage($tempMount, '-readonly', $hybridImage))) {
+ cleanupDie('hdid mount failed');
+ }
+
+ push(@gCleanup, sub {commandVerbosity(0,
+ $gConfig{'cmd_diskutil'}, 'eject', $rootDevice);});
+
+ my($udrwImage);
+ $udrwImage = giveExtension($tempDir.'/udrw', '.dmg');
+
+ if(command($gConfig{'cmd_hdiutil'}, 'create', '-format', 'UDRW',
+ '-ov', '-srcdevice', $partitionDevice, $udrwImage) != 0) {
+ cleanupDie('hdiutil create failed');
+ }
+
+ $uncompressedImage = $udrwImage;
+
+ # Going to eject before anything else can fail. Get the eject off
+ # the stack.
+ pop(@gCleanup);
+
+ # $hybridImage will be removed soon, but until then, it needs to
+ # stay on the cleanup stack. It needs to wait until after
+ # ejection. $udrwImage is staying around. Make it appear as
+ # though it's been done before $hybridImage.
+ #
+ # splice in this form is the same as popping one element to
+ # @tempCleanup and pushing the subroutine.
+ my(@tempCleanup);
+ @tempCleanup = splice(@gCleanup, -1, 1,
+ sub {commandInternalVerbosity(0, 'unlink', $udrwImage);});
+ push(@gCleanup, @tempCleanup);
+
+ if(command($gConfig{'cmd_diskutil'}, 'eject', $rootDevice) != 0) {
+ cleanupDie('diskutil eject failed');
+ }
+
+ # Pop unlink of $uncompressedImage
+ pop(@gCleanup);
+
+ if(commandInternal('unlink', $hybridImage) != 1) {
+ cleanupDie('unlink hybridImage failed: '.$!);
+ }
+ }
+ }
+ else {
+ # makehybrid is not available, fall back to making a UDRW and
+ # converting to a compressed image. It ought to be possible to
+ # create a compressed image directly, but those come out far too
+ # large (journaling?) and need to be read-write to fix up the
+ # volume icon anyway. Luckily, we can take advantage of a single
+ # call back into this function.
+ my($udrwImage);
+ $udrwImage = giveExtension($tempDir.'/udrw', '.dmg');
+
+ diskImageMaker($source, $udrwImage, 'UDRW', $name, $tempDir,
+ $tempMount, $baseName, $setRootIcon);
+
+ # The call back into diskImageMaker already removed $source.
+
+ $uncompressedImage = $udrwImage;
+ }
+
+ # The uncompressed disk image is now in its final form. Compress it.
+ # Jaguar doesn't support hdiutil convert -ov, but it always allows
+ # overwriting.
+ # bzip2-compressed UDBZ images can only be created and mounted on 10.4
+ # and later. The bzip2-level imagekey is only effective when creating
+ # images in 10.5. In 10.4, bzip2-level is harmlessly ignored, and the
+ # default value of 1 is always used.
+ if(command($gConfig{'cmd_hdiutil'}, 'convert', '-format', $format,
+ '-imagekey', ($format eq 'UDBZ' ? 'bzip2-level=9' : 'zlib-level=9'),
+ (defined($gDarwinMajor) && $gDarwinMajor <= 6 ? () : ('-ov')),
+ $uncompressedImage, '-o', $destination) != 0) {
+ cleanupDie('hdiutil convert failed');
+ }
+
+ # $uncompressedImage is going to be unlinked before anything else can
+ # fail. splice in this form is the same as pop/push.
+ splice(@gCleanup, -1, 1,
+ sub {commandInternalVerbosity(0, 'unlink', $destination);});
+
+ if(commandInternal('unlink', $uncompressedImage) != 1) {
+ cleanupDie('unlink uncompressedImage failed: '.$!);
+ }
+
+ # At this point, the only thing that the compressed block has added to
+ # the cleanup stack is the removal of $destination. $source has already
+ # been removed, and its cleanup entry has been removed as well.
+ }
+ elsif($format eq 'UDRW' || $format eq 'UDSP') {
+ my(@extraArguments);
+ if(!$gConfig{'partition_table'}) {
+ @extraArguments = ('-layout', 'NONE');
+ }
+
+ if($gConfig{'create_directly'}) {
+ # Use -fs HFS+ to suppress the journal.
+ if(command($gConfig{'cmd_hdiutil'}, 'create', '-format', $format,
+ @extraArguments, '-fs', 'HFS+', '-volname', $name,
+ '-ov', '-srcfolder', $source, $destination) != 0) {
+ cleanupDie('hdiutil create failed');
+ }
+
+ # $source is no longer needed and will be removed before anything
+ # else can fail. splice in this form is the same as pop/push.
+ splice(@gCleanup, -1, 1,
+ sub {commandInternalVerbosity(0, 'unlink', $destination);});
+
+ if(command($gConfig{'cmd_rm'}, '-rf', $source) != 0) {
+ cleanupDie('rm -rf failed');
+ }
+ }
+ else {
+ # hdiutil create does not support -srcfolder or -srcdevice, it only
+ # knows how to create blank images. Figure out how large an image
+ # is needed, create it, and fill it. This is needed for Jaguar.
+
+ # Use native block size for hdiutil create -sectors.
+ delete $ENV{'BLOCKSIZE'};
+
+ my(@duOutput, $ignore, $sizeBlocks, $sizeOverhead, $sizeTotal, $type);
+ if(!(@output = commandOutput($gConfig{'cmd_du'}, '-s', $tempRoot)) ||
+ $? != 0) {
+ cleanupDie('du failed');
+ }
+ ($sizeBlocks, $ignore) = split(' ', $output[0], 2);
+
+ # The filesystem itself takes up 152 blocks of its own blocks for the
+ # filesystem up to 8192 blocks, plus 64 blocks for every additional
+ # 4096 blocks or portion thereof.
+ $sizeOverhead = 152 + 64 * POSIX::ceil(
+ (($sizeBlocks - 8192) > 0) ? (($sizeBlocks - 8192) / (4096 - 64)) : 0);
+
+ # The number of blocks must be divisible by 8.
+ my($mod);
+ if($mod = ($sizeOverhead % 8)) {
+ $sizeOverhead += 8 - $mod;
+ }
+
+ # sectors is taken as the size of a disk, not a filesystem, so the
+ # partition table eats into it.
+ if($gConfig{'partition_table'}) {
+ $sizeOverhead += 80;
+ }
+
+ # That was hard. Leave some breathing room anyway. Use 1024 sectors
+ # (512kB). These read-write images wouldn't be useful if they didn't
+ # have at least a little free space.
+ $sizeTotal = $sizeBlocks + $sizeOverhead + 1024;
+
+ # Minimum sizes - these numbers are larger on Jaguar than on later
+ # systems. Just use the Jaguar numbers, since it's unlikely to wind
+ # up here on any other release.
+ if($gConfig{'partition_table'} && $sizeTotal < 8272) {
+ $sizeTotal = 8272;
+ }
+ if(!$gConfig{'partition_table'} && $sizeTotal < 8192) {
+ $sizeTotal = 8192;
+ }
+
+ # hdiutil create without -srcfolder or -srcdevice will not accept
+ # -format. It uses -type. Fortunately, the two supported formats
+ # here map directly to the only two supported types.
+ if ($format eq 'UDSP') {
+ $type = 'SPARSE';
+ }
+ else {
+ $type = 'UDIF';
+ }
+
+ if(command($gConfig{'cmd_hdiutil'}, 'create', '-type', $type,
+ @extraArguments, '-fs', 'HFS+', '-volname', $name,
+ '-ov', '-sectors', $sizeTotal, $destination) != 0) {
+ cleanupDie('hdiutil create failed');
+ }
+
+ push(@gCleanup,
+ sub {commandInternalVerbosity(0, 'unlink', $destination);});
+
+ # The rsync will occur shortly.
+ }
+
+ my($mounted, $rootDevice, $partitionDevice, $partitionMountPoint);
+
+ $mounted=0;
+ if(!$gConfig{'create_directly'} || $gConfig{'openfolder_bless'} ||
+ $setRootIcon) {
+ # The disk image only needs to be mounted if:
+ # create_directly is false, because the content needs to be copied
+ # openfolder_bless is true, because bless -openfolder needs to run
+ # setRootIcon is true, because the root needs its attributes set.
+ if(!(($rootDevice, $partitionDevice, $partitionMountPoint) =
+ hdidMountImage($tempMount, $destination))) {
+ cleanupDie('hdid mount failed');
+ }
+
+ $mounted=1;
+
+ push(@gCleanup, sub {commandVerbosity(0,
+ $gConfig{'cmd_diskutil'}, 'eject', $rootDevice);});
+ }
+
+ if(!$gConfig{'create_directly'}) {
+ # Couldn't create and copy directly in one fell swoop. Now that
+ # the volume is mounted, copy the files. --copy-unsafe-links is
+ # unnecessary since it was used to copy everything to the staging
+ # area. There can be no more unsafe links.
+ if(command($gConfig{'cmd_rsync'}, '-a',
+ $source.'/',$partitionMountPoint) != 0) {
+ cleanupDie('rsync to new volume failed');
+ }
+
+ # We need to get the rm -rf of $source off the stack, because it's
+ # being cleaned up here. There are two items now on top of it:
+ # removing the target image and, above that, ejecting it. Splice it
+ # out.
+ my(@tempCleanup);
+ @tempCleanup = splice(@gCleanup, -2);
+ # The next splice is the same as popping once and pushing @tempCleanup.
+ splice(@gCleanup, -1, 1, @tempCleanup);
+
+ if(command($gConfig{'cmd_rm'}, '-rf', $source) != 0) {
+ cleanupDie('rm -rf failed');
+ }
+ }
+
+ if($gConfig{'openfolder_bless'}) {
+ # On Tiger, the bless docs say to use --openfolder, but only
+ # --openfolder is accepted on Panther. Tiger takes it with a single
+ # dash too. Jaguar is out of luck.
+ if(command($gConfig{'cmd_bless'}, '-openfolder',
+ $partitionMountPoint) != 0) {
+ cleanupDie('bless failed');
+ }
+ }
+
+ setAttributes($partitionMountPoint, @attributes);
+
+ if($setRootIcon) {
+ # When "hdiutil create -srcfolder" is used, the root folder's
+ # attributes are not copied to the new volume. Fix up.
+
+ if(command($gConfig{'cmd_SetFile'}, '-a', 'C',
+ $partitionMountPoint) != 0) {
+ cleanupDie('SetFile failed');
+ }
+ }
+
+ if($mounted) {
+ # Pop diskutil eject
+ pop(@gCleanup);
+
+ if(command($gConfig{'cmd_diskutil'}, 'eject', $rootDevice) != 0) {
+ cleanupDie('diskutil eject failed');
+ }
+ }
+
+ # End of UDRW/UDSP section. At this point, $source has been removed
+ # and its cleanup entry has been removed from the stack.
+ }
+ else {
+ cleanupDie('unrecognized format');
+ print STDERR ($0.": unrecognized format\n");
+ exit(1);
+ }
+}
+
+# giveExtension($file, $extension)
+#
+# If $file does not end in $extension, $extension is added. The new
+# filename is returned.
+sub giveExtension($$) {
+ my($extension, $file);
+ ($file, $extension) = @_;
+ if(substr($file, -length($extension)) ne $extension) {
+ return $file.$extension;
+ }
+ return $file;
+}
+
+# hdidMountImage($mountPoint, @arguments)
+#
+# Runs the hdid command with arguments specified by @arguments.
+# @arguments may be a single-element array containing the name of the
+# disk image to mount. Returns a three-element array, with elements
+# corresponding to:
+# - The root device of the mounted image, suitable for ejection
+# - The device corresponding to the mounted partition
+# - The mounted partition's mount point
+#
+# If running on a system that supports easy mounting at points outside
+# of the default /Volumes with hdiutil attach, it is used instead of hdid,
+# and $mountPoint is used as the mount point.
+#
+# The root device will differ from the partition device when the disk
+# image contains a partition table, otherwise, they will be identical.
+#
+# If hdid fails, undef is returned.
+sub hdidMountImage($@) {
+ my(@arguments, @command, $mountPoint);
+ ($mountPoint, @arguments) = @_;
+ my(@output);
+
+ if($gConfig{'hdiutil_mountpoint'}) {
+ @command=($gConfig{'cmd_hdiutil'}, 'attach', @arguments,
+ '-mountpoint', $mountPoint);
+ }
+ else {
+ @command=($gConfig{'cmd_hdid'}, @arguments);
+ }
+
+ if(!(@output = commandOutput(@command)) ||
+ $? != 0) {
+ return undef;
+ }
+
+ if($gDryRun) {
+ return('/dev/diskX','/dev/diskXsY','/Volumes/'.$volumeName);
+ }
+
+ my($line, $restOfLine, $rootDevice);
+
+ foreach $line (@output) {
+ my($device, $mountpoint);
+ if($line !~ /^\/dev\//) {
+ # Consider only lines that correspond to /dev entries
+ next;
+ }
+ ($device, $restOfLine) = split(' ', $line, 2);
+
+ if(!defined($rootDevice) || $rootDevice eq '') {
+ # If this is the first device seen, it's the root device to be
+ # used for ejection. Keep it.
+ $rootDevice = $device;
+ }
+
+ if($restOfLine =~ /(\/.*)/) {
+ # The first partition with a mount point is the interesting one. It's
+ # usually Apple_HFS and usually the last one in the list, but beware of
+ # the possibility of other filesystem types and the Apple_Free partition.
+ # If the disk image contains no partition table, the partition will not
+ # have a type, so look for the mount point by looking for a slash.
+ $mountpoint = $1;
+ return($rootDevice, $device, $mountpoint);
+ }
+ }
+
+ # No mount point? This is bad. If there's a root device, eject it.
+ if(defined($rootDevice) && $rootDevice ne '') {
+ # Failing anyway, so don't care about failure
+ commandVerbosity(0, $gConfig{'cmd_diskutil'}, 'eject', $rootDevice);
+ }
+
+ return undef;
+}
+
+# isFormatCompressed($format)
+#
+# Returns true if $format corresponds to a compressed disk image format.
+# Returns false otherwise.
+sub isFormatCompressed($) {
+ my($format);
+ ($format) = @_;
+ return $format eq 'UDZO' || $format eq 'UDBZ';
+}
+
+# licenseMaker($text, $resource)
+#
+# Takes a plain text file at path $text and creates a license agreement
+# resource containing the text at path $license. English-only, and
+# no special formatting. This is the bare-bones stuff. For more
+# intricate license agreements, create your own resource.
+#
+# ftp://ftp.apple.com/developer/Development_Kits/SLAs_for_UDIFs_1.0.dmg
+sub licenseMaker($$) {
+ my($resource, $text);
+ ($text, $resource) = @_;
+ if(!sysopen(*TEXT, $text, O_RDONLY)) {
+ print STDERR ($0.': licenseMaker: sysopen text: '.$!."\n");
+ return 0;
+ }
+ if(!sysopen(*RESOURCE, $resource, O_WRONLY|O_CREAT|O_EXCL)) {
+ print STDERR ($0.': licenseMaker: sysopen resource: '.$!."\n");
+ return 0;
+ }
+ print RESOURCE << '__EOT__';
+// See /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/Script.h for language IDs.
+data 'LPic' (5000) {
+ // Default language ID, 0 = English
+ $"0000"
+ // Number of entries in list
+ $"0001"
+
+ // Entry 1
+ // Language ID, 0 = English
+ $"0000"
+ // Resource ID, 0 = STR#/TEXT/styl 5000
+ $"0000"
+ // Multibyte language, 0 = no
+ $"0000"
+};
+
+resource 'STR#' (5000, "English") {
+ {
+ // Language (unused?) = English
+ "English",
+ // Agree
+ "Agree",
+ // Disagree
+ "Disagree",
+__EOT__
+ # This stuff needs double-quotes for interpolations to work.
+ print RESOURCE (" // Print, ellipsis is 0xC9\n");
+ print RESOURCE (" \"Print\xc9\",\n");
+ print RESOURCE (" // Save As, ellipsis is 0xC9\n");
+ print RESOURCE (" \"Save As\xc9\",\n");
+ print RESOURCE (' // Descriptive text, curly quotes are 0xD2 and 0xD3'.
+ "\n");
+ print RESOURCE (' "If you agree to the terms of this license '.
+ "agreement, click \xd2Agree\xd3 to access the software. If you ".
+ "do not agree, press \xd2Disagree.\xd3\"\n");
+print RESOURCE << '__EOT__';
+ };
+};
+
+// Beware of 1024(?) byte (character?) line length limitation. Split up long
+// lines.
+// If straight quotes are used ("), remember to escape them (\").
+// Newline is \n, to leave a blank line, use two of them.
+// 0xD2 and 0xD3 are curly double-quotes ("), 0xD4 and 0xD5 are curly
+// single quotes ('), 0xD5 is also the apostrophe.
+data 'TEXT' (5000, "English") {
+__EOT__
+
+ while(!eof(*TEXT)) {
+ my($line);
+ chop($line = <TEXT>);
+
+ while(defined($line)) {
+ my($chunk);
+
+ # Rez doesn't care for lines longer than (1024?) characters. Split
+ # at less than half of that limit, in case everything needs to be
+ # backwhacked.
+ if(length($line)>500) {
+ $chunk = substr($line, 0, 500);
+ $line = substr($line, 500);
+ }
+ else {
+ $chunk = $line;
+ $line = undef;
+ }
+
+ if(length($chunk) > 0) {
+ # Unsafe characters are the double-quote (") and backslash (\), escape
+ # them with backslashes.
+ $chunk =~ s/(["\\])/\\$1/g;
+
+ print RESOURCE ' "'.$chunk.'"'."\n";
+ }
+ }
+ print RESOURCE ' "\n"'."\n";
+ }
+ close(*TEXT);
+
+ print RESOURCE << '__EOT__';
+};
+
+data 'styl' (5000, "English") {
+ // Number of styles following = 1
+ $"0001"
+
+ // Style 1. This is used to display the first two lines in bold text.
+ // Start character = 0
+ $"0000 0000"
+ // Height = 16
+ $"0010"
+ // Ascent = 12
+ $"000C"
+ // Font family = 1024 (Lucida Grande)
+ $"0400"
+ // Style bitfield, 0x1=bold 0x2=italic 0x4=underline 0x8=outline
+ // 0x10=shadow 0x20=condensed 0x40=extended
+ $"00"
+ // Style, unused?
+ $"02"
+ // Size = 12 point
+ $"000C"
+ // Color, RGB
+ $"0000 0000 0000"
+};
+__EOT__
+ close(*RESOURCE);
+
+ return 1;
+}
+
+# pathSplit($pathname)
+#
+# Splits $pathname into an array of path components.
+sub pathSplit($) {
+ my($pathname);
+ ($pathname) = @_;
+ return split(/\//, $pathname);
+}
+
+# setAttributes($root, @attributeList)
+#
+# @attributeList is an array, each element of which must be in the form
+# <a>:<file>. <a> is a list of attributes, per SetFile. <file> is a file
+# which is taken as relative to $root (even if it appears as an absolute
+# path.) SetFile is called to set the attributes on each file in
+# @attributeList.
+sub setAttributes($@) {
+ my(@attributes, $root);
+ ($root, @attributes) = @_;
+ my($attribute);
+ foreach $attribute (@attributes) {
+ my($attrList, $file, @fileList, @fixedFileList);
+ ($attrList, @fileList) = split(/:/, $attribute);
+ if(!defined($attrList) || !@fileList) {
+ cleanupDie('--attribute requires <attributes>:<file>');
+ }
+ @fixedFileList=();
+ foreach $file (@fileList) {
+ if($file =~ /^\//) {
+ push(@fixedFileList, $root.$file);
+ }
+ else {
+ push(@fixedFileList, $root.'/'.$file);
+ }
+ }
+ if(command($gConfig{'cmd_SetFile'}, '-a', $attrList, @fixedFileList)) {
+ cleanupDie('SetFile failed to set attributes');
+ }
+ }
+ return;
+}
+
+sub trapSignal($) {
+ my($signalName);
+ ($signalName) = @_;
+ cleanupDie('exiting on SIG'.$signalName);
+}
+
+sub usage() {
+ print STDERR (
+"usage: pkg-dmg --source <source-folder>\n".
+" --target <target-image>\n".
+" [--format <format>] (default: UDZO)\n".
+" [--volname <volume-name>] (default: same name as source)\n".
+" [--tempdir <temp-dir>] (default: same dir as target)\n".
+" [--mkdir <directory>] (make directory in image)\n".
+" [--copy <source>[:<dest>]] (extra files to add)\n".
+" [--symlink <source>[:<dest>]] (extra symlinks to add)\n".
+" [--license <file>] (plain text license agreement)\n".
+" [--resource <file>] (flat .r files to merge)\n".
+" [--icon <icns-file>] (volume icon)\n".
+" [--attribute <a>:<file>] (set file attributes)\n".
+" [--idme] (make Internet-enabled image)\n".
+" [--sourcefile] (treat --source as a file)\n".
+" [--verbosity <level>] (0, 1, 2; default=2)\n".
+" [--dry-run] (print what would be done)\n");
+ return;
+}
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/polipo.conf b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/polipo.conf
new file mode 100644
index 0000000..c7cabe7
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/polipo.conf
@@ -0,0 +1,161 @@
+### Basic configuration
+### *******************
+
+# Uncomment one of these if you want to allow remote clients to
+# connect:
+
+# proxyAddress = "::0" # both IPv4 and IPv6
+# proxyAddress = "0.0.0.0" # IPv4 only
+
+proxyAddress = "127.0.0.1"
+proxyPort = 8118
+
+# If you do that, you'll want to restrict the set of hosts allowed to
+# connect:
+
+# allowedClients = "127.0.0.1, 134.157.168.57"
+# allowedClients = "127.0.0.1, 134.157.168.0/24"
+
+allowedClients = 127.0.0.1
+allowedPorts = 1-65535
+
+# Uncomment this if you want your Polipo to identify itself by
+# something else than the host name:
+
+proxyName = "localhost"
+
+# Uncomment this if there's only one user using this instance of Polipo:
+
+cacheIsShared = false
+
+# Uncomment this if you want to use a parent proxy:
+
+# parentProxy = "squid.example.org:3128"
+
+# Uncomment this if you want to use a parent SOCKS proxy:
+
+socksParentProxy = "localhost:9050"
+socksProxyType = socks5
+
+
+### Memory
+### ******
+
+# Uncomment this if you want Polipo to use a ridiculously small amount
+# of memory (a hundred C-64 worth or so):
+
+# chunkHighMark = 819200
+# objectHighMark = 128
+
+# Uncomment this if you've got plenty of memory:
+
+# chunkHighMark = 50331648
+# objectHighMark = 16384
+
+chunkHighMark = 33554432
+
+### On-disk data
+### ************
+
+# Uncomment this if you want to disable the on-disk cache:
+
+diskCacheRoot = ""
+
+# Uncomment this if you want to put the on-disk cache in a
+# non-standard location:
+
+# diskCacheRoot = "~/.polipo-cache/"
+
+# Uncomment this if you want to disable the local web server:
+
+localDocumentRoot = ""
+
+# Uncomment this if you want to enable the pages under /polipo/index?
+# and /polipo/servers?. This is a serious privacy leak if your proxy
+# is shared.
+
+# disableIndexing = false
+# disableServersList = false
+
+disableLocalInterface = true
+disableConfiguration = true
+
+### Domain Name System
+### ******************
+
+# Uncomment this if you want to contact IPv4 hosts only (and make DNS
+# queries somewhat faster):
+#
+# dnsQueryIPv6 = no
+
+# Uncomment this if you want Polipo to prefer IPv4 to IPv6 for
+# double-stack hosts:
+#
+# dnsQueryIPv6 = reluctantly
+
+# Uncomment this to disable Polipo's DNS resolver and use the system's
+# default resolver instead. If you do that, Polipo will freeze during
+# every DNS query:
+
+dnsUseGethostbyname = yes
+
+
+### HTTP
+### ****
+
+# Uncomment this if you want to enable detection of proxy loops.
+# This will cause your hostname (or whatever you put into proxyName
+# above) to be included in every request:
+
+disableVia = true
+
+# Uncomment this if you want to slightly reduce the amount of
+# information that you leak about yourself:
+
+# censoredHeaders = from, accept-language
+# censorReferer = maybe
+
+censoredHeaders = from,accept-language,x-pad,link
+censorReferer = maybe
+
+# Uncomment this if you're paranoid. This will break a lot of sites,
+# though:
+
+# censoredHeaders = set-cookie, cookie, cookie2, from, accept-language
+# censorReferer = true
+
+# Uncomment this if you want to use Poor Man's Multiplexing; increase
+# the sizes if you're on a fast line. They should each amount to a few
+# seconds' worth of transfer; if pmmSize is small, you'll want
+# pmmFirstSize to be larger.
+
+# Note that PMM is somewhat unreliable.
+
+# pmmFirstSize = 16384
+# pmmSize = 8192
+
+# Uncomment this if your user-agent does something reasonable with
+# Warning headers (most don't):
+
+# relaxTransparency = maybe
+
+# Uncomment this if you never want to revalidate instances for which
+# data is available (this is not a good idea):
+
+# relaxTransparency = yes
+
+# Uncomment this if you have no network:
+
+# proxyOffline = yes
+
+# Uncomment this if you want to avoid revalidating instances with a
+# Vary header (this is not a good idea):
+
+# mindlesslyCacheVary = true
+
+# Suggestions from Incognito configuration
+maxConnectionAge = 5m
+maxConnectionRequests = 120
+serverMaxSlots = 8
+serverSlots = 2
+tunnelAllowedPorts = 1-65535
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/qt.conf b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/qt.conf
new file mode 100644
index 0000000..ecb499a
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/qt.conf
@@ -0,0 +1,2 @@
+[Paths]
+Plugins =
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/vidalia.conf.sample b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/vidalia.conf.sample
new file mode 100644
index 0000000..7dac486
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/osx/vidalia.conf.sample
@@ -0,0 +1,9 @@
+[General]
+ProxyExecutable=/Applications/Vidalia.app/Contents/MacOS/polipo
+ProxyExecutableArguments=-c /Applications/Vidalia.app/Contents/Resources/polipo.conf
+RunProxyAtStart=true
+InterfaceStyle=Macintosh (Aqua)
+
+[Tor]
+TorExecutable=/Applications/Vidalia.app/Contents/MacOS/tor
+DataDirectory=~/.tor/
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/package.sh b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/package.sh
new file mode 100755
index 0000000..e69ba7b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/package.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+##
+## $Id: package.sh 3933 2009-07-02 00:32:59Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+# Builds distribution packages for various platforms.
+
+# Check for proper script arguments
+if [ "$#" -eq 0 ]
+then
+ echo "Usage: $0 <rpm>"
+ exit 1
+fi
+
+# Make the distribution depending on what type was requested
+case "$1" in
+#
+# rpm package
+#
+"rpm")
+ if [ $# -ne 2 ]
+ then
+ echo "Usage: $0 rpm <path-to-vidalia-source-tarball>"
+ exit 1
+ fi
+ vidalia_source_path="$2"
+ pushd rpm
+ rpmbuild -ba --define "_sourcedir $vidalia_source_path" vidalia.spec
+ popd
+ ;;
+
+# Invalid
+#
+*)
+ echo "Unrecognized distribution type."
+ ;;
+esac
+
+exit $?
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/rpm/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/rpm/CMakeLists.txt
new file mode 100644
index 0000000..857ca69
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/rpm/CMakeLists.txt
@@ -0,0 +1,17 @@
+##
+## $Id: CMakeLists.txt 2858 2008-07-13 04:29:06Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+## RPM Spec File
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/vidalia.spec.in
+ ${CMAKE_CURRENT_BINARY_DIR}/vidalia.spec
+)
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/rpm/vidalia.spec.in b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/rpm/vidalia.spec.in
new file mode 100644
index 0000000..0cb7212
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/rpm/vidalia.spec.in
@@ -0,0 +1,141 @@
+Name: vidalia
+Version: @VERSION@
+Release: 1%{?dist}
+Summary: GUI controller for the Tor Onion Routing Network
+
+Group: Applications/Internet
+License: GPLv2+
+URL: https://www.torproject.org/vidalia/
+Source0: https://www.torproject.org/%{name}/dist/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: desktop-file-utils
+BuildRequires: openssl-devel
+BuildRequires: qt4-devel
+BuildRequires: cmake
+
+Requires: tor
+Requires: privoxy
+Requires: hicolor-icon-theme
+
+
+%description
+Vidalia is a cross-platform controller GUI for Tor, built using the Qt
+framework. Vidalia allows you to start and stop Tor, view the status of Tor at
+a glance, and monitor Tor's bandwidth usage. Vidalia also makes it easy to
+contribute to the Tor network by helping you setup a Tor server, if you wish.
+
+
+%package doc
+Summary: Documentation for %{name}
+Group: Documentation
+BuildRequires: doxygen
+Requires: %{name} = %{version}-%{release}
+
+
+%description doc
+Doxygen generated documentations for %{name}.
+
+
+%prep
+%setup -q
+
+
+%build
+%if 0%{?_qt4_bindir:1}
+PATH=%{_qt4_bindir}:$PATH; export PATH
+%else
+PATH=%{_libdir}/qt4/bin:$PATH; export PATH
+%endif
+
+%cmake .
+
+make %{?_smp_mflags}
+
+cd doc
+doxygen Doxyfile.in
+
+
+%install
+rm -rf %{buildroot}
+
+make install \
+ INSTALL="install -p" \
+ DESTDIR=%{buildroot}
+
+install -Dpm0644 doc/%{name}.1 \
+ %{buildroot}%{_mandir}/man1/%{name}.1
+
+
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/
+
+cp -r src/%{name}/help/ \
+ %{buildroot}%{_docdir}/%{name}-%{version}-doxygen/
+
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc CHANGELOG CREDITS HACKING LICENSE LICENSE-GPLV2 LICENSE-GPLV3 LICENSE-OPENSSL README
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}*
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+
+
+%files doc
+%defattr(-,root,root,-)
+%{_docdir}/%{name}-%{version}-doxygen/
+
+
+%changelog
+* Fri Jan 29 2010 Erinn Clark <erinn at torproject.org> - 0.2.7-1
+- New upstream release
+- Updated documentation installation process
+
+* Sat Jun 13 2009 Matt Edman <edmanm at vidalia-project.net> - 0.2.1-1
+- Added to Vidalia Subversion repository
+
+* Mon Jun 01 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.13-2
+- Merge builds for fedora and epel
+
+* Mon Jun 01 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.13-1
+- Update to 0.1.13
+- Adjust to fedora and epel
+
+* Sun Apr 06 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.12-1
+- New upstream release
+- Correct typo in URL
+- Add R: hicolor for new handling of icons
+- Add update-icon-cache sniplet
+- Use summary of upstream for Desktopfile and in spec file
+- Create doxygen-documentations
+
+* Sun Feb 15 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.10-2
+- Correct Qt in Summary
+- Correct Qt in desktop-file-source
+- Add a german Translation in the desktop-file-source
+- Using CMAKE-macro instead of cmake
+- Add more files to more documentation
+
+* Tue Feb 10 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.1.10-1
+- Initial Package build
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/CMakeLists.txt
new file mode 100644
index 0000000..8035b82
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/CMakeLists.txt
@@ -0,0 +1,175 @@
+##
+## $Id: CMakeLists.txt 4293 2010-05-18 00:17:31Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+if (MINGW)
+ if (NOT MINGW_BINARY_DIR)
+ set(MINGW_BINARY_DIR ${Vidalia_BINARY_DIR}/bin)
+ endif(NOT MINGW_BINARY_DIR)
+endif(MINGW)
+
+if (USE_QSSLSOCKET)
+ if (NOT OPENSSL_BINARY_DIR)
+ set(OPENSSL_BINARY_DIR ${Vidalia_BINARY_DIR}/bin)
+ endif(NOT OPENSSL_BINARY_DIR)
+endif(USE_QSSLSOCKET)
+
+## Only configure the bundle installer if paths to Tor, Polipo, and
+## Torbutton are specified
+set(CONFIGURE_BUNDLE_NSI TRUE)
+if (NOT TOR_PACKAGE_DIR)
+ set(CONFIGURE_BUNDLE_NSI FALSE)
+endif(NOT TOR_PACKAGE_DIR)
+if (NOT POLIPO_PACKAGE_DIR)
+ set(CONFIGURE_BUNDLE_NSI FALSE)
+endif(NOT POLIPO_PACKAGE_DIR)
+if (NOT TORBUTTON_PACKAGE_DIR)
+ set(CONFIGURE_BUNDLE_NSI FALSE)
+endif(NOT TORBUTTON_PACKAGE_DIR)
+
+## Windows Packages
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/vidalia.wxs.in
+ ${CMAKE_CURRENT_BINARY_DIR}/vidalia.wxs
+ @ONLY
+)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/polipo.wxs.in
+ ${CMAKE_CURRENT_BINARY_DIR}/polipo.wxs
+ @ONLY
+)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/thandy.wxs.in
+ ${CMAKE_CURRENT_BINARY_DIR}/thandy.wxs
+ @ONLY
+)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/torbutton.wxs.in
+ ${CMAKE_CURRENT_BINARY_DIR}/torbutton.wxs
+ @ONLY
+)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/tor.wxs.in
+ ${CMAKE_CURRENT_BINARY_DIR}/tor.wxs
+ @ONLY
+)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/WixUI_Custom.wxs
+ ${CMAKE_CURRENT_BINARY_DIR}/WixUI_Custom.wxs
+ COPYONLY
+)
+
+if (CONFIGURE_BUNDLE_NSI)
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/vidalia-bundle.nsi.in
+ ${CMAKE_CURRENT_BINARY_DIR}/vidalia-bundle.nsi
+ @ONLY
+ )
+else(CONFIGURE_BUNDLE_NSI)
+ message(STATUS "Skipping vidalia-bundle.nsi.in")
+endif(CONFIGURE_BUNDLE_NSI)
+
+## Convert the .po files to NSIS .nsh files at build time
+vidalia_add_nsh(vidalia_NSH
+ cs/vidalia_cs.po CZECH ISO-8859-2)
+vidalia_add_nsh(vidalia_NSH
+ de/vidalia_de.po GERMAN ISO-8859-1)
+vidalia_add_nsh(vidalia_NSH
+ en/vidalia_en.po ENGLISH ISO-8859-1)
+vidalia_add_nsh(vidalia_NSH
+ es/vidalia_es.po SPANISH ISO-8859-1)
+vidalia_add_nsh(vidalia_NSH
+ fa/vidalia_fa.po FARSI ISO-8859-6)
+vidalia_add_nsh(vidalia_NSH
+ fi/vidalia_fi.po FINNISH ISO-8859-1)
+vidalia_add_nsh(vidalia_NSH
+ fr/vidalia_fr.po FRENCH ISO-8859-1)
+vidalia_add_nsh(vidalia_NSH
+ he/vidalia_he.po HEBREW ISO-8859-8)
+vidalia_add_nsh(vidalia_NSH
+ it/vidalia_it.po ITALIAN ISO-8859-1)
+vidalia_add_nsh(vidalia_NSH
+ nl/vidalia_nl.po DUTCH ISO-8859-1)
+vidalia_add_nsh(vidalia_NSH
+ pl/vidalia_pl.po POLISH ISO-8859-2)
+vidalia_add_nsh(vidalia_NSH
+ pt/vidalia_pt.po PORTUGUESE ISO-8859-1)
+vidalia_add_nsh(vidalia_NSH
+ ro/vidalia_ro.po ROMANIAN ISO-8859-2)
+vidalia_add_nsh(vidalia_NSH
+ ru/vidalia_ru.po RUSSIAN Windows-1251)
+vidalia_add_nsh(vidalia_NSH
+ sv/vidalia_sv.po SWEDISH ISO-8859-1)
+#vidalia_add_nsh(vidalia_NSH
+# zh_CN/vidalia_zh_CN.po SIMPCHINESE GB18030)
+#vidalia_add_nsh(vidalia_NSH
+# zh_TW/vidalia_ZH_TW.po TRADCHINESE GB18030)
+
+add_custom_target(i18n-win32-installer DEPENDS ${vidalia_NSH})
+
+## Convert the .po files to WiX .wxl files at build time
+vidalia_add_wxl(vidalia_WXL
+ cs/vidalia_cs.po cs ISO-8859-2)
+vidalia_add_wxl(vidalia_WXL
+ de/vidalia_de.po de ISO-8859-1)
+vidalia_add_wxl(vidalia_WXL
+ en/vidalia_en.po en ISO-8859-1)
+vidalia_add_wxl(vidalia_WXL
+ es/vidalia_es.po es ISO-8859-1)
+vidalia_add_wxl(vidalia_WXL
+ fa/vidalia_fa.po fa ISO-8859-6)
+vidalia_add_wxl(vidalia_WXL
+ fi/vidalia_fi.po fi ISO-8859-1)
+vidalia_add_wxl(vidalia_WXL
+ fr/vidalia_fr.po fr ISO-8859-1)
+vidalia_add_wxl(vidalia_WXL
+ he/vidalia_he.po he ISO-8859-8)
+vidalia_add_wxl(vidalia_WXL
+ it/vidalia_it.po it ISO-8859-1)
+vidalia_add_wxl(vidalia_WXL
+ nl/vidalia_nl.po nl ISO-8859-1)
+vidalia_add_wxl(vidalia_WXL
+ pl/vidalia_pl.po pl ISO-8859-2)
+vidalia_add_wxl(vidalia_WXL
+ pt/vidalia_pt.po pt ISO-8859-1)
+vidalia_add_wxl(vidalia_WXL
+ ro/vidalia_ro.po ro ISO-8859-2)
+vidalia_add_wxl(vidalia_WXL
+ ru/vidalia_ru.po ru 1251)
+vidalia_add_wxl(vidalia_WXL
+ sv/vidalia_sv.po sv ISO-8859-1)
+vidalia_add_wxl(vidalia_WXL
+ zh_CN/vidalia_zh_CN.po zh-CN 936)
+vidalia_add_wxl(vidalia_WXL
+ zh_TW/vidalia_ZH_TW.po zh-TW 950)
+
+add_custom_target(dist-win32
+ COMMAND ${WIX_CANDLE_EXECUTABLE}
+ ${CMAKE_CURRENT_BINARY_DIR}/vidalia.wxs
+ -o ${CMAKE_CURRENT_BINARY_DIR}/vidalia.wixobj
+
+ COMMAND ${WIX_CANDLE_EXECUTABLE}
+ ${CMAKE_CURRENT_BINARY_DIR}/WixUI_Custom.wxs
+ -o ${CMAKE_CURRENT_BINARY_DIR}/WixUI_Custom.wixobj
+
+ COMMAND ${WIX_LIGHT_EXECUTABLE}
+ ${CMAKE_CURRENT_BINARY_DIR}/vidalia.wixobj
+ ${CMAKE_CURRENT_BINARY_DIR}/WixUI_Custom.wixobj
+ -o ${Vidalia_BINARY_DIR}/vidalia-${VERSION}.msi
+ -ext ${WIX_BINARY_DIR}/WixUIExtension.dll
+
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vidalia.wxs
+ ${CMAKE_CURRENT_SOURCE_DIR}/WixUI_Custom.wxs
+ ${vidalia_WXL}
+
+ COMMENT "Building vidalia-${VERSION}.msi"
+)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/WixUI_Custom.wxs b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/WixUI_Custom.wxs
new file mode 100644
index 0000000..6f42d32
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/WixUI_Custom.wxs
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) Microsoft Corporation. All rights reserved.
+
+ The use and distribution terms for this software are covered by the
+ Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ which can be found in the file CPL.TXT at the root of this distribution.
+ By using this software in any fashion, you are agreeing to be bound by
+ the terms of this license.
+
+ You must not remove this notice, or any other, from this software.
+-->
+<!--
+ This file was modified for Vidalia (http://vidalia-project.net) and
+ is derived from WixUI_Mondo.wxs.
+-->
+<!--
+First-time install dialog sequence: Maintenance dialog sequence:
+ - WixUI_WelcomeDlg - WixUI_MaintenanceWelcomeDlg
+ - WixUI_SetupTypeDlg - WixUI_MaintenanceTypeDlg
+ - WixUI_VerifyReadyDlg - WixUI_CustomizeDlg
+ - WixUI_CustomizeDlg - WixUI_VerifyReadyDlg
+ - WixUI_DiskCostDlg
+ - WixUI_BrowseDlg
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment>
+ <UI Id="WixUI_Custom">
+ <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
+ <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
+ <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+
+ <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+ <Property Id="WixUI_Mode" Value="Mondo" />
+
+ <DialogRef Id="ErrorDlg" />
+ <DialogRef Id="FatalError" />
+ <DialogRef Id="FilesInUse" />
+ <DialogRef Id="MsiRMFilesInUse" />
+ <DialogRef Id="PrepareDlg" />
+ <DialogRef Id="ProgressDlg" />
+ <DialogRef Id="ResumeDlg" />
+ <DialogRef Id="UserExit" />
+
+ <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg">1</Publish>
+
+ <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+ <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ <Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
+ <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog"
+ Value="VerifyReadyDlg">1</Publish>
+
+ <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg"
+ Order="1">WixUI_InstallMode = "Change"</Publish>
+ <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg"
+ Order="2">WixUI_InstallMode = "InstallCustom"</Publish>
+ <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg"
+ Order="1">WixUI_InstallMode = "InstallCustom"</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg"
+ Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg"
+ Order="3">WixUI_InstallMode = "Change"</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg"
+ Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish>
+
+ <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog"
+ Value="MaintenanceTypeDlg">1</Publish>
+
+ <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog"
+ Value="CustomizeDlg">1</Publish>
+ <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog"
+ Value="VerifyReadyDlg">1</Publish>
+ <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog"
+ Value="VerifyReadyDlg">1</Publish>
+ <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog"
+ Value="MaintenanceWelcomeDlg">1</Publish>
+ </UI>
+
+ <UIRef Id="WixUI_Common" />
+ </Fragment>
+</Wix>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/af/vidalia_af.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/af/vidalia_af.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/af/vidalia_af.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ar/vidalia_ar.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ar/vidalia_ar.po
new file mode 100644
index 0000000..861af8b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ar/vidalia_ar.po
@@ -0,0 +1,290 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2010-05-03 12:15-0600\n"
+"Last-Translator: Anas Qtiesh <anasqtiesh 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"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "إعداد {BUNDLE_NAME}$"
+
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"هذه النافذة سترشدك خلال تنصيب تور وفيداليا وPolipo ومفتاح تور.\n"
+"\n"
+"تور عبارة عن برنامج لاستخدام الانترنت مع الحفاظ على مجهولية الهوية، بحيث "
+"يساعد في إخفاء هويتك أثناء التصفح والنشر على الانترنت، وبرامج التراسل الفوري "
+"وغيرها. فيداليا واجهة استخدام تساعدك في التحكم والمراقبة وضبط إعدادات تور.\n"
+"\n"
+"Polipo وكيل (بروكسي) انترنت يستخدم لحفظ ملفات مؤقتة تساعد في زيادة سرعة "
+"التصفح أثناء استخدام تور.\n"
+"\n"
+"مفتاح تور(Torbutton) هو إضافة لفايرفوكس تسمح لك بتشغيل أو تعطيل إخفاء الهوية "
+"أثناء التصفح وبسرعة وسهولة.\n"
+"\n"
+"إن كنت قد نصبت تور أو فيداليا أو Polipo أو فايرفوكس في السابق يرجى التأكد من "
+"أن أنهم غير مشغلين أثناء تنصيب البرنامج.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "أهلاً بكم إلى معالج إعداد ${BUNDLE_NAME}"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "مستندات تنصيب ${TOR_NAME}"
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"اكتملت عملية التنصيب.\n"
+"يرجى مراجعة https://www.torproject.org/docs/tor-doc-windows لتعلم كيفية ضبط "
+"إعدادات تطبيقاتك لاستخدام تور.\n"
+"\n"
+"إن كنت قد نصبت مفتاح تور سيتوجب عليك إعادة تشغيل فايرفوكس."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "قم بتشغيل البرنامج الآن"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "فيداليا هو واجهة استخدام تساعدك على التحكم والمراقبة وضبط إعدادات تور."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "إزالة ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} إعداد"
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"سيرشدك معالج الإعداد هذا خلال عملية تنصيب فيداليا، وهو واجهة استخدام تساعدك "
+"على التحكم والمراقبة وضبط إعدادات تور.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "أهلاً لكم في معالج إعداد ${VIDALIA_NAME}"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "${VIDALIA_NAME} الصفحة الرئيسية"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "فيداليا هي واجهة مستخدم تساعدك على التحكم ومراقبة وضبط تور."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "تشغيل عند إقلاع النظام"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "قم بتشغيل ${VIDALIA_NAME} بشكل تلقائي عند الإقلاع."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "أضف إلى قائمة إبدأ"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "أضف ${VIDALIA_NAME} إلى قائمة إبدأ"
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "قم بتشغيل ${VIDALIA_NAME}"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"تور عبارة عن برنامج لاستخدام الانترنت مع الحفاظ على مجهولية الهوية، بحيث "
+"يساعد في إخفاء هويتك أثناء التصفح والنشر على الانترنت، وبرامج التراسل الفوري "
+"وغيرها."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "إزالة ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "إعداد ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"لديك ملف ضبط إعدادات تور بشكل مسبق.$\n"
+"$\n"
+"هل تريد الكتابة فوقه بعينة ملف الإعداد الافتراضية؟"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "ملفات متعلقة"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "تنصيب مستندات ${TOR_NAME}."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "أضف إلى قائمة إبدأ"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "أضف ${TOR_NAME} إلى قائمة إبدأ"
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+"Polipo وكيل (بروكسي) انترنت يستخدم لحفظ ملفات مؤقتة تساعد في زيادة سرعة "
+"التصفح أثناء استخدام تور."
+
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "إزالة ${POLIPO_DESC}."
+
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "تنصيب ${POLIPO_DESC}."
+
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "أضف إلى قائمة إبدأ"
+
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "أضف ${POLIPO_NAME} إلى قائمة إبدأ"
+
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "تشغيل عند إقلاع النظام"
+
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "تشغيل ${POLIPO_NAME} عند إقلاع الحاسب."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"مفتاح تور هو إضافة لفايرفوكس تسمح لك بتشغيل أو تعطيل إخفاء الهوية أثناء "
+"التصفح بسرعة وسهولة."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "إزالة ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "إعداد ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "أضف إلى فايرفوكس"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "أضف ملحق ${TORBUTTON_DESC} للفايرفوكس"
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "لم نعثر على فايرفوكس على جهازك. لن يتم تنصيب مفتاح تور (Torbutton)."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "بيانات التطبيق"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "إمسح بيانات التطبيق المحفوظة وملفات الإعدادات."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "إنكليزي"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "فايرفوكس غير مثبت"
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr "ينصح بتثبيت فايرفوكس قبل الإستمرار، لأفضل حماية."
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"متصفح موزيلا فايفوكس غير مثبت في حاسوبك.\n"
+"تور يعمل مع باقي المتصفحات، مثل الإنترنت إكسبلورر، ولكن\n"
+"من السهل إسنعماله مع الفايرفوكس، الذي يقوم بحماية هويتك بشكل أفضل.\n"
+"\n"
+"إذا اردت تنصيب فايرفوكس, رجاءاً إضغط على إلغاء، ثم إذهب \n"
+"إلى صفحة تحميل فايرفوكس على"
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+"بعد اتمام تنصيب فايرفوكس، يمكنك تشغيل\n"
+"ملف تنصيب تور مرة أخرى.\n"
+"\n"
+"أو إذا كنت تفضل تثبيت تور بدون فايرفوكس، ببساطة\n"
+"إضغط \"التالي\" للاستمرار"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/bg/vidalia_bg.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/bg/vidalia_bg.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/bg/vidalia_bg.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/bms/vidalia_bms.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/bms/vidalia_bms.po
new file mode 100755
index 0000000..7c7c932
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/bms/vidalia_bms.po
@@ -0,0 +1,267 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2009-10-19 08:32+0000\n"
+"Last-Translator: H2A <htaike2aung 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"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} ထည့္သြင္းျခင္း"
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+"ဤ တဆင့္ျခင္းထည့္သြင္းျခင္း လုပ္ငန္းမွ Tor, Vidalia, Privoxy ႏွင့္ Torbutton "
+"ထည့္သြင္းျခင္းမ်ားကုိ သင့္အား လမ္းညႊန္ေပးပါမည္။\n"
+"\n"
+"Tor ဆိုသည္မွာ အင္တာနက္ အမည္မသိသံုးစဲြမႈ၊ ဝက္ဘ္သံုးစဲြျခင္း ႏွင့္ "
+"ထုတ္လႊင့္ျခင္း၊ သတင္းအခ်က္အလက္ အျမန္ခ်က္ခ်င္းပို႕ျခင္း၊ IRC ႏွင့္ အျခားေသာ "
+"လုပ္ငန္းမ်ားအတြက္ သင့္ကုိ ကူညီေပးေသာ စနစ္တစ္ခုျဖစ္ပါသည္။ Vidalia ဆိုသည္မွာ "
+"GUI တစ္ခုျဖစ္ျပီး Tor ကုိ ထိန္းခ်ဳပ္ရန္၊ ေစာင့္ၾကပ္ၾကည့္ရႈရန္ႏွင့္ "
+"ျပင္ဆင္ထိန္းညိႇမႈမ်ား ျပဳလုပ္ရန္ သင့္ကုိ ကူညီေပးပါသည္။ \n"
+"\n"
+"Pivoxy ဆိုသည္မွာ သင္၏ ကုိယ္ေရးအခ်က္အလက္မ်ားကုိ ကာကြယ္ရန္အတြက္ Web proxy ကုိ "
+"စစ္ထုတ္ျခင္းျဖစ္၍ ေၾကာျငာမ်ား၊ ဘန္နာမ်ား၊ popups မ်ားကို ဖယ္ရွားရန္ "
+"ကူညီေပးပါသည္။ \n"
+"\n"
+"Torbutton ဆုိသည္မွာ Firefox extension တစ္ခု ျဖစ္ျပီး အမည္မသိ Web "
+"အသံုးျပဳျခင္းကုိ ျမန္ဆန္စြာ အသံုးျပဳရန္/အသံုးမျပဳရန္ ခြင့္ျပဳေပးပါသည္။ \n"
+"\n"
+"ယခင္ ထည့္သြင္းထားေသာ Tor, Vidalia, Privoxy, သို႕မဟုတ္ Firefox တို႕ရွိလွ်င္ ဤ "
+"ထည့္သြင္းျခင္း မျပဳလုပ္မီ ၄င္းတို႕ ကို ဖြင့္လွစ္ထားရွိျခင္း မရွိေစရန္ "
+"ျပဳလုပ္ပါ။ \n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "${BUNDLE_NAME} ထည့္သြင္းျခင္းလုပ္ငန္းမွ ၾကိဳဆိုပါသည္။"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "${TOR_NAME} ထည့္သြင္းျခင္း မွတ္တမ္းမွတ္ရာမ်ား"
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"ထည့္သြငး္ျခင္း လုပ္ငန္းမ်ား ျပီးစီးပါျပီ။ \n"
+"ေက်းဇူးျပဳ၍ https://www.torproject.org/docs/tor-doc-windows တြင္ သင္၏ "
+"application မ်ားအတြက္ Tor အသံုးျပဳရန္ မည္သို႕ ျပင္ဆင္ရမည္ကုိ ေလ့လာဖတ္ရႈပါ။\n"
+"\n"
+"Torbutton ကုိ ထည့္သြင္းခဲ့လွ်င္ Firefox ကုိ ျပန္လည္ စတင္ရန္ လိုအပ္ပါသည္။"
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "ထည့္သြင္းထားေသာ အစိတ္အပိုင္းမ်ား ကုိ ယခု စတင္ပါ"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia ဆိုသည္မွာ GUI တစ္ခုျဖစ္ျပီး Tor ကုိ ထိန္းခ်ဳပ္ရန္၊ "
+"ေစာင့္ၾကပ္ၾကည့္ရႈရန္ႏွင့္ ျပင္ဆင္မႈမ်ား ျပဳလုပ္ရန္ ကူညီေပးပါသည္"
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "${VIDALIA_DESC} ကုိ ဖယ္ရွားပါ"
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} ထည့္သြင္းျခင္း"
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+"ဤ တစ္ဆင့္ျခင္း ထည့္သြင္းျခင္းလုပ္ငန္းမွ GUI တစ္ခုျဖစ္ျပီး Tor ကုိ "
+"ထိန္းခ်ဳပ္ရန္၊ ေစာင့္ၾကပ္ၾကည့္ရႈရန္ႏွင့္ ျပင္ဆင္မႈမ်ား ျပဳလုပ္ရန္ ကူညီေပးေသာ "
+"Vidalia ထည့္သြင္းျခင္း ကုိ ကူညီလမ္းညႊန္ေပးပါမည္။ \n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "${VIDALIA_NAME} ထည့္သြင္းျခင္းမွ ၾကိဳဆိုပါသည္"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "${VIDALIA_NAME} မူလစာမ်က္ႏွာ"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia ဆိုသည္မွာ GUI တစ္ခုျဖစ္ျပီး Tor ကုိ ထိန္းခ်ဳပ္ရန္၊ "
+"ေစာင့္ၾကပ္ၾကည့္ရႈရန္ႏွင့္ ျပင္ဆင္မႈမ်ား ျပဳလုပ္ရန္ ကူညီေပးပါသည္"
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "စတင္ေသာ အဆင့္တြင္ အလုပ္လုပ္ေဆာင္ပါ"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "${VIDALIA_NAME} စတင္ေသာ အဆင့္တြင္ အလိုအေလ်ာက္ အလုပ္လုပ္ေဆာင္ပါ"
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Start Menu ထဲသို႕ ထည့္သြင္းပါ"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "${VIDALIA_NAME} ကို Start Menu ထဲသို႕ ထည့္သြင္းပါ"
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "${VIDALIA_NAME} ကုိ လုပ္ေဆာင္ပါ"
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor ဆိုသည္မွာ အမည္မသိ အင္တာနက္ အသံုးျပဳျခင္း၊ အမည္မသိ Web အသံုးျပဳျခင္းႏွင့္ "
+"ထုတ္လႊင့္ျခင္း၊ ခ်က္ခ်င္းပို႕ မက္ေဆ့လုပ္ငန္း၊ IRC ႏွင့္ အျခား "
+"လုပ္ငန္းမ်ားကို ကူညီေပးပါသည္။"
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "${TOR_DESC} ကုိ ဖယ္ရွားပါ"
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "${TOR_DESC} ကုိ ထည့္သြင္းပါ"
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"သင့္ထံတြင္ Tor ျပင္ဆင္မႈ ဖုိင္ ရွိျပီး ျဖစ္ပါသည္။$\n"
+"$\n"
+"၄င္း ဖုိင္ကုိ မူလ ရိုးရွင္းေသာ ျပင္ဆင္မႈဖုိင္ႏွင့္ အစားထုိးလိုပါသလား ?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "မွတ္တမ္းမွတ္ရာမ်ား"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "${TOR_NAME} မွတ္တမ္းမွတ္ရာမ်ားကုိ ထည့္သြင္းပါ"
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Start Menu သို႕ ထည့္သြင္းပါ"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "${TOR_NAME} ကုိ Start Menu သို႕ ထည့္သြင္းပါ"
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+"Privoxy ဆိုသည္မွာ web proxy စစ္ထုတ္ေပးျခင္းျဖင့္ သင္၏ "
+"ကုိယ္ေရးအခ်က္အလက္မ်ားကုိ ကာကြယ္ေပးျပီး ေၾကာျငာမ်ား၊ ဘန္နာမ်ားႏွင့္ popups "
+"မ်ားကို ဖယ္ရွားေပးရန္ ကူညီေပးပါသည္"
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr "${PRIVOXY_DESC} ကုိ ဖယ္ရွားပါ"
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr "${PRIVOXY_DESC} ထည့္သြင္းပါ"
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr "Start Menu သို႕ ထည့္သြင္းပါ"
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr "${PRIVOXY_NAME} ကုိ သင္၏ Start Menu သုိ႕ ထည့္သြင္းပါ"
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr "စနစ္စတင္လွ်င္ စတင္ လုပ္ေဆာင္ပါ"
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr "${PRIVOXY_NAME} ကုိ စနစ္ စတင္လွ်င္ အလိုအေလွ်ာက္ စတင္လုပ္ေဆာင္ပါ"
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+"Torbutton ဆိုသည္မွာ Firefox extension တစ္ခု ျဖစ္ျပီး အမည္မသိ web browsing "
+"ျပဳလုပ္ခြင့္/မျပဳလုပ္ခြင့္ကုိ လ်င္ျမန္စြာ ေျပာင္းလဲေစႏိုင္ပါသည္"
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "${TORBUTTON_DESC} ကုိ ဖယ္ရွားပါ"
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "${TORBUTTON_DESC} ကုိ ထည့္သြင္းပါ"
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Firefox သို႕ ထည့္သြင္းပါ"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "${TORBUTTON_DESC} extension ကို Firefox သို႕ ထည့္သြင္းပါ"
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+"သင္၏ စနစ္အတြင္း Firefox မေတြ႕ရွိပါ။ Torbutton ကုိ ထည့္သြင္းျခင္း မျပဳလုပ္ပါ"
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Application အခ်က္အလက္မ်ား"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Application အခ်က္အလက္မ်ားႏွင့္ ျပင္ဆင္မႈ ဖုိင္မ်ားကုိ ဖယ္ရွားရန္"
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "en"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Firefox ထည့္သြင္းမႈ မရွိပါ"
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+"ေရွ႕ဆက္ မလုပ္ေဆာင္မီ အေကာင္းဆံုး လံုျခံဳမႈအတြက္ Firefox ကုိ ထည့္သြင္းရန္ "
+"အၾကံျပဳပါသည္"
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"The Mozilla Firefox Web browser ကုိ သင္၏ စနစ္အတြင္း ထည့္သြင္းမထားပါ\n"
+"Tor သည္ အျခား browsers မ်ား ဥပမာ Internet Explorer တို႕ျဖင့္ "
+"အလုပ္လုပ္ႏုိင္ေသာ္လည္း \n"
+"Firefox ႏွင့္ အသံုးျပဳလွ်င္ ပိုမိုလြယ္ကူျပီး \n"
+"သင္၏ အမည္လွ်ိဳ႕ဝွက္မႈကုိ ပိုမိုေကာင္းမြန္စြာ ျပဳလုပ္ေစႏုိင္ပါသည္\n"
+"Firefox ကုိ ထည့္သြင္းလိုလွ်င္ Cancel ကို ကလစ္ႏွိပ္၍\n"
+"Firefox Download page သို႕ သြားပါ"
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+"Firefox ထည့္သြင္းျခင္း ျပီးစီးလွ်င္ \n"
+"Tor ထည့္သြင္းမႈကုိ ျပန္လည္ လုပ္ေဆာင္ ႏုိင္ပါသည္\n"
+"\n"
+"သုိ႕မဟုတ္ Firefox ထည့္သြင္းျခင္း မျပဳဘဲ Tor ကို ထည့္သြင္းလုိပါလွ်င္ \n"
+"Next ကုိ ႏွိပ္၍ ဆက္လက္လုပ္ေဆာင္ႏုိင္ပါသည္"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/bo/vidalia_bo.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/bo/vidalia_bo.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/bo/vidalia_bo.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/build-bundle-installer.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/build-bundle-installer.txt
new file mode 100644
index 0000000..1657428
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/build-bundle-installer.txt
@@ -0,0 +1,53 @@
+ Building the Vidalia/Tor/Polipo/Torbutton Bundle
+
+
+1. Create a base directory under which the necessary sources will be extracted
+and place vidalia-bundle.nsi and all language-specific .nsh files in it. For
+this example, we will just use C:\bundle\.
+
+ C:\bundle\vidalia-bundle.nsi
+ C:\bundle\vidalia_en.nsh
+ [...]
+ C:\bundle\vidalia_ru.sh
+
+
+2. Create directories for each component in the bundle.
+
+ C:\bundle\polipo\
+ C:\bundle\tor\
+ C:\bundle\vidalia\
+ C:\bundle\torbutton\
+
+3. Modify the appropriate version values (VIDALIA_APPVERSION, TOR_APPVERSION,
+POLIPO_APPVERSION, and TORBUTTON_APPVERSION) at the top of vidalia-bundle.nsi.
+
+4. Create directories for the appropriate versions of each component.
+
+ C:\bundle\polipo\1.0.4\
+ C:\bundle\tor\0.2.1.19\
+ C:\bundle\vidalia\0.2.3\
+ C:\bundle\torbutton\1.2.2\
+
+5. Install Vidalia, Tor, and Polipo to the directories you created for them
+in Step 4. Remember that you may need to grab the torrc.sample file from
+%APPDATA%\Tor that was created by Tor's installer and place it in the directory
+for the bundle's version of Tor. You may also need to grab
+%APPDATA%\Vidalia\geoip-cache, or a geoip-cache from Vidalia's source
+repository, and place it in the directory for the bundle's version of
+Vidalia.
+
+6. Place the Torbutton Firefox extension (.xpi) and license file (LICENSE) in
+the directory you created for it in Step 4.
+
+7. Place the polipo.conf into the polipo directory you created in Step 4.
+
+8. Run the vidalia-bundle.nsi script. The bundle will be named according the
+the versions you specified in Step 4 and placed in the base directory created
+in Step 1.
+
+--------------------------------------------------------------------------------
+
+For each additional release of some component of the bundle, follow Steps 4-8.
+If the version of some component didn't change, you can skip its step. For
+example, if the version of polipo didn't change then you can skip Step 7.
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/build-vidalia-installer.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/build-vidalia-installer.txt
new file mode 100644
index 0000000..7aaf896
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/build-vidalia-installer.txt
@@ -0,0 +1,149 @@
+$Id: build-vidalia-installer.txt 4165 2009-11-14 01:20:44Z edmanm $
+
+ Building a Windows Vidalia Installer
+
+0. Introduction
+
+This document describes the procedure for building an executable Windows
+installer for Vidalia. For information on building a Windows bundle installer,
+please see Vidalia's pkg/win32/build-bundle.txt.
+
+You will all of the prerequisites necessary for building Vidalia, such as
+Qt and CMake. These requirements are detailed in the INSTALL file, in the
+root of Vidalia's source tree. If you need to build OpenSSL from source
+(Step 2 below), you will also need Microsoft Visual Studio installed.
+These instructions were tested with Visual Studio 2008 Professional, but
+may work with earlier versions of Visual Studio as well.
+
+To sign the resulting installer suitable for distribution, you will need to
+install GnuPG or PGP. GnuPG can be downloaded here:
+
+ http://www.gnupg.org/download/index.html
+
+
+The following steps describe the process used to create Vidalia's
+"release" installers. Note that these instructions use the character ">"
+to represent a command prompt. Yours probably looks slightly different.
+
+
+1. Install the Windows Installer XML Toolset
+
+Vidalia uses the Windows Installer XML Toolset (WiX) to create a .msi
+installer file from a source file generated from pkg/win32/vidalia.wxs.in,
+so you must have WiX 3.0 or later installed. This only needs to be done
+once.
+
+If you already have WiX installed, you can skip to the next step.
+Otherwise, download and run the most recent WiX installer from here:
+
+ http://wix.sourceforge.net/downloadv3.html
+
+
+2. Download and build OpenSSL
+
+The OpenSSL DLL files shipped in Vidalia's Windows installers are compiled
+with the static version of the Microsoft Visual C Runtime (MSVCRT). Doing
+so allows Qt's OpenSSL support to function on computers without the latest
+MSVCRT installed, which is important for portable installations such as
+the Tor Browser Bundle.
+
+If you have previously completed this step, you can skip to Step 3. If you
+do not want to compile OpenSSL from source, you can use the pre-built
+OpenSSL libraries available here:
+
+ http://pasiphae.cs.rpi.edu/~edmanm/vidalia/openssl-0.9.8k.zip
+ http://pasiphae.cs.rpi.edu/~edmanm/vidalia/openssl-0.9.8k.zip.asc (sig)
+
+Otherwise, continue with the steps below.
+
+2.1. Download the OpenSSL 0.9.8k source code from here:
+
+ http://www.openssl.org/source/
+
+You should verify PGP signature or SHA1 hash of the file you download.
+
+2.2. Extract the source code to a directory on your hard drive. In the
+interest of simplifying exposition, let %OPENSSLDIR% denote the location
+to which you extract the OpenSSL source code.
+
+2.3. Configure the OpenSSL source code by running:
+
+ > perl Configure VC-WIN32 --prefix=C:/OpenSSL/0.9.8k
+
+You can replace "C:/OpenSSL/0.9.8k" with another directory of your choice,
+but you MUST use forward slashes in the path.
+
+2.4. Build the assembly language files by running:
+
+ > ms\do_masm
+
+2.5. Open ms\ntdll.mak in a text editor and find the line that starts with
+"CFLAG=". Change the "/MD" argument near the start of that line to "/MT".
+
+2.6. In the same file, find the line that starts with "LFLAGS". Add the
+argument "/manifest:no" to the end of it. Save your changes and close the
+editor.
+
+2.7. From a Visual Studio command prompt, compile OpenSSL by running:
+
+ > nmake -f ms\ntdll.mak
+
+2.8. After OpenSSL has finished compiling, you can test and install it by
+running:
+
+ > nmake -f ms\ntdll.mak test
+ > nmake -f ms\ntdll.mak install
+
+2.9. After the "install" command completes, your OpenSSL libraries will be
+copied to the install prefix specified in Step 2.3 above.
+
+
+3. Compile a 'release' Version of Vidalia
+
+3.1. First, extract Vidalia's source to a directory, or fetch the latest
+revision from our Subversion repository.
+
+ https://trac.vidalia-project.net/wiki/GettingTheCode
+
+3.2. In the root of Vidalia's source tree, create a build directory and
+'cd' into it:
+
+ > mkdir build
+ > cd build
+
+3.3. Configure Vidalia as follows:
+
+ > cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=minsizerel \
+ -DMINGW_BINARY_DIR=C:\<PathToMinGW>\bin \
+ -DOPENSSL_BINARY_DIR=C:\<PathToOpenSSL>\bin \
+ -DWIX_BINARY_DIR=C:\<PathToWiX>\bin ..
+
+MINGW_BINARY_DIR should point to the MinGW installation directory that
+contains mingwm10.dll. OPENSSL_BINARY_DIR should point to the OpenSSL
+directory that contains ssleay32.dll and libeay32.dll. If you compiled
+OpenSSL from source in Step 2.
+
+3.4. Finally, compile Vidalia by running:
+
+ > make
+
+4. Create the Installer .msi File
+
+After the previous 'make' command has completed, you can run:
+
+ > make dist-win32
+
+When it completes, you will have a complete Vidalia installer located in
+the current directory named 'vidalia-$VERSION.msi', where $VERSION is the
+version of the Vidalia source code you compiled.
+
+
+4.1. Sign the completed installer (optional, recommended)
+
+From the root of Vidalia's source tree, run the following commands:
+
+ > gpg -ba vidalia-$VERSION.msi
+
+where "$VERSION" is replaced by the version of Vidalia for which you just
+built a Windows installer.
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ca/vidalia_ca.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ca/vidalia_ca.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ca/vidalia_ca.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/cs/vidalia_cs.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/cs/vidalia_cs.po
new file mode 100644
index 0000000..0abc3da
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/cs/vidalia_cs.po
@@ -0,0 +1,311 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia Windows Installers\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2008-09-13 21:15+0000\n"
+"Last-Translator: IgnoreRed <IgnoreRed at mailnarod.ru>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "Instalace ${BUNDLE_NAME}"
+
+#, fuzzy
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Tento průvodce vás provede instalací aplikací Tor, Vidalia, Privoxy a "
+"Torbutton.\n"
+"\n"
+"Tor je systém umožňující používat internet anonymně, který vám pomůže "
+"anonymně surfovat webem a publikovat informace, používat instant messaging, "
+"IRC a mnohem více. Vidalia je uživatelské rozhraní, které vám pomůže "
+"ovládat, monitorovat a konfigurovat Tor.\n"
+"\n"
+"Privoxy je filtrační web proxy, která ochrání vaše soukromí a pomůže "
+"odstranit reklamu, banery a popup okna.\n"
+"\n"
+"Torbutton je rozšíření Firefoxu, které vám umožní velmi snadno povolit, nebo "
+"zakázat anonymní surfování webem.\n"
+"\n"
+"Jestliže máte nainstalovánu předchozí verzi programů Tor, Vidalia, Privoxy, "
+"nebo Firefox prosím přesvěčte se, že nejsou spuštěny, před tím, než budete "
+"pokračovat v instalaci.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Vítejte v instalačním průvodci ${BUNDLE_NAME}"
+
+#
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "Instalace dokumentace aplikace ${TOR_NAME} "
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"Instalace je dokončena.\n"
+"Prosím navštivte https://www.torproject.org/docs/tor-doc-windows kde získáte "
+"více informací, jak nakonfigurovat aplikace tak, aby používaly Tor.\n"
+"\n"
+"Jestliže jste instalovali Torbutton, je nutné restartovat Firefox."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Spustit nainstalované komponenty nyní"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia je uživatelské rozhraní, které vám pomůže ovládat, monitorovat a "
+"konfigurovat Tor."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Odstranit ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "Instalace aplikace ${VIDALIA_NAME}"
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Tento průvodce vás provede instalací aplikace Vidalia, uživatelského "
+"rozhraní, které vám pomůže ovládat, monitorovat a konfigurovat Tor.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Vítejte v instalačním průvodci aplikace ${VIDALIA_NAME}"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "Domovská stránka aplikace ${VIDALIA_NAME}"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia je uživatelské rozhraní, které vám pomůže ovládat, monitorovat a "
+"konfigurovat Tor."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Spustit při startu"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Automaticky spustit aplikaci ${VIDALIA_NAME} při startu."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Přidat do Nabídky Start"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Přidat aplikaci ${VIDALIA_NAME} do vaší Nabídky start."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Spustit aplikaci ${VIDALIA_NAME}"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor je systém umožňující používat internet anonymně, který vám pomůže "
+"anonymně surfovat webem a publikovat informace, používat instant messaging, "
+"IRC a mnohem více."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Odstranit ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Instalovat ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Vy již máte Tor konfigurační soubor.$\n"
+"$\n"
+"Chcete jej přepsat defaultním ukázkovým konfiguračním souborem?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Dokumentace"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Instalovat ${TOR_NAME} dokumentaci."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Přidat do Nabídky start"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Přidat ${TOR_NAME} do vaší Nabídky start."
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+
+#, fuzzy
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "Odstranit ${POLIPO_DESC}."
+
+#, fuzzy
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "Instalovat ${POLIPO_DESC}."
+
+#, fuzzy
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "Přidat do Nabídky Start"
+
+#, fuzzy
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "Přidat ${POLIPO_NAME} do vaší Nabídky start."
+
+#, fuzzy
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "Spustit při startu"
+
+#, fuzzy
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "Automaticky spustit ${POLIPO_NAME} při startu."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton je rozšíření Firefoxu, které vám umožní jednoduše povolit, nebo "
+"zakázat anonymní surfování webem."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Odstranit ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Instalovat ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Přidat do Firefoxu"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Přidat rozšíření ${TORBUTTON_DESC} do Firefoxu."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "Firefox nebyl nalezen ve vašem systému. Torbutton nebude instalován."
+
+#
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Data Aplikací"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Odstranit uložená data aplikací a konfigurační soubory."
+
+#
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "cs"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Není nainstalován Firefox."
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+"Než budete pokračovat, doporučujeme nainstalovat prohlížeč Firefox, pro "
+"vyšší bezpečnost."
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"Webový prohlížeč Mozilla Firefox není ve vašem systému nainstalován.\n"
+"Tor pracuje i s jinými prohlížeči, jako je např. Internet Explorer,\n"
+"ale jeho použití je s Firefoxem snadnější, ten také lépe ochrání\n"
+"vaši anonymitu.\n"
+"\n"
+"Jestli si přejete nainstalovat Firefox, klikněte na Zrušit a jděte\n"
+"na stránku stažení Firefoxu na"
+
+#, fuzzy
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+"Až dokončíte instalaci Firefoxu, můžete Tor instalátor spustit\n"
+"ještě jednou.\n"
+"\n"
+"Pokud preferujete instalovat Tor bez prohlížeče Firefox, jednoduše\n"
+"klikněte na Pokračovat."
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/da/vidalia_da.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/da/vidalia_da.po
new file mode 100755
index 0000000..315a1b5
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/da/vidalia_da.po
@@ -0,0 +1,310 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2009-10-01 09:16+0000\n"
+"Last-Translator: Manuel Ojeda <ojeda at ojeda.dk>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+# Not much to translate.
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} setup"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+"Denne guide fører dig gennem installationen af Tor, Vidalia, Privoxy, og "
+"Torbutton.\n"
+"\n"
+"Tor er et system til at bruge internettet anonymt, hjælpe dig med at "
+"anonymisere internet browsing og udgivning, instant messaging, IRC, og meget "
+"mere. Vidalia er en GUI, som hjælper med at styre, overvåge og konfigurere "
+"Tor.\n"
+"\n"
+"Privoxy er en filtrering web proxy, der beskytter dit privatliv og hjælper "
+"med at fjerne annoncer, bannere og popups.\n"
+"\n"
+"Torbutton er en Firefox udvidelse, som giver dig mulighed for hurtigt at "
+"aktivere eller deaktivere anonyme webbrowsing.\n"
+"\n"
+"Hvis du tidligere har installeret Tor, Vidalia, Privoxy, eller Firefox, skal "
+"du sikre, at de ikke kører, før du fortsætter denne installation.\n"
+"\n"
+"$_CLICK"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Velkommen til ${BUNDLE_NAME} Setup Guide"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "${TOR_NAME} installations dokumentation"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"Installationen er fuldført.\n"
+"Se her https://www.torproject.org/docs/tor-doc-windows for at lære hvordan "
+"du konfigurerer dine programmer til at bruge Tor.\n"
+"\n"
+"Hvis du har installeret Torbutton, skal du genstarte Firefox."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Kør installerede komponenter nu"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia er en grafisk brugergrænseflade som hjælper dig kontrollere, "
+"overvåge og konfigurere Tor."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Fjern ${VIDALIA_DESC}."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} setup"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+"Denne guide fører dig gennem installationen af Vidalia, en grafisk "
+"brugergrænseflade, der hjælper med at styre, overvåge og konfigurere Tor.\n"
+"\n"
+"$_CLICK"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Velkommen til ${VIDALIA_NAME} Setup Guide"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "${VIDALIA_NAME} hjemmeside"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia er en grafisk brugergrænseflade der hjælper dig kontrollere, "
+"overvåge og konfigurere Tor."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Kør ved opstart"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Kør automatisk ${VIDALIA_NAME} ved opstart."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Tilføj til Start Menuen"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Tilføj ${VIDALIA_NAME} til din Start menu."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Kør ${VIDALIA_NAME}"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor er et system til at bruge internettet anonymt, hjælpe dig med at "
+"anonymisere web browsing og udgivning, instant messaging, IRC, og meget "
+"mere."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Fjern ${TOR_DESC}."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Installer ${TOR_DESC}."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Du har allerede en Tor konfigurations fil.$\n"
+"$\n"
+"Ønsker du at overskrive den med den standard prøve konfigurations fil?"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Dokumentation"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Installer ${TOR_NAME} dokumentation"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Tilføj til Start menuen"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Tilføj ${TOR_NAME} til din Start menu."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+"Privoxy er en filtrering web proxy, der beskytter dit privatliv og hjælper "
+"med at fjerne annoncer, bannere og popups."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr "Fjern ${PRIVOXY_DESC}."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr "Installer ${PRIVOXY_DESC}."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr "Tilføj til Start Menuen"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr "Tilføj ${PRIVOXY_NAME} til din Start menu."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr "Kør ved opstart"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr "Kør automatisk ${PRIVOXY_NAME} ved opstart."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+"Torbutton er en Firefox udvidelse, som giver dig mulighed for hurtigt at "
+"aktivere eller deaktivere anonymt webbrowsing."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Fjern ${TORBUTTON_DESC}."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Installer ${TORBUTTON_DESC}."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Tilføj til Firefox"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Tilføj ${TORBUTTON_DESC} udvidelsen til Firefox."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "Firefox blev ikke fundet på dit system. Installerer ikke Torbutton."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Program Data"
+
+# Remove saved application data and configuration files.
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Fjern gemte program data og konfigurations filer."
+
+# Cant translate languagecode? EN=EN ; DA=DK ?
+# Remove saved application data and configuration files.
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "en"
+
+# Remove saved application data and configuration files.
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Firefox er ikke installeret."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+"Vi foreslår at du installere Firefox før du fortsætter, for bedre sikkerhed."
+
+# You should check the \NewLine markers
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"Mozilla Firefox web browser er ikke installeret på din computer.\n"
+"Tor kan arbejde sammen med andre browsere, såsom Internet Explorer, men\n"
+"er nemmere at bruge med Firefox, som også gør et bedre stykke arbejde\n"
+"med at beskytter din anonymitet.\n"
+"\n"
+"Hvis du ønsker at installere Firefox, skal du trykke på Annuller og derefter "
+"gå\n"
+"til Firefox download siden på"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+"Når du er færdig med at installerer Firefox, kan du igen køre Tor "
+"installationen.\n"
+"\n"
+"Eller, hvis du foretrækker at installere Tor uden Firefox, tryk på Næste for "
+"at fortsætte."
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/de/vidalia_de.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/de/vidalia_de.po
new file mode 100644
index 0000000..6c909ba
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/de/vidalia_de.po
@@ -0,0 +1,302 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2010-03-03 17:10-0700\n"
+"Last-Translator: CS <cs at carlostrub.ch>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} Setup"
+
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Dieser Assistent wird Sie durch die Installation von Tor, Vidalia, Polipo "
+"und Torbutton begleiten.\n"
+"\n"
+"Tor ist ein System, um das Internet anonym zu nutzen. Es anonymisiert das "
+"Browsen, das Veröffentlichen von Inhalten, Instant Messaging, IRC, usw. "
+"Vidalia ist eine Oberfläche zur Einrichtung, Steuerung und Überwachung von "
+"Tor.\n"
+"\n"
+"Polipo ist ein filternder Webproxy, welcher die Leistung des Webbrowsens "
+"mittels Tor erhöht.\n"
+"\n"
+"Torbutton ist eine Erweiterung für Firefox, die das schnelle Ein- und "
+"Ausschalten des anonymes Webbrowsens ermöglicht.\n"
+"\n"
+"Sollten Sie Tor, Vidalia, Polipo oder Firefox bereits früher installiert "
+"haben, stellen Sie sicher, dass diese Programme nicht laufen, bevor Sie die "
+"Installation fortsetzen.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Willkommen beim ${BUNDLE_NAME} Installations-Assistent"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "${TOR_NAME} Installations-Dokumentation"
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"Die Installation ist abgeschlossen.\n"
+"Bitte besuchen Sie https://www.torproject.org/docs/tor-doc-windows um zu "
+"erfahren, wie Sie Ihre Anwendungen zur Benutzung mit Tor einrichten können.\n"
+"\n"
+"Sollten Sie Torbutton installiert haben, müssen Sie Firefox neu starten."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Installierte Anwendungen jetzt starten"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia ist eine Oberfläche zur Einrichtung, Steuerung und Überwachung von "
+"Tor."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Entferne ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} Setup"
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Dieser Assistent führt Sie durch die Installation von ${VIDALIA_DESC}.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Willkommen beim ${VIDALIA_NAME} Installations-Assistent"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "${VIDALIA_NAME} Webseite"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia ist eine Oberfläche zur Einrichtung, Steuerung und Überwachung von "
+"Tor."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Beim Systemstart ausführen"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "${VIDALIA_NAME} beim Systemstart automatisch ausführen."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Zum Startmenü hinzufügen"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "${VIDALIA_NAME} zu Ihrem Startmenü hinzufügen."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "${VIDALIA_NAME} jetzt starten"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor ist ein System, um das Internet anonym zu nutzen. Es anonymisiert das "
+"Webbrowsen, das Veröffentlichen von Inhalten, Instant Messaging, IRC, usw."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Entferne ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Installiere ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Sie haben bereits eine Tor Konfigurationsdatei.$\n"
+"$\n"
+"Soll diese mit der allgemeinen Beispiel-Konfigurationsdatei überschrieben "
+"werden?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Dokumentation"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Installiere ${TOR_NAME} Dokumentation."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Zum Startmenü hinzufügen"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "${TOR_NAME} zu Ihrem Startmenü hinzufügen."
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+"Polipo ist ein speichernder Web-Proxy, der die Leistung des Webbrowsens "
+"durch Tor erhöht."
+
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "Entferne ${POLIPO_DESC}."
+
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "Installiere ${POLIPO_DESC}."
+
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "Zum Startmenü hinzufügen"
+
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "${POLIPO_NAME} zu Ihrem Startmenü hinzufügen."
+
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "Beim Systemstart ausführen"
+
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "${POLIPO_NAME} beim Systemstart automatisch ausführen."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton ist eine Erweiterung für Firefox, die das schnelle Ein- und "
+"Ausschalten des anonymen Webbrowsens ermöglicht."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Entferne ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Installiere ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Zu Firefox hinzufügen"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Die ${TORBUTTON_DESC}-Erweiterung zu Firefox hinzufügen."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+"Firefox konnte nicht gefunden werden. Torbutton wird nicht installiert."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Anwendungsdaten"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Entferne gespeicherte Anwendungsdaten und Konfigurationsdateien."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "de"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Firefox ist nicht installiert"
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+"Für die maximale Sicherheit empfehlen wir, Firefox zu installieren, bevor "
+"Sie fortfahren. "
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"Der Mozilla Firefox-Browser ist auf Ihrem Computer nicht installiert.\n"
+"Tor arbeitet mit anderen Browsers, wie dem Internet Explorer zusammen, aber\n"
+"ist einfacher mit Firefox zu nutzen, der zudem besser\n"
+"Ihre Anonymität schützt.\n"
+"\n"
+"Wenn Sie Firefox installieren wollen, klicken Sie bitte auf Abbrechen und "
+"besuchen\n"
+"Sie anschliessend die Firefox Downloadseite unter"
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+"Wenn Sie Firefox installiert haben, können Sie das\n"
+" Tor Installationsprogramm erneut ausführen.\n"
+"\n"
+"Falls Sie es vorziehen, Tor ohne Firefox zu installieren, klicken\n"
+"Sie einfach auf Weiter,"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/de_AT/vidalia_de_AT.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/de_AT/vidalia_de_AT.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/de_AT/vidalia_de_AT.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/de_CH/vidalia_de_CH.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/de_CH/vidalia_de_CH.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/de_CH/vidalia_de_CH.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/de_DE/vidalia_de_DE.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/de_DE/vidalia_de_DE.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/de_DE/vidalia_de_DE.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/default-header.bmp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/default-header.bmp
new file mode 100644
index 0000000..4b756a6
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/default-header.bmp differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/default-welcome.bmp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/default-welcome.bmp
new file mode 100644
index 0000000..800f3b6
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/default-welcome.bmp differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/default.action b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/default.action
new file mode 100644
index 0000000..f8652b5
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/default.action
@@ -0,0 +1,1260 @@
+######################################################################
+#
+# File : $Source: /cvsroot/ijbswa/current/default.action.master,v $
+#
+# $Id: default.action.master,v 1.45 2006/11/18 10:36:17 hal9 Exp $
+#
+# Requires : This version requires Privoxy v3.0.5 or later due to
+# syntax changes.
+#
+# Purpose : Default actions file, see
+# http://www.privoxy.org/user-manual/actions-file.html.
+# This file is subject to periodic updating. Local exceptions
+# and enhancements are better placed in user.action.
+#
+# Copyright : Written by and Copyright (C) 2001 - 2006 the
+# Privoxy team. http://www.privoxy.org/
+#
+# Note: Updated versions of this file will be made available from time
+# to time. Check http://sourceforge.net/project/showfiles.php?group_id=11118
+# for updates and/or subscribe to the announce mailing list
+# (http://lists.sourceforge.net/lists/listinfo/ijbswa-announce) if you
+# wish to receive an email notice whenever updates are released.
+#
+# We value your feedback. However, to provide you with the best support,
+# please note:
+#
+# * Use the support forum to get help:
+# http://sourceforge.net/tracker/?group_id=11118&atid=211118
+# * Submit feedback for this actions file only through the
+# SF actions file feedback tracker:
+# http://sourceforge.net/tracker/?group_id=11118&atid=460288
+# * Submit bugs only through our bug forum:
+# http://sourceforge.net/tracker/?group_id=11118&atid=111118
+# Make sure that the bug has not already been submitted. Please try
+# to verify that it is a Privoxy bug, and not a browser or site
+# bug first. If you are using your own custom configuration, please
+# try the stock configs to see if the problem is a configuration
+# related bug. And if possible please try the latest CVS sources.
+# * Submit feature requests only through our feature request forum:
+# http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse
+#
+# For any other issues, feel free to use the mailing lists:
+# http://sourceforge.net/mail/?group_id=11118
+#
+# Anyone interested in actively participating in development and related
+# discussions can join the appropriate mailing list here:
+# http://sourceforge.net/mail/?group_id=11118. Archives are available
+# here too.
+#
+# The current development version of this file is located:
+# http://ijbswa.cvs.sourceforge.net/*checkout*/ijbswa/current/default.action.master
+#
+#############################################################################
+# Syntax
+#############################################################################
+#
+# A much better explanation can be found in the user manual which is
+# part of the distribution and can be found at http://www.privoxy.org/user-manual
+#
+# To determine which actions apply to a request, the URL of the request is
+# compared to all patterns in this file. Every time it matches, the list of
+# applicable actions for this URL is incrementally updated. You can trace
+# this process by visiting http://config.privoxy.org/show-url-info
+#
+# There are 4 types of lines in this file: comments (like this line),
+# actions, aliases and patterns, all of which are explained below.
+#
+#############################################################################
+# Pattern Syntax
+#############################################################################
+#
+# 1. On Domains and Paths
+# -----------------------
+#
+# Generally, a pattern has the form <domain>/<path>, where both the <domain>
+# and <path> part are optional. The pattern matching syntax is different for
+# each. If you only specify a domain part, the "/" can be left out, but it is
+# required for the path part.
+#
+# www.example.com
+# is a domain-only pattern and will match any request to www.example.com
+#
+# www.example.com/
+# means exactly the same (but is slightly less efficient)
+#
+# www.example.com/index.html
+# matches only the document /index.html on www.example.com
+#
+# /index.html
+# matches the document /index.html, regardless of the domain
+#
+# index.html
+# matches nothing, since it would be interpreted as a domain name and
+# there is no top-level domain called ".html".
+#
+# 2. Domain Syntax
+# ----------------
+#
+# The matching of the domain part offers some flexible options: If the
+# domain starts or ends with a dot, it becomes unanchored at that end:
+#
+# www.example.com
+# matches only www.example.com
+#
+# .example.com
+# matches any domain that ENDS in .example.com
+#
+# www.
+# matches any domain that STARTS with www.
+#
+# .example.
+# matches any domain that CONTAINS example
+#
+#
+# Additionally, there are wildcards that you can use in the domain names
+# themselves. They work pretty similar to shell wildcards: "*" stands for
+# zero or more arbitrary characters, "?" stands for one, and you can define
+# charachter classes in square brackets and they can be freely mixed:
+#
+# ad*.example.com
+# matches adserver.example.com, ads.example.com, etc but not sfads.example.com
+#
+# *ad*.example.com
+# matches all of the above
+#
+# .?pix.com
+# matches www.ipix.com, pictures.epix.com, a.b.c.d.e.upix.com etc
+#
+# www[1-9a-ez].example.com
+# matches www1.example.com, www4.example.com, wwwd.example.com,
+# wwwz.example.com etc, but not wwww.example.com
+#
+# You get the idea?
+#
+# 2. Path Syntax
+# --------------
+#
+# Paths are specified as full regular expressions, and are more flexible than
+# the domain syntax above. A comprehensive discussion of regular expressions
+# wouldn't fit here.
+#
+# Perl compatible regular expressions are used. See the pcre/docs/ direcory or
+# man perlre (also available at http://perldoc.perl.org/perlre.html) for
+# details. The appendix to our User Manual also has some detail.
+#
+# Please note that matching in the path is CASE INSENSITIVE by default, but
+# you can switch to case sensitive by starting the pattern with the "(?-i)"
+# switch:
+#
+# www.example.com/(?-i)PaTtErN.*
+# will match only documents whose path starts with PaTtErN in exactly this
+# capitalization.
+#
+# Partially case-sensetive and partially case-insensitive patterns are
+# possible, but the rules about splitting them up are extremely complex
+# - see the PCRE documentation for more information.
+#
+#############################################################################
+# Action Syntax
+#############################################################################
+#
+# There are 3 kinds of actions:
+#
+# Boolean (e.g. "block"):
+# +name # enable
+# -name # disable
+#
+# Parameterized (e.g. "hide-user-agent"):
+# +name{param} # enable and set parameter to "param"
+# -name # disable
+#
+# Multi-value (e.g. "add-header", "send-wafer"):
+# +name{param} # enable and add parameter "param"
+# -name{param} # remove the parameter "param"
+# -name # disable totally
+#
+# The default (if you don't specify anything in this file) is not to take
+# any actions - i.e completely disabled, so Privoxy will just be a
+# normal, non-blocking, non-anonymizing proxy. You must specifically
+# enable the privacy and blocking features you need (although the
+# provided default actions file will do that for you).
+#
+# Later actions always override earlier ones. For multi-valued actions,
+# the actions are applied in the order they are specified.
+#
+#############################################################################
+# Valid actions are:
+#############################################################################
+#
+# +add-header{Name: value}
+# Adds the specified HTTP header, which is not checked for validity.
+# You may specify this many times to specify many headers.
+#
+# +block
+# Block this URL. Privoxy will ignore this URL completely, and not request
+# it.
+#
+# +content-type-overwrite
+# Replaces the "Content-Type:" HTTP server header, so that unwanted
+# download menus will not pop up, or changes the browser's rendering mode.
+#
+# +crunch-client-header{string}
+# Deletes every header sent by the client that contains the string the
+# user supplied as parameter.
+#
+# +crunch-if-none-match
+# Deletes the "If-None-Match:" HTTP client header.
+#
+# +crunch-server-header{string}
+# Deletes every header sent by the server that contains the string the
+# user supplied as a parameter.
+#
+# +deanimate-gifs{last}
+# +deanimate-gifs{first}
+# Deanimate all animated GIF images, i.e. reduce them to their last
+# frame. This will also shrink the images considerably. (In bytes,
+# not pixels!)
+# If the option "first" is given, the first frame of the animation
+# is used as the replacement. If "last" is given, the last frame of
+# the animation is used instead, which propably makes more sense for
+# most banner animations, but also has the risk of not showing the
+# entire last frame (if it is only a delta to an earlier frame).
+#
+# +downgrade-http-version
+# Downgrade HTTP/1.1 client requests to HTTP/1.0 and downgrade the
+# responses as well. Use this action for servers that use HTTP/1.1
+# protocol features that Privoxy currently can't handle yet.
+#
+# +fast-redirects{check-decoded-url}
+# +fast-redirects{simple-check}
+# Many sites, like yahoo.com, don't just link to other sites.
+# Instead, they will link to some script on their own server,
+# giving the destination as a parameter, which will then redirect
+# you to the final target.
+#
+# URLs resulting from this scheme typically look like:
+# http://some.place/some_script?http://some.where-else
+#
+# Sometimes, there are even multiple consecutive redirects encoded
+# in the URL. These redirections via scripts make your web browing
+# more traceable, since the server from which you follow such a link
+# can see where you go to. Apart from that, valuable bandwidth and
+# time is wasted, while your browser aks the server for one redirect
+# after the other. Plus, it feeds the advertisers.
+#
+# The +fast-redirects{check-decoded-url} option enables interception of
+# these requests by Privoxy, who will cut off all but the last valid URL
+# in the request and send a local redirect back to your browser without
+# contacting the intermediate sites. NOTE: Syntax change as of v.3.0.4.
+#
+# +filter{name}
+# All files of text-based type, most notably HTML and JavaScript, to which
+# this action applies, can be filtered on-the-fly through the specified
+# regular expression based substitutions. (Note: plain text documents are
+# exempted from filtering, because web servers often use the text/plain
+# MIME type for all files whose type they don't know.) By default,
+# filtering works only on the raw document content itself (that which can
+# be seen with View Source), not the headers. Repeat for multiple filters.
+# Use with caution: filters can be very intrusive.
+#
+# Filters predefined in the supplied default.action include:
+#
+# js-annoyances: Get rid of particularly annoying JavaScript abuse
+# js-events: Kill all JS event bindings (Radically destructive! Use only on real suckers)
+# html-annoyances: Get rid of particularly annoying HTML abuse
+# content-cookies: Kill cookies that come in the HTML or JS content
+# refresh-tags: Kill automatic refresh tags (for dial-on-demand setups)
+# unsolicited-popups: Disable only unsolicited pop-up windows
+# all-popups: Kill all popups in JavaScript and HTML
+# img-reorder: Reorder attributes in <img> tags to make the banners-by-* filters more effective
+# banners-by-size: Kill banners by size (very efficient!)
+# banners-by-link: Kill banners by their links to known clicktrackers
+# webbugs: Squish WebBugs (1x1 invisible GIFs used for user tracking)
+# tiny-textforms: Extend those tiny textareas up to 40x80 and kill the hard wrap
+# jumping-windows: Prevent windows from resizing and moving themselves
+# frameset-borders: Give frames a border
+# demoronizer: Fix MS's non-standard use of standard charsets
+# shockwave-flash: Kill embedded Shockwave Flash objects
+# quicktime-kioskmode: Make Quicktime movies saveable
+# fun: Text replacements for subversive browsing fun!
+# crude-parental: Kill all web pages that contain the words "sex" or "warez"
+# ie-exploits: Disable some known Internet Explorer bug exploits
+# site-specifics: Cure for site-specific problems. Don't apply generally!
+# google: Removes text ads and other Google specific improvements
+# yahoo: Removes text ads and other Yahoo specific improvements
+# msn: Removes text ads and other MSN specific improvements
+# blogspot: Cleans up Blogspot blogs
+# html-to-xml: Header filter to change the Content-Type from html to xml
+# xml-to-html: Header filter to change the Content-Type from xml to html
+# no-ping: Removes non-standard ping attributes from anchor and area tags
+# hide-tor-exit-notation: Header filter to remove the Tor exit node notation in Host and Referer headers
+#
+# +filter-client-headers
+# By default, filters only apply to the document content itself. This will
+# extend those filters to include the client's headers as well.
+#
+# +filter-server-headers
+# By default, filters only apply to the document content itself. This will
+# extend those filters to include the server's headers as well.
+#
+# +force-text-mode
+# Declares a document as plain text, even if the "Content-Type:" isn't detected
+# as such.
+#
+# +handle-as-empty-document
+# This action alone doesn't do anything noticeable. It just marks URLs. If
+# the block action also applies, the presence or absence of this mark
+# decides whether an HTML "blocked" page, or an empty document will be sent
+# to the client as a substitute for the blocked content.
+#
+# +hide-accept-language{lang}
+# +hide-accept-language{block}
+# Deletes or replaces the "Accept-Language:" HTTP header in client
+# requests.
+#
+# +hide-content-disposition{block}
+# +hide-content-disposition{string}
+# Deletes or replaces the "Content-Disposition:" HTTP header set by some
+# servers. This can be used to prevent download menus for content you
+# prefer to view inside the browser, for example.
+#
+# +hide-forwarded-for-headers
+# Block any existing X-Forwarded-for header, and do not add a new one.
+#
+# +hide-from-header{block}
+# +hide-from-header{spam at sittingduck.xqq}
+# If the browser sends a "From:" header containing your e-mail address,
+# either completely removes the header ("block"), or change it to the
+# specified e-mail address.
+#
+# +hide-if-modified-since{block}
+# +hide-if-modified-since{-1}
+# Deletes the "If-Modified-Since:" HTTP client header or modifies its
+# value, preventing another way to track users.
+#
+# +hide-referer{block}
+# +hide-referer{forge}
+# +hide-referer{http://nowhere.com}
+# Don't send the "Referer:" (sic) header to the web site. You can
+# block it, forge a URL to the same server as the request (which is
+# preferred because some sites will not send images otherwise) or
+# set it to a constant string.
+#
+# +hide-referrer{...}
+# Alternative spelling of +hide-referer. Has the same parameters,
+# and can be freely mixed with, "+hide-referer". ("referrer" is the
+# correct English spelling, however the HTTP specification has a
+# bug - it requires it to be spelt "referer").
+#
+# +hide-user-agent{browser-type}
+# Change the "User-Agent:" header so web servers can't tell your
+# browser type. (Breaks many web sites). Specify the user-agent
+# value you want - e.g., to pretend to be using Netscape on Linux:
+# +hide-user-agent{Mozilla (X11; I; Linux 2.0.32 i586)}
+# Or to identify yourself explicitly as a Privoxy user:
+# +hide-user-agent{Privoxy/1.0}
+# (Don't change the version number from 1.0 - after all, why tell them?)
+#
+# +handle-as-image
+# Treat this URL as an image. This only matters if it's also "+block"ed,
+# in which case a "blocked" image can be sent rather than a HTML page.
+# See +set-image-blocker{} for the control over what is actually sent.
+#
+# +inspect-jpegs
+# Scan jpeg headers for malformed comment blocks and correct them.
+#
+# +set-image-blocker{blank}
+# +set-image-blocker{pattern}
+# +set-image-blocker{<URL>} with <url> being any valid image URL
+# Decides what to do with URLs that end up tagged with {+block +handle-as-image}.
+# There are 4 options:
+# * "-set-image-blocker" will send a HTML "blocked" page, usually
+# resulting in a "broken image" icon.
+# * "+set-image-blocker{blank}" will send a 1x1 transparent image
+# * "+set-image-blocker{pattern}" will send a 4x4 grey/white pattern
+# which is less intrusive than the logo but easier to recognize
+# than the transparent one.
+# * "+set-image-blocker{<URL>}" will send a HTTP temporary redirect
+# to the specified image URL.
+#
+#
+# +limit-connect{portlist}
+# The CONNECT methods exists in HTTP to allow access to secure websites
+# (https:// URLs) through proxies. It works very simply: The proxy
+# connects to the server on the specified port, and then short-circuits
+# its connections to the cliant and to the remote proxy.
+# This can be a big security hole, since CONNECT-enabled proxies can
+# be abused as TCP relays very easily.
+# By default, i.e. in the absence of a +limit-connect action, Privoxy
+# will only allow CONNECT requests to port 443, which is the standard port
+# for https.
+# If you want to allow CONNECT for more ports than that, or want to forbid
+# CONNECT altogether, you can specify a comma separated list of ports and port
+# ranges (the latter using dashes, with the minimum defaulting to 0 and max to 65K):
+#
+# +limit-connect{443} # This is the default and need no be specified.
+# +limit-connect{80,443} # Ports 80 and 443 are OK.
+# +limit-connect{-3, 7, 20-100, 500-} # Port less than 3, 7, 20 to 100, and above 500 are OK.
+#
+# +overwrite-last-modified{block}
+# +overwrite-last-modified{reset-to-request-time}
+# +overwrite-last-modified{randomize}
+# Removing the "Last-Modified:" header is useful for filter testing, where
+# you want to force a real reload instead of getting status code "304",
+# which would cause the browser to reuse the old version of the page.
+#
+# The "randomize" option overwrites the value of the "Last-Modified:"
+# header with a randomly chosen time between the original value and the
+# current time. In theory the server could send each document with a
+# different "Last-Modified:" header to track visits without using cookies.
+# "Randomize" makes it impossible and the browser can still revalidate
+# cached documents.
+#
+# "reset-to-request-time" overwrites the value of the "Last-Modified:"
+# header with the current time. You could use this option together with
+# hided-if-modified-since to further customize your random range.
+#
+# +prevent-compression
+# Prevent the website from compressing the data. Some websites do
+# that, which is a problem for Privoxy, since +filter, +kill-popups
+# and +gif-deanimate will not work on compressed data. Will slow down
+# connections to those websites, though.
+#
+# +prevent-keeping-cookies
+# +session-cookies-only
+# If the website sets cookies, make sure they are erased when you exit
+# and restart your web browser. This makes profiling cookies useless,
+# but won't break sites which require cookies so that you can log in
+# or for transactions.
+#
+# +crunch-outgoing-cookies
+# Prevent the website from reading cookies
+#
+# +crunch-incoming-cookies
+# Prevent the website from setting cookies
+#
+# +kill-popups (deprecated)
+# Filter the website through a built-in filter to disable
+# window.open() etc. The two alternative spellings are
+# equivalent.
+#
+# +redirect{<URL>}
+# Convinces the browser that the requested document has been moved to
+# another location and the browser should get it from the specified
+# URL.
+#
+# +send-vanilla-wafer
+# This action only applies if you are using a jarfile. It sends a
+# cookie to every site stating that you do not accept any copyright
+# on cookies sent to you, and asking them not to track you. Of
+# course, this is a (relatively) unique header they could use to
+# track you.
+#
+# +send-wafer{name=value}
+# This allows you to add an arbitrary cookie. Specify it multiple
+# times in order to add several cookies.
+#
+# +treat-forbidden-connects-like-blocks
+# If this action is enabled, Privoxy no longer makes a difference between
+# forbidden connects and ordinary blocks.
+#
+# By default Privoxy answers forbidden "Connect" requests with a short
+# error message inside the headers. If the browser doesn't display headers
+# (most don't), you just see an empty page. With this action enabled,
+# Privoxy displays the message that is used for ordinary blocks instead. If
+# you decide to make an exception for the page in question, you can do so
+# by following the "See why" link.
+#
+#############################################################################
+
+#############################################################################
+# Settings -- Don't change.
+#############################################################################
+{{settings}}
+#############################################################################
+for-privoxy-version=3.0.6
+
+#############################################################################
+# Aliases
+#############################################################################
+{{alias}}
+#############################################################################
+#
+# You can define a short form for a list of permissions - e.g., instead
+# of "-crunch-incoming-cookies -crunch-outgoing-cookies -filter -fast-redirects",
+# you can just write "shop". This is called an alias.
+#
+# Currently, an alias can contain any character except space, tab, '=', '{'
+# or '}'.
+# But please use only 'a'-'z', '0'-'9', '+', and '-'.
+#
+# Alias names are not case sensitive.
+#
+# Aliases beginning with '+' or '-' may be used for system action names
+# in future releases - so try to avoid alias names like this. (e.g.
+# "+crunch-all-cookies" below is not a good name)
+#
+# Aliases must be defined before they are used.
+#
+
+# These aliases just save typing later:
+#
++crunch-all-cookies = +crunch-incoming-cookies +crunch-outgoing-cookies
+-crunch-all-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies
+ allow-all-cookies = -crunch-all-cookies -session-cookies-only
+ allow-popups = -filter{all-popups} -kill-popups -filter{unsolicited-popups}
++block-as-image = +block +handle-as-image
+-block-as-image = -block
+
+# These aliases define combinations of actions
+# that are useful for certain types of sites:
+#
+fragile = -block -crunch-all-cookies -filter -fast-redirects -hide-referer -kill-popups -prevent-compression
+shop = -crunch-all-cookies allow-popups
+
+# Your favourite blend of filters:
+#
+myfilters = +filter{html-annoyances} +filter{js-annoyances} +filter{all-popups}\
+ +filter{webbugs} +filter{nimda} +filter{banners-by-size} #+filter{fun}
+
+# Allow ads for selected useful free sites:
+#
+allow-ads = -block -filter{banners-by-size} -filter{banners-by-link}
+
+#############################################################################
+# Defaults
+#############################################################################
+{ \
+-add-header \
+-block \
+-content-type-overwrite \
+-crunch-client-header \
+-crunch-if-none-match \
+-crunch-outgoing-cookies \
+-crunch-incoming-cookies \
+-crunch-server-header \
+-deanimate-gifs \
+-downgrade-http-version \
+-fast-redirects \
+-filter{js-annoyances} \
+-filter{js-events} \
+-filter{html-annoyances} \
+-filter{content-cookies} \
+-filter{refresh-tags} \
+-filter{unsolicited-popups} \
+-filter{all-popups} \
+-filter{img-reorder} \
+-filter{banners-by-size} \
+-filter{banners-by-link} \
+-filter{webbugs} \
+-filter{tiny-textforms} \
+-filter{jumping-windows} \
+-filter{frameset-borders} \
+-filter{demoronizer} \
+-filter{shockwave-flash} \
+-filter{quicktime-kioskmode} \
+-filter{fun} \
+-filter{crude-parental} \
+-filter{ie-exploits} \
+-filter{site-specifics} \
+-filter{google} \
+-filter{yahoo} \
+-filter{msn} \
+-filter{blogspot} \
+-filter{xml-to-html} \
+-filter{html-to-xml} \
+-filter{no-ping} \
+-filter{hide-tor-exit-notation} \
+-filter-client-headers \
+-filter-server-headers \
+-force-text-mode \
+-handle-as-empty-document \
+-handle-as-image \
+-hide-accept-language \
+-hide-content-disposition \
+-hide-if-modified-since \
++hide-forwarded-for-headers \
++hide-from-header{block} \
+-hide-referrer \
+-hide-user-agent \
+-inspect-jpegs \
+-kill-popups \
++limit-connect{1-} \
+-prevent-compression \
+-overwrite-last-modified \
+-redirect \
+-send-vanilla-wafer \
+-send-wafer \
+-session-cookies-only \
++set-image-blocker{pattern} \
+-treat-forbidden-connects-like-blocks \
+}
+/ # Match all URLs
+
+#############################################################################
+# These extensions belong to images:
+#############################################################################
+{+handle-as-image -filter}
+#############################################################################
+/.*\.(gif|jpe?g|png|bmp|ico)($|\?)
+
+#############################################################################
+# These don't:
+#############################################################################
+{-handle-as-image}
+/.*\.(js|php|css|.?html?)
+
+#############################################################################
+# Generic block patterns by host:
+#############################################################################
+{+block}
+ad*.
+.*ads.
+.ad.
+.*advert*.
+*banner*.
+count*.
+*counter.
+promotions.
+metrics.
+
+#############################################################################
+# Generic unblockers by host:
+#############################################################################
+{-block}
+adsl.
+ad[udmw]*.
+adbl*.
+adam*.
+adapt*.
+adob*.
+adrenaline.
+adtp*.
+adv[oia]*.
+.*road*.
+.olympiad*.
+.*load*.
+.*[epu]ad*.
+county*.
+countr*.
+
+#############################################################################
+# Generic block patterns by path:
+#############################################################################
+{+block}
+/(.*/)?ad(\?|/|s|v|_?(image|se?rv|box)|cycle|rotate|mentor|click|f[ra]m|script|stream|fetch|log|space)
+/.*ads(new)?/
+/(.*/)?(ad|all|nn|db|promo(tion)?)?[-_]?banner
+/(.*/)?(publicite|werbung|reklaa?m|annonse|maino(kset|nta|s)?/)
+/.*(count|track|compteur|(?<!relo)adframe|adse?rve?|banner)(er|run)?(\?|\.(pl|cgi|exe|dll|asp|php|cpt))
+/(.*/)?clicktrack
+
+#############################################################################
+# Generic unblockers by path:
+#############################################################################
+{-block}
+/.*ad(sl|v(i[cs]|o|an|ertencia|ent|.*search)) # advice/advisories/advan*/advertencia (spanish)
+/.*(lo|thre|he|d|gr|l|ro|re|squ)ads
+/.*account
+support./(.*/)?track
+
+#############################################################################
+# Exceptions for academia and non-profits
+#############################################################################
+.edu
+.ac.*/
+.uni-*.de
+.tu-*.de
+.gov
+.hs-*.de
+.fh-*.de
+.org/.*(image|banner)
+
+#############################################################################
+# Catch-all for false-positives that are just TOO obvious to let go
+#############################################################################
+{+block}
+.ads[erv][rv]*.
+.ads.
+/(.*/)?ad(se?rv|click|stream|image|log|farm|script)
+
+#############################################################################
+# Site-specific block patterns;
+#############################################################################
+.hitbox.com
+.the-gadgeteer.com/cgi-bin/getimage.cgi/
+dest.travelocity.com/website/destinations/images/partner_frommers.gif
+dest.travelocity.com/website/destinations/images/travelex_logo.gif
+i.imdb.com/Photos/CMSIcons/(?!buttons|emoticons)
+rcm.amazon.com
+.nytimes.com/adx/
+#www.popupad.net/ats/
+.adtrak.net
+.elitemediagroup.net
+.popuptraffic.com
+.hit-now.com
+[a-v]*.valueclick.com
+.cpays.com
+.oxado.com
+.adult*finder.com
+/scripts/cms/xcms.asp
+/.*intellitxt/
+.intellitxt.com
+.kontera.com
+.klipmart.com
+ad*.com.com
+dw.com.com
+sales.liveperson.net
+.iad.liveperson.net
+.coremetrics.com/
+.realmedia.com/data/
+.revsci.net
+.clickability.com
+/.*clickability(.com)?/
+stats.*.ihost.com
+.2o7.net
+.webtrends.com
+.tacoda.
+ad.theadhost.com
+.adbureau.net
+.adgardener.com
+.revenue.net
+.geocities.com/js_source
+.dartsearch.net
+.zedo.com
+.trk.sodoit.com/
+
+#----------------------------------------------------------------------------
+# Misc Web-bugs, JS and just plain Junk. Images here aren't normal images.
+#----------------------------------------------------------------------------
+{+block +handle-as-empty-document -handle-as-image}
+/b/ss/.+
+/HG\?hc=
+.visistat.com
+.google-analytics./
+/(.*/)?__utm.gif\?
+.overture.
+.doubleclick.net/adi
+.doubleclick.net/(.*/)?adj/
+view.atdmt.com/(.*/)?iview/
+tracking.
+/(.*/)?adjs\.php\?
+/.*\.gif\?D=DM
+#stats.surfaid.ihost.com/(crc/)?images/(bounce/)?uc.GIF
+stats./c?rc/.*/uc.gif
+/(.*/)?dcs.gif\?&?dcs
+/(.*/)?c(lear)?\.gif\?.
+#/(.*/)?(clear|(trans_?1x|blank)?1).gif
+/(.*/)?(clear|blank|(trans_?|1x)?1).gif\?.
+.bc.yahoo.com/b\?P=
+x*.alexa.com
+stats./.*\.gif\?
+/event.ng/
+/cm\?[tc]
+
+#----------------------------------------------------------------------------
+# JavaScripts for ad and popup generation
+#----------------------------------------------------------------------------
+pagead*.googlesyndication./.*\.js
+/js\.ng/
+/popunder
+
+#############################################################################
+# Generic block-as-image patterns:
+#############################################################################
+{+block-as-image}
+/.*ad_?image\.(php|cgi)
+/.*recips?/
+/bandeaux/
+/.*client_?ad\.(php|cgi)
+/.*AIM_UAC.adp
+
+#############################################################################
+# Site-specific block-as-image patterns:
+#############################################################################
+#----------------------------------------------------------------------------
+# Banner farms:
+#----------------------------------------------------------------------------
+?r.atwola.com
+.[a-vx-z]*.doubleclick.net/(?!(.*/)?ad[ji])
+.*servedby.advertising.com
+.a.yimg.com/(?:(?!/i/).)*$
+.a[0-9].yimg.com/(?:(?!/i/).)*$
+.yimg.com/(.*/)?a/
+.yimg.com/.*/(flash|java)/promotions
+.yimg.com/a/.*/flash/
+bs*.gsanet.com
+bs*.einets.com
+.qkimg.net
+[a-vx-z]*.atdmt.com/
+.fastclick.net
+.casalemedia.com
+kermit.macnn.com/
+quinst.com/images
+valuepage.com/images
+ia.imdb.com/.*\.swf
+.reactivpub.
+.as*.falkag.
+a.tribalfusion.com/
+.adserver.com/
+.ru4.com/
+www.smartadserver.com/
+admedia.
+jmcms.cydoor.com/
+.adtrix.com
+*[0-9].tribalfusion.com/
+img.mediaplex.com
+a*farm.mediaplex.com
+view.atdmt.com
+matrix.mediavantage.
+.cibleclick.com
+.netracker.net
+.interclick.com
+.maxserving.com
+.gonamic.de
+.webads.
+.adlegend.com
+.belnk.com
+.euros4click.
+ads-*.quarterserver.
+searchportal.information.com/
+images.ibsys.com/
+.lduhtrp.net/image
+
+
+#----------------------------------------------------------------------------
+# Cross-site user tracking
+#----------------------------------------------------------------------------
+.*.*.spylog.com/
+statse.webtrendslive.com
+spinbox.versiontracker.com/.*\.(gif|jpg)
+stat.onestat.com
+.[a-vx-z]*.tradedoubler.com
+stat.webmedia.
+log*.xiti.com/
+log*.hit-parade.com/
+www.xml.eshop.msn.com/tracksponsorimpression.asp
+.imrworldwide.com
+.clicktracks.com
+.etracker.
+.x-traceur.com
+content.ipro.com
+.247realmedia.com
+.sify.com
+.searchignite.com
+.statcounter.com
+.research-int.se/data
+.cybermonitor.com
+log.go.com/log
+stats.indextools.com
+
+#----------------------------------------------------------------------------
+# Specific counters (see above for generic patterns)
+#----------------------------------------------------------------------------
+s*.sitemeter.com/meter
+fastcounter.bcentral.com/
+bilbo.counted.com/
+#[a-z][0-9].nedstatbasic.net/
+
+#----------------------------------------------------------------------------
+# On-site ads and other single sources:
+#----------------------------------------------------------------------------
+.travelocity./Sponsor_gifs/
+.weather.com/creatives/
+.weather.com/web/services/email/
+/.*/topslots/topslot
+.contextweb.com/
+.offermatica.com/
+.adbrite.com
+.jpost.com/images/\d+/promos/
+.infoempleo.com/(pop-up|images(/Nueva/|/motor))
+hera.hardocp.com/
+leadback.advertising.
+.yieldmanager.com/
+.displayadsmedia.com
+astalavista.box.sk/adult.*\.jpg
+smartad.*.*.*
+.dinside.no/annonsorer/
+/RealMedia/ads/
+
+#############################################################################
+# Site-specific unblockers:
+#############################################################################
+{-block}
+.faqs.org/banner\.html
+bannerblind.mozdev.org
+advogato.org
+ad*.vhb.de
+.globalintersec.com/adv
+banners.wunderground.com/
+.openoffice.org/banners/
+.amazon.com/.*/banners/
+.washingtonpost.com/wp-srv/
+.gnome.org
+.nycsubway.org/img/banner
+.forgotten-ny.com/ADS/
+counter.li.org
+adrian.adrian.org
+adela.karlin.mff.cuni.cz
+.swcp.com/rtoads/
+.privoxy.org
+sourceforge.net/.*tracker
+.brawnylads.com
+adzapper.
+.altavista.com/web/adv
+rads.mcafee.com/
+linuxfromscratch.org/
+dv411.com/.*advc50
+.freeswan.org/
+www.arm.com/.*ads
+www.anybrowser.org/
+www.tads.org/
+.mbe.com/redir/packtrack.asp
+.iship.com/trackit/
+.esis.com.au/AdvSerialCards
+.familysearch.org/.*banner
+coder.com/creations/banner/
+arnolds.dhs.org/static/adv_tools.html
+.gpl.org/
+.europa.eu.
+.schooner.com/~loverso/no-ads/
+source.bungie.org/
+adonthell.linuxgames.com/
+.bbc.co.uk/
+adc.netlabs.org/
+.tela.bc.ca/tads/
+adbusters.org/
+.eads.*/
+.qualcomm.com/brew/developer/resources/ad/
+/update/.*adsnt.*
+.microsoft.com/.*masthead
+.indymedia.org
+.seanbaby.com
+cels.org/.*track
+.nic.ad.jp
+/(.*/)?somerights20.gif
+.creativecommons.org
+.ups.com/.*/track
+.adju.
+.rubberslug.com
+.freebsd.org
+.fsf.org
+.gnu.org
+adiumx.com
+.googleadservices./pagead/adclick
+.garaget.org/annonser/
+edge.macworld.com
+.discovery./.*/topads/
+.dawn.com/.*/(9690dina|aurora_award)\.
+.google.com/reader/
+.parcel2go.com/track
+
+#############################################################################
+# Site-specific special rules:
+#############################################################################
+
+#----------------------------------------------------------------------------
+# These sites are very complex (read: keen on your identity) and require
+# minimal interference.
+#----------------------------------------------------------------------------
+{fragile}
+.office.microsoft.com
+.windowsupdate.microsoft.com
+# too broad: .apple.com
+www.apple.com
+store.apple.com
+images.apple.com
+.update.microsoft.com
+mail.google.
+
+#----------------------------------------------------------------------------
+# Semi-fragile, allow for blocks.
+#----------------------------------------------------------------------------
+{ -crunch-all-cookies -filter -fast-redirects -hide-referer -kill-popups -prevent-compression }
+.yahoo.com
+
+#----------------------------------------------------------------------------
+# Shopping and banking sites - allow cookies and pop-ups
+#----------------------------------------------------------------------------
+{shop}
+.quietpc.com
+.worldpay.com # for quietpc.com
+.jungle.com
+.dabs.com
+.overclockers.co.uk
+.db24.de
+.ebay.
+.mobile.de
+www.fondationlejeu.com
+www.techtv.com
+.mywebgrocer.com
+
+#----------------------------------------------------------------------------
+# Subscription sites (with credible privacy policy) - allow permanent cookies
+#----------------------------------------------------------------------------
+{-session-cookies-only}
+.nytimes.com/
+.volkskrant.nl/
+
+#----------------------------------------------------------------------------
+# These sites require pop-ups, so don't use the unconditional filters.
+#----------------------------------------------------------------------------
+{allow-popups}
+www.aprilbarrows.com/discography\.html$
+.nvidia.com
+www*.chathouse.com/games/
+.bild.t-online.de
+.netflix.com
+my.aol.com
+i.cnn.net/cnn/.*/clickability/button
+.rosettaproject.org
+.quantum.com
+
+
+#----------------------------------------------------------------------------
+# Sometimes (i.e. often!) fast-redirects catches things by mistake
+#----------------------------------------------------------------------------
+{-fast-redirects}
+www.ukc.ac.uk/cgi-bin/wac\.cgi\?
+.google.
+.altavista.com/(.*(like|url|link):|trans.*urltext=)http
+.speedfind.de
+.nytimes.com
+.yahoo.com/.*done=
+.w3.org
+.directhit.com
+.zagats.com
+my.msn.com/passport/pp(consent|set)\.ashx\?msnru=
+www.passport.com/Consumer/default\.asp\?lc=[0-9]+&msppchlg=[01]&mspplogin=
+login.passport.com/logout\.(asp|srf)\?
+download.com.com/redir\?
+www.fileplanet.com/redir\.asp\?
+web.archive.org
+.edu
+.archive.org
+www.guenstiger.de
+.anonymizer.com
+www.mailtothefuture.com
+support.microsoft.com/
+.alexa.com
+www.translate.ru/url/
+schneegans.de/
+config.privoxy.org/
+
+#----------------------------------------------------------------------------
+# No filtering for sourcecode or other automatically parsed content
+#----------------------------------------------------------------------------
+{-filter -prevent-compression}
+cvs.
+/.*(cvs(view|web)|viewcvs)
+svn.
+websvn.
+/(.*/)?svn/
+liveupdate.symantec.com
+liveupdate.liveupdatesymantec.com
+liveupdate.symantecliveupdate.com
+.bookmarklets.com
+.squarefree.com/bookmarklets/
+swquery.apple.com
+swscan.apple.com
+.speakeasy.net/\d+k
+.debian.org
+bugzilla.
+.tldp.org
+webmail.
+.wiki*.
+.*wiki.
+/.*wiki/
+maps.google.
+.google.com/(calendar|reader)
+code.
+developer.
+.mozdev.org
+.mozilla.org
+.perl.org
+.cpan.org
+.webdeveloper.com
+.ibm.com/developerworks
+.apache.org/docs
+.comptechdoc.org
+.webmonkey.com
+.webreference.com
+docs.sun.com
+java.sun.com
+.thescripts.com
+.php.net
+.phpdeveloper.org
+.oreillynet.com/pub
+.devshed.com
+.htmlgoodies.com
+.javascript.com
+javascript.internet.com
+.w3schools.com
+.devguru.com
+javascriptkit.com
+.xulplanet.com
+.perl.com/language/newdocs
+.freebsd.org
+.watson.org
+.netbsd.org
+.openbsd.org
+.dragonflybsd.org
+.freedesktop.org
+.gnu.org
+.fedoraproject.org
+.userscripts.org
+/(.*/)?flyspray/
+/(.*/)?mail(man|archive|inglists?)/
+bugs.
+quoka.de
+
+#----------------------------------------------------------------------------
+# These sites suffer from a bug in PHP < 4.2.3 (ob_gzhandler broken;
+# workaround is to use zlib.output_compression):
+# (Section obsolete as of Privoxy 3.0.3, which has workaround)
+#----------------------------------------------------------------------------
+#{-prevent-compression}
+# Surely this is rectified by now 09/16/06 ???
+#www.powie.de
+#www.phpcenter.de
+#www.timeanddate.com
+#.pclinuxonline.com
+#.dungeoncrawl.org
+#www.digitalspy.co.uk
+#www.audio-illumination.org/forums/
+#www.catchword.com
+#www.ubernet.org
+#www.ooodocs.org
+#www.ntcompatible.com
+#.winehq.com
+#.dotcomtod.de/
+#.tweakers.net
+#.troublesathome.nl
+#.art.softshape.com
+
+#----------------------------------------------------------------------------
+# Innocent images in standard banner sizes found here:
+#----------------------------------------------------------------------------
+{-filter{banners-by-size}}
+.pricegrabber.com/search_getprod.php
+.cnn.com
+.gamespot.com/gamespot
+www.wral.com
+.cartoonnetwork.com/
+.anybrowser.org
+images.google.
+.pbs.org/.*/roadshow/
+objects.povworld.org/cat/
+www.xach.com/gimp/
+.mapquest.com/directions/
+.theonion.com/content/
+.pattilupone.net/gallery.html
+.ambrosiasw.com/
+.microsoft.com
+javabog.dk/ijk/
+.w3.org
+
+#----------------------------------------------------------------------------
+# These don't work without the referrer information:
+#----------------------------------------------------------------------------
+{-hide-referrer}
+.totaleclips.com
+.mandrakelinux.com/en/ftp.php3
+validator.w3.org/check\?uri=referer
+.petitiononline.com/mod_perl/signed.cgi
+.telia.se
+schneegans.de/sv/\?url=referer
+
+#----------------------------------------------------------------------------
+# These animated gifs are either useful or nice:
+#----------------------------------------------------------------------------
+{-deanimate-gifs}
+.care2.com
+.care-mail.com
+.wunderground.com
+66.28.250.180/data/
+.teamquest.com/gifs/gunther/
+.rubberslug.com
+
+#----------------------------------------------------------------------------
+# These sites are so abusive that we need to kill all JS event bindings (and
+# probably a break a lot along the way)
+#----------------------------------------------------------------------------
+#{+filter{js-radical}}
+##MASTER# PROBLEM-URL: http://www.planetspiele.de/
+#.planetspiele.de
+#216.12.219.40
+
+#----------------------------------------------------------------------------
+# The "site-specifics" filter has special cures for problems found here:
+#----------------------------------------------------------------------------
+{+filter{site-specifics} +prevent-compression}
+.spiegel.de/static/js/flash-plugin\.js
+.quelle-bausparkasse.de/$
+.groups.yahoo.com/group/
+#MASTER PROBLEM-URL: http://www.nytimes.com/
+.nytimes.com/
+
+#----------------------------------------------------------------------------
+# Content under these TLDs is most probably in character sets which the
+# demoronizer filter would mess up
+#----------------------------------------------------------------------------
+{-filter{demoronizer}}
+.jp
+.cn
+.tw
+.ru
+.kr
+
+#----------------------------------------------------------------------------
+# Misc special rules:
+#----------------------------------------------------------------------------
+{-filter{content-cookies} -filter{webbugs}}
+.friendscout24.de
+.webreference.com/js/column8/property.html
+
+{-filter{fun}}
+/(.*/)?user-manual/filter-file.html
+
+#{+filter{img-reorder} +filter{banners-by-link}}
+##MASTER# PROBLEM-URL: http://www.dn.se/
+##MASTER# REMARKS: Can't catch by size or location
+#www.dn.se
+
+{-filter{img-reorder}}
+.google.
+/.*wired(\.com)?/
+.wired.com/
+
+{-filter{js-annoyances}}
+.nasa.gov
+.cnrs.fr
+blogs.msdn.com
+
+{-filter{unsolicited-popups}}
+/.*mt.cgi$
+.cnrs.fr
+blogs.msdn.com
+
+{+fast-redirects{check-decoded-url} -block}
+.*rd.yahoo.com/
+
+{+block}
+/antitheft\.php
+
+{+filter{tiny-textforms} +prevent-compression}
+.sourceforge.net/tracker
+
+{+downgrade-http-version}
+:631
+
+#{ -crunch-outgoing-cookies \
+# -crunch-incoming-cookies \
+# +session-cookies-only \
+#}
+#www.versiontracker.com/
+
+{+redirect{http://config.privoxy.org/}}
+.privoxy.org/config
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/el/vidalia_el.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/el/vidalia_el.po
new file mode 100755
index 0000000..3abc33a
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/el/vidalia_el.po
@@ -0,0 +1,230 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2010-03-24 19:40-0600\n"
+"Last-Translator: George Fragos <fragos.george 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"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+"Αυτός ο οδηγός θα σας βοηθήσει στην εγκατάσταση των Tor, Vidalia, Privoxy, "
+"και Torbutton.\n"
+"\n"
+"Το Tor είναι ένα σύστημα για την ανώνυμη χρήση του διαδικτύου, βοηθώντας "
+"στην ανωνυμοποίηση της περιήγησης αι δημοσίευσής σας στον Ιστό, της "
+"ανταλλαγής άμεσων μηνυμάτων, του IRC και άλλων. Η Vidalia είναι ένα GUI που "
+"σας βοηθά να ελέγχετε να παρακολουθείτε και να ρυθμίζετε το Tor.\n"
+"\n"
+"Το Privoxy είναι ένα φίλτρο πληρεξούσιου διακομιστή (proxy) το ιστού που "
+"προστατεύει την ιδιωτικότητά σας και βοηθά στην απομάκρυνση των διαφημήσεων, "
+"των πανό και των αναδυόμενων παραθύρων.\n"
+"\n"
+"Το Torbutton είναι μια επέκταση για το Firefox που σας επιτρέπει την γρήγορη "
+"ενεργοποίηση ή απενεργοποίηση της ανώνυμης περιήγησης στον ιστό.\n"
+"\n"
+"Αν έχετε από πριν εγκαταστήσει τα Tor, Vidalia, Privoxy, ή Firefox, παρακαλώ "
+"βεβαιωείτε ότι δεν εκτελούνται πριν συνεχίσετε αυτή την εγκατάσταση.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Καλώς ήλθατε στον Οδηγό Εγκατάστασης ${BUNDLE_NAME}"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "Τεκμηρίωση της εγκατάστασης ${TOR_NAME}"
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"Η εγκατάσταση ολοκληρώθηκε.\n"
+"Διαβάστε το https://www.torproject.org/docs/tor-doc-windows για να μάθετε "
+"πώς θα ρυθμίσετε τις εφαρμογές σας ώστε να χρησιμοποιούν το Tor.\n"
+"\n"
+"Αν εγκαταστήσατε το Torbutton, θα πρέπει να επανεκκινήσετε τον Firefox."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/en/vidalia_en.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/en/vidalia_en.po
new file mode 100644
index 0000000..1bda77e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/en/vidalia_en.po
@@ -0,0 +1,293 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2009-08-31 03:26+0000\n"
+"Last-Translator: Matt <edmanm at vidalia-project.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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} setup"
+
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "${TOR_NAME} installation documentation"
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Run installed components now"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Remove ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} setup"
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "${VIDALIA_NAME} homepage"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Run At Startup"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Automatically run ${VIDALIA_NAME} at startup."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Add to Start Menu"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Add ${VIDALIA_NAME} to your Start menu."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Run ${VIDALIA_NAME}"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Remove ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Install ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Documentation"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Install ${TOR_NAME} documentation."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Add to Start Menu"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Add ${TOR_NAME} to your Start menu."
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "Remove ${POLIPO_DESC}."
+
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "Install ${POLIPO_DESC}."
+
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "Add to Start Menu"
+
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "Add ${POLIPO_NAME} to your Start menu."
+
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "Run At Startup"
+
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "Automatically run ${POLIPO_NAME} at startup."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Remove ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Install ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Add to Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Add the ${TORBUTTON_DESC} extension to Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "Firefox was not found on your system. Not installing Torbutton."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Application Data"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Remove saved application data and configuration files."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "en"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Firefox is not installed"
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+"We recommend that you install Firefox before continuing, for best safety."
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/es/vidalia_es.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/es/vidalia_es.po
new file mode 100644
index 0000000..f858a6b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/es/vidalia_es.po
@@ -0,0 +1,301 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia Windows Installers\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2009-11-18 18:44-0700\n"
+"Last-Translator: ariel viera <avd at resolution.de>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "Instalación de ${BUNDLE_NAME}"
+
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Este asistente le guiará a través de la instalación de Tor, Vidalia, "
+"Privoxy, y Torbutton.\n"
+"\n"
+"Tor es un sistema para lograr el anonimato en Internet, ayudándolo a hacer "
+"anónima su navegación Web, publicaciones, mensajería instantánea, IRC, y "
+"más. Vidalia es una interfaz de usuario que le ayuda a controlar, "
+"monotorizar y configurar Tor.\n"
+"\n"
+"Polipo es un web proxy cache que ayuda a mejorar el performance al navegar "
+"por la web via Tor.Torbutton es una extensión para Firefox que le permite "
+"habilitar o deshabilitar rapidamente la navegación anónima por la web.\n"
+"\n"
+"Si ha instalado previamente Tor, Vidalia, Privoxy, o Firefox, por favor "
+"asegúrese que no se estén ejecutando antes de continuar con la instalación.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Bienvenido al asistente de instalación de ${BUNDLE_NAME}"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "Documentación de instalación de ${TOR_NAME}"
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"La instalación ha finalizado.\n"
+"Por favor vea https://www.torproject.org/docs/tor-doc-windows para aprender "
+"como configurar sus aplicaciones para que usen Tor.\n"
+"\n"
+"Si instaló Torbutton, necesitará reiniciar Firefox."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Ejecutar los componentes instalados ahora"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia es una interfaz de usuario que le ayuda a controlar, monitorizar y "
+"configurar Tor."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Eliminar ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "Instalación de ${VIDALIA_NAME}"
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Este asistente le guiará a través de la instalación de Vidalia, una interfaz "
+"de usuario que le ayuda a controlar, monotorizar y configurar Tor.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Bienvenido al asistente de instalación de ${VIDALIA_NAME}"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "Pagina de Internet de ${VIDALIA_NAME}"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia es una interfaz de usuario que le ayuda a controlar, monitorizar y "
+"configurar Tor."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Ejecutar al inciar sesión"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Ejecutar automáticamente ${VIDALIA_NAME} al iniciar sesión."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Añadir al menú Inicio"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Añadir ${VIDALIA_NAME} al menú Inicio."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Ejecutar ${VIDALIA_NAME}"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor es un sistema para anonimizar Internet, ayudándolo a anonimizar su "
+"navegación Web y publicaciones, mensajería instantánea, IRC, y más."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Eliminar ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Instalar ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Se ha encontrado una configuración de Tor.$\n"
+"$\n"
+"¿Desea sobrescribirla con la configuración predeterminada?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Documentación"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Instalar la documentación de ${TOR_NAME}."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Añadir al menú Inicio"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Añadir ${TOR_NAME} al menú Inicio"
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+"Polipo es un cache web proxy que mejora el performance de la navegación "
+"usando Tor."
+
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "Eliminar ${POLIPO_DESC}."
+
+#, fuzzy
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "Instalar ${POLIPO_DESC}."
+
+#, fuzzy
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "Añadir al menú Inicio"
+
+#, fuzzy
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "Añadir ${POLIPO_NAME} a al menú Inicio."
+
+#, fuzzy
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "Ejecutar al inciar sesión"
+
+#, fuzzy
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "Ejecutar automáticamente ${POLIPO_NAME} al iniciar sesión."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton es una extensión para Firefox que le permite habilitar o "
+"deshabilitar rápidamente la navegación anónima por la web."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Eliminar ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Instalar ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Añadir a Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Añadir la extensión ${TORBUTTON_DESC} a Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "Firefox no se encontró en el sistema. No se puede instalar Torbutton."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Datos de la aplicación"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Eliminar archivos de configuración y datos de la aplicación guardados."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "es"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Firefox no está instalado"
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+"Le recomendamos que instale Firefox antes de continuar, para mayor seguridad."
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"El navegador Mozilla Firefox no está instalado en el ordenador.\n"
+"Podrá usar otros navegadores, como Internet Explorer, pero\n"
+"es más sencillo el uso con Firefox, el cual también realiza un buen trabajo\n"
+"protegiendo su anonimato.\n"
+"\n"
+"Si quiere instalar Firefox, por favor pulse Cancelar, luego diríjase\n"
+"a la web de descarga de Firefox en"
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+"Cuando termines la instalación de Firefox, puedes lanzar de nuevo\n"
+"el instalador de Tor.\n"
+"\n"
+"O, si prefieres instalar Tor sin Firefox, simplemente\n"
+"pulse Continuar."
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/et/vidalia.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/et/vidalia.po
new file mode 100644
index 0000000..c32832f
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/et/vidalia.po
@@ -0,0 +1,271 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2010-02-12 13:08-0700\n"
+"Last-Translator: Heiki Ojasild <heiki.ojasild 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"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} installeerija"
+
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, "
+"Vidalia, Polipo, and Torbutton.\n\nTor is a system for using the "
+"Internet anonymously, helping you anonymize Web browsing and publishing, "
+"instant messaging, IRC, and more. Vidalia is a GUI that helps you "
+"control, monitor, and configure Tor.\n\nPolipo is a caching web proxy "
+"that helps increase performance of browsing the web through "
+"Tor.\n\nTorbutton is a Firefox extension that allows you to quickly "
+"enable or disable anonymous web browsing.\n\nIf you have previously "
+"installed Tor, Vidalia, Polipo, or Firefox, please make sure they are "
+"not running before continuing this installation.\n\n$_CLICK"
+msgstr ""
+"See programm juhatab sind läbi Tori, Vidalia, Polipon ning Torbuttoni "
+"installeerimise.\n"
+"\n"
+"Tor on süsteem Interneti anonüümseks kasutamiseks, mis aitab sul jääda "
+"anonüümseks veebis surfates ja infot avaldades, ning kasutades kiirsuhtlust, "
+"IRCd ja palju muud. Vidalia on graafiline programm, mis aitab sul "
+"kontrollida, jälgida ning konfigureerida Tori.\n"
+"\n"
+"Polipo on vaheserver, mis aitab sul tõsta veebi läbi Tori lehitsemise "
+"jõudlust, salvestades ajutiselt osa infot, mille veebiserverid sulle "
+"saadavad.\n"
+"\n"
+"Torbutton on Mozilla Firefoxi lisa, mis laseb sul kiiresti vahetada "
+"anonüümse ja mitteanonüümse veebilehitsemise vahel.\n"
+"\n"
+"Kui sa oled varem installeerinud Tori, Vidalia, Polipo või Firefoxi, siis "
+"tee palun kindlaks, et nad ei jookse, enne kui jätkad installatsiooniga.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Tere tulemast ${BUNDLE_NAME} installeerimisprogrammi"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "${TOR_NAME} installatsioonidokumendid"
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"Installatsioon on lõpetatud.\n"
+"Palun vaata https://www.torproject.org/docs/tor-doc-windows selleks, et "
+"õppida, kuidas konfigureerida oma rakendused Tori kasutama.\n"
+"\n"
+"Kui sa installeerisid Torbuttoni, siis sa pead Firefoxi taaskäivitama."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Käivita installeeritud komponendid nüüd"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia on graafiline programm, mis aitab sul kontrollida, jälgida ning "
+"konfigureerida Tori."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Eemalda ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} installeerija"
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+"See programm juhatab su läbi Vidalia installeerimise.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Tere tulemast ${VIDALIA_NAME} installeerimisprogrammi"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "${VIDALIA_NAME} koduleht"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia on graafiline programm, mis aitab sul kontrollida, jälgida ning "
+"konfigureerida Tori."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Käivita automaatselt sisselogimisel"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Käivita ${VIDALIA_NAME} automaatselt sisselogimisel."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Lisa Start menüüsse."
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Lisa ${VIDALIA_NAME} sinu Start menüüsse."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Käivita ${VIDALIA_NAME}"
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor on süsteem Interneti anonüümseks kasutamiseks, aidates sul muuta "
+"veebilehitsemise, veebis avaldamise, kiirsuhtluse, IRC jpm anonüümseks."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Eemalda ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Installeeri ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Sul juba on Tori konfiguratsioonifail.$\n"
+"$\n"
+"Kas sa soovid selle üle kirjutada tavapärase näidiskonfiguratsioonifailiga?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Dokumentatsioon"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Installeeri ${TOR_NAME} dokumentatsioon."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Lisa Start menüüsse"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Lisa ${TOR_NAME} sinu Start menüüsse."
+
+msgctxt "PolipoGroupDesc"
+msgid "Polipo is a caching web proxy that increases performance of web browsing through Tor."
+msgstr ""
+"Polipo on veebi vaheserver, mis suurendab veebi läbi Tori lehitsemise "
+"jõudlust."
+
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "Eemalda ${POLIPO_DESC}."
+
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "Installeeri ${POLIPO_DESC}."
+
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "Lisa Start menüüsse."
+
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "Lisa ${POLIPO_NAME} sinu Start menüüsse."
+
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "Käivita sisselogimisel"
+
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "Automaatselt käivita ${POLIPO_NAME} sisselogimisel."
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+"Torbutton on Mozilla Firefoxi lisa, mis lubab sul kiiresti lülitada "
+"anonüümset veebilehitsemist sisse ja välja."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Eemalda ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Installeeri ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Lisa Mozilla Firefoxile"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Lisa ${TORBUTTON_DESC} lisa Mozilla Firefoxile."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+"Mozilla Firefoxi ei leitud sinu süsteemist. Torbuttonit ei installeerita."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Rakenduse andmed"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Eemalda salvestatud rakenduse andmed ja konfiguratsioonifailid."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "et"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Mozilla Firefox ei ole installeeritud."
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+"Me soovitame sul installeerida parema turvalisuse huvides enne jätkamist "
+"Mozilla Firefox."
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"Mozilla Firefoxi veebilehitseja ei ole installeeritud sinu arvutis.\n"
+"Tor töötab teiste veebilehitsejatega, nagu Internet Explorer, kuid\n"
+"on palju lihtsamini kasutatav Firefoxiga, mis ühtlasi kaitseb\n"
+"su anonüümsust paremini.\n"
+"\n"
+"Kui sa soovid installeerida Firefoxi, siis katkesta installatsioon ja mine\n"
+"Firefoxi allalaadimislehele siin:"
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+"Kui sa oled Firefoxi installeerimise lõpetanud, siis võid Tori installeri\n"
+"uuesti käivitada.\n"
+"\n"
+"Kui sa soovid Tori installeerida ilma Firefoxita, jätka lihtsalt "
+"installatsiooniga."
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/eu/vidalia_eu.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/eu/vidalia_eu.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/eu/vidalia_eu.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/fa/vidalia_fa.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/fa/vidalia_fa.po
new file mode 100644
index 0000000..8e124c9
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/fa/vidalia_fa.po
@@ -0,0 +1,297 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2009-06-23 05:14+0000\n"
+"Last-Translator: Nami B <pesarefahmideh at gmail.com>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#, fuzzy
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "بر?ا?? ${BUNDLE_NAME}"
+
+#, fuzzy
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"این دستیار شما را در طی بارگذاری تُر، ویدالیا، پریواکسی، و تُرباتِن راهنمایی "
+"میکند.\n"
+"\n"
+"تُر سیستمی برای استفاده از اینترنت بهصورت ناشناس است و به شما کمک میکند که "
+"کارهایی مثل گردش و نوشتن در وب، پیام فوری، IRC را مخفی کنید.\n"
+"پریواکسی یک پراکسی برای فیلتر کردن وب است که از حریم شخصی شما محافظت میکند و "
+"تبلیغات را حذف میکند.\n"
+"تُرباتِن یک افزونهی فایرفاکس است که به شما اجازه میدهد امکان گردش ناشناس در وب "
+"را بهسرعت فعال یا غیرفعال کنید.\n"
+"اگر پیش از این تُر، ویدالیا، پریواکس، یا فایرفاکس را نصب کردهاید، خواهشمند "
+"است از بسته بودن آنها در حین نصب این برنامه اطمینان پیدا کنید.\n"
+"$_CLICK"
+
+#, fuzzy
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "به دستیار تنظیم ${BUNDLE_NAME} خوش آمدید"
+
+#, fuzzy
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "مستندات بارگذاری ${TOR_NAME}"
+
+#, fuzzy
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"?ار?ذار? انجام شد.\n"
+" خواهشمند است برا? آ?اه? ?افتن از ??ون?? ???ربند? ?ردن برنامه ها? ?اربرد?تان "
+"برا? ب?اربردن تور https://www.torproject.org/docs/tor-doc-windows را مشاهده ?"
+"ن?د."
+
+#, fuzzy
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "اجرا?ردن مولفه ها? ?ار?ذار? شده"
+
+#, fuzzy
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "?ار?ذار? ${VIDALIA_DESC}."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+#, fuzzy
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "بر?ا?? ${VIDALIA_NAME}"
+
+#, fuzzy
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"ا?ن دست?ار شما را در سرتاسر ?ار?ذار? ${VIDALIA_DESC} هدا?ت م? ?ند.\n"
+"\n"
+"$_CLICK"
+
+#, fuzzy
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "به دست?ار بر?ا?? ${VIDALIA_NAME} خوش آمد?د"
+
+#, fuzzy
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "بر?ه اصل? ${VIDALIA_NAME}"
+
+#, fuzzy
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "?ار?ذار? ${VIDALIA_DESC}."
+
+#, fuzzy
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "اجرا ?ردن در راه انداز?"
+
+#, fuzzy
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "اجرا ?ردن ${VIDALIA_NAME} در راه انداز? بطور خود?ار."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "افزودن به فهرست آغاز"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "افزودن ${VIDALIA_NAME} به فهرست آغاز."
+
+#, fuzzy
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "اجرا?ردن ${VIDALIA_NAME}"
+
+#, fuzzy
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr "?ار?ذار? ${TOR_DESC}."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+#, fuzzy
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "?ار?ذار? ${TOR_DESC}."
+
+#, fuzzy
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"شما ??شتر دارا? ?? ?رونده ???ربند? تور م? باش?د.$\n"
+"$\n"
+"آ?ا م? خواه?د آن را با ?رونده ???ربند? نمونه ??ش ?ز?ده جا? نوشت ?ن?د؟"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "مستندات"
+
+#, fuzzy
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "?ار?ذار? مستندات ${TOR_NAME}."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "افزودن به فهرست آغاز"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "افزودن ${TOR_NAME} به فهرست آغاز."
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr ""
+
+#, fuzzy
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "?ار?ذار? ${POLIPO_DESC}."
+
+#, fuzzy
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "افزودن به فهرست آغاز"
+
+#, fuzzy
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "افزودن ${POLIPO_NAME} به فهرست آغاز."
+
+#, fuzzy
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "اجرا ?ردن در راه انداز?"
+
+#, fuzzy
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "اجرا ?ردن ${POLIPO_NAME} در راه انداز? بطور خود?ار."
+
+#, fuzzy
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr "?ار?ذار? ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+#, fuzzy
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "?ار?ذار? ${TORBUTTON_DESC}."
+
+#, fuzzy
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "افزودن به فا?رفا?س"
+
+#, fuzzy
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "افزودن ?سوند ${TORBUTTON_DESC} به فا?رفا?س."
+
+#, fuzzy
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "فا?رفا?س در س?ستم شما ??دا نشد. ?ار?ذار? نشدن د?مه تور."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "fa"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/fi/vidalia_fi.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/fi/vidalia_fi.po
new file mode 100644
index 0000000..cc3cc4f
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/fi/vidalia_fi.po
@@ -0,0 +1,299 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia Windows Installers\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2010-04-08 15:41-0600\n"
+"Last-Translator: AmaliaH <hilkka39 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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "{BUNDLE_NAME}n asennus"
+
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Tämä velho auttaa asentamaan Tor-ohjelman, Vidalian, Polipon ja Torbuttonin.\n"
+"Tor on järjestelmä, jonka avulla voit käyttää Internettiä tuntemattomana "
+"tekemällä anonyymiseksi sivujen selailun, pikaviestimisen, irkkaamisen ja "
+"muiden vastaavien ohjelmien käytön. Vidalia on graafinen käyttöliittymä "
+"jolla ohjataan, seurataan ja säädetään Tor-ohjelman toimintaa.\n"
+"\n"
+"Polipo on välimuistina toimiva web välityspalvelin, joka auttaa parantaa "
+"nettiselailun nopeutta Torria käytettäessä.\n"
+"\n"
+"Torbutton on Firefoxin lisäosa, jolla voi helposti ottaa käyttöön tai "
+"poistaa käytöstä anonyymisen sivujen selailun.\n"
+"\n"
+"Jos koneelle on jo asennettu Tor, Vidalia, Polipo, Privoxy tai Firefox, on "
+"suositeltavaa tarkistaa ettei mikään niistä ole päällä ennen tämän "
+"asennuksen jatkamista.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Tervetuloa ${BUNDLE_NAME}n asennukseen"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "${TOR_NAME}-asennusdokumentaatio"
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"Asennus on valmis.\n"
+"Tutustu https://www.torproject.org/docs/tor-doc-windows -ohjesivuun missä "
+"kerrotaan kuinka tehdä Tor-ohjelman vaatimat asetukset eri ohjelmille.\n"
+"\n"
+"Jos asensit Torbuttonin, Firefox tulee käynnistää uudestaan."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Käynnistä asennetut komponentit nyt"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia on käyttöliittymä ohjaamaan, tarkkailemaan ja säätämään Tor-ohjelman "
+"asetuksia."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Poista ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME}:n asennus"
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Tämä velho auttaa asentamaan Vidalian, joka on käyttöliittymä ohjaamaan, "
+"tarkkailemaan ja säätämään Tor-ohjelman toimintaa.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Tervetuloa ${VIDALIA_NAME}:n asennukseen"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "${VIDALIA_NAME}:n kotisivu"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia on käyttöliittymä, joka auttaa ohjaamaan, tarkkailemaan ja säätämään "
+"Tor-ohjelmaa."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Käynnistä Windowsin käynnistyessä"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Käynnistä automaattisesti ${VIDALIA_NAME} Windowsin käynnistyessä."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Lisää Käynnistä-valikkoon"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Lisää ${VIDALIA_NAME} Käynnistä-valikkoon."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Käynnistä ${VIDALIA_NAME} nyt"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor on järjestelmä, jolla voi käyttää Internettiä tuntemattomasti tekemällä "
+"anonyymiseksi sivujen selailun, pikaviestimisen, irkkaamisen ja muiden "
+"käytön."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Poista ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Asenna ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Sinulla on jo ennestään Tor asetustiedosto.$\n"
+"$\n"
+"Haluatko, että se korvataan esimerkki asetustiedostolla?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Dokumentaatio"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Asenna ${TOR_NAME}-dokumentaatio."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Lisää Käynnistä-valikkoon"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Lisää ${TOR_NAME} Käynnistä-valikkoon."
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+"Polipo on välimuistiin tallentava web välityspalvelin joka auttaa "
+"parantamaan web selailun nopeutta Torria käytettäessä."
+
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "Poista ${POLIPO_DESC}."
+
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "Asenna ${POLIPO_DESC}."
+
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "Lisää Käynnistä-valikkoon"
+
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "Lisää ${POLIPO_NAME} Käynnistä-valikkoon."
+
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "Käynnistä Windowsin käynnistyessä"
+
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "Käynnistä automaattisesti ${POLIPO_NAME} Windowsin käynnistyessä."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton on Firefox lisäosa, jonka avulla voi ottaa nopeasti käyttöön tai "
+"poistaa käytöstä anonyymisen web sivujen selailun."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Poista ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Asenna ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Lisää Firefoxiin"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Lisää ${TORBUTTON_DESC} -lisäosa Firefoxiin."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "Firefoxia ei löytynyt koneelta. Torbuttonia ei voitu asentaa."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Sovelluksen tiedot"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Poista tallennetut ohjelmatiedot ja asetustiedostot."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "fi"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Firefox ei ole asennettu"
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+"Turvallisuuden vuoksi Firefoxin asentaminen on suositeltavaa ennen "
+"jatkamista."
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"Mozilla Firefox selain ei ole asennettuna tähän tietokoneeseen.\n"
+"Tor toimii muillakin selaimilla, kuten Internet Explorer, mutta\n"
+"on helpompaa käyttää Firefoxilla, joka lisäksi turvaa yksityisyyden "
+"paremmin.\n"
+"\n"
+"Jos haluat asentaa Firefoxin, paina Peruuta ja mene\n"
+"Firefoxin lataussivulle osoitteeseen:"
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+"Kun olet asentanut Firefoxin, voit uudestaan käynnistää\n"
+"Tor-asennuksen.\n"
+"\n"
+"Vaihtoehtoisesti voit asentaa Tor-ohjelman ilman Firefoxia\n"
+"painamalla Jatka."
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/firefox-warning.ini b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/firefox-warning.ini
new file mode 100644
index 0000000..54cc0d7
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/firefox-warning.ini
@@ -0,0 +1,34 @@
+[Settings]
+NumFields=3
+Title=Firefox is not installed
+CancelEnabled=1
+CancelShow=1
+BackEnabled=1
+CancelButtonText=
+NextButtonText=
+BackButtonText=
+
+[Field 1]
+Type=Label
+Left=12
+Top=6
+Right=286
+Bottom=65
+Text=The Mozilla Firefox Web browser is not installed on your computer. \r\nTor will work with other browsers, such as Internet Explorer, but\r\nis easier to use with Firefox, which also does a better job of \r\nprotecting your anonymity. \r\n\r\nIf you would like to install Firefox, please press Cancel, then go \r\nto the Firefox download page at
+
+[Field 2]
+Type=Link
+Left=64
+Top=65
+Right=171
+Bottom=74
+Text=http://www.mozilla.com/firefox/
+State=http://www.mozilla.com/firefox/
+
+[Field 3]
+Type=Label
+Left=12
+Top=78
+Right=286
+Bottom=127
+Text="When you are done installing Firefox, you can once again run the \r\nTor installer.\r\n\r\nOr, if you would prefer to install Tor without Firefox, simply \r\npress Continue. "
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/fr/vidalia_fr.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/fr/vidalia_fr.po
new file mode 100644
index 0000000..8a73d0f
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/fr/vidalia_fr.po
@@ -0,0 +1,304 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2009-09-21 10:44+0000\n"
+"Last-Translator: Michael Scherer <misc at zarb.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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "Mise à jour de ${BUNDLE_NAME}"
+
+# Traduction de la partie sur Polipo
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Cet assistant vous guidera pendant l'installation de Tor, Vidalia, Privoxy, "
+"et de Torbutton.\n"
+"\n"
+"Tor est un système pour utiliser internet anonymement, vous aidant à "
+"anonymer la navigation Web, la publication, la messagerie instantanée, "
+"l'IRC, et plus encore. Vidalia est un logiciel qui vous aide à "
+"contrôler,surveiller et configurer Tor.\n"
+"\n"
+"Polipo est un mandataire proxy de cache qui améliore la navigation web à "
+"travers Tor.\n"
+"\n"
+"Torbutton est un module complémentaire de Firefox qui vous permet d'activer "
+"ou de désactiver rapidement la navigation anonyme.\n"
+"\n"
+"Si vous avez déjà installé Tor, Vidalia, Privoxy, ou Firefox, assurez-vous "
+"qu'ils ne sont pas démarrés avant de poursuivre l'installation.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Bienvenue dans l'Assistant d'installation de ${BUNDLE_NAME}"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "Documentation de l'installation de ${TOR_NAME}"
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"L'installation est terminée.\n"
+"Consultez la page https://www.torproject.org/docs/tor-doc-windows pour "
+"apprendre comment configurer vos applications avec Tor.\n"
+"\n"
+"Si vous venez d'installer Torbutton, vous devrez redémarrer Firefox."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Démarrer les composants installés maintenant"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia est un logiciel qui vous aide à contrôler,surveiller et configurer "
+"Tor."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Supprimer ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "Mise à jour de ${VIDALIA_NAME}"
+
+# GUI traduit en logiciel pour plus de clarté
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Cet assistant vous guidera pendant l'installation de Vidalia, un logiciel "
+"qui vous aide à contrôler,surveiller et configurer Tor.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Bienvenue dans l'Assistant d'installation de ${VIDALIA_NAME}"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "Site Web de ${VIDALIA_NAME}"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia est un logiciel qui vous aide à contrôler,surveiller et configurer "
+"Tor."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Lancer au démarrage"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Lancer automatiquement ${VIDALIA_NAME} au démarrage."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Ajouter au Menu Démarrer"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Ajouter ${VIDALIA_NAME} à votre Menu Démarrer."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Lancer ${VIDALIA_NAME}"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor est un système pour utiliser internet anonymement, vous aidant à "
+"anonymer la navigation Web, la publication, la messagerie instantanée, "
+"l'IRC, et plus encore."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Supprimer ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Installer ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Vous avez déjà un fichier de configuration de Tor.$\n"
+"$\n"
+"Voulez-vous le remplacer par le fichier de configuration par défaut?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Documentation"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Installer la documentation de ${TOR_NAME}."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Ajouter au Menu Démarrer"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Ajouter ${TOR_NAME} à votre Menu Démarrer."
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+"Polipo est un mandataire proxy de cache qui améliore la navigation web à "
+"travers Tor."
+
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "Supprimer ${POLIPO_DESC}."
+
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "Installer ${POLIPO_DESC}."
+
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "Ajouter au Menu Démarrer"
+
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "Ajouter ${POLIPO_NAME} à votre Menu Démarrer."
+
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "Lancer au démarrage"
+
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "Lancer automatiquement ${POLIPO_NAME} au démarrage."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton est un module complémentaire de Firefox qui vous permet d'activer "
+"ou de désactiver rapidement la navigation anonyme."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Supprimer ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Installer ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Ajouter à Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Ajouter l'extension ${TORBUTTON_DESC} à Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+"Firefox n'a pas été trouvé sur votre système. Torbutton ne sera pas installé."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Données de l'Application"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+"Supprimer les fichiers de configuration et les données de l'application."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "fr"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Firefox n'est pas installé"
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+"Nous recommandons, pour plus de sureté, l'installation de firefox avant de "
+"continuer. "
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"Le navigateur Mozilla Firefox n'est pas installé sur votre ordinateur.\n"
+"Tor fonctionnera avec d'autres navigateurs, tel que Internet Explorer, mais\n"
+"il est simple à utiliser avec Firefox, qui est aussi plus adapté pour\n"
+"proteger votre anonymat.\n"
+"\n"
+"Si vous voulez intaller Firefox, merci de presser Annuler, puis allez\n"
+"sur la page de téléchargement de Firefox"
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+"Quand vous aurez installé Firefox, vous pourrez à nouveau lancer l'\n"
+"installeur de Tor.\n"
+"\n"
+"Ou, si vous préférez installer Tor sans Firefox, pressez simplement\n"
+"Continuer."
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/fur/vidalia_fur.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/fur/vidalia_fur.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/fur/vidalia_fur.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/gl/vidalia_gl.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/gl/vidalia_gl.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/gl/vidalia_gl.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/gu/vidalia_gu.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/gu/vidalia_gu.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/gu/vidalia_gu.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/he/vidalia_he.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/he/vidalia_he.po
new file mode 100644
index 0000000..3040037
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/he/vidalia_he.po
@@ -0,0 +1,281 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2008-07-17 03:13+0000\n"
+"Last-Translator: Matt <edmanm at vidalia-project.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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "התקנת ${BUNDLE_NAME}"
+
+#, fuzzy
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"אשף זה ינחה אותך בעת התקנת Tor, Vidalia, Privoxy ו-Torbutton.\n"
+"\n"
+"Tor היא מערכת לשימוש אנונימי באינטרנט, לגלישה ופרסום אתרי רשת, תקשרות מסרים "
+"מידיים, IRC ועוד. Vidalia היא ממשק גראפי לשליטה, ניטור והגדרת Tor.\n"
+"\n"
+"Privoxy הוא שרת פרוקסי מסנן המגן על פרטיותך ועוזר להסיר פרסומות וחלונות "
+"קופצים.\n"
+"\n"
+"Torbutton היא הרחבת Firefox המאפשרת להפעיל ולכבות גלישה אנונימית במהירות.\n"
+"\n"
+"אם התקנת Tor, Vidalia, Privoxy או Firefox בעבר, אנא ודא שהם לא פעילים לפני "
+"המשך ההתקנה.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "ברוכים הבאים לאשף התקנת ${BUNDLE_NAME}"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "מסמכי התקנה של ${TOR_NAME}"
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"ההתקנה הסתיימה.\n"
+"אנא ראה https://www.torproject.org/docs/tor-doc-windows על מנת ללמוד כיצד "
+"להגדיר את התוכנות לשימוש ב-Tor.\n"
+"\n"
+" אם התקנת Torbutton יש צורך להתחיל מחדש את Firefox."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "הרץ רכיבים מותקנים כעת"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia הינו ממשק גרפי המאפשר שליטה, ניטור והגדרת Tor."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "הסר ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "התקנת ${VIDALIA_NAME}"
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"אשף זה ידריך אותך במהלך התקנת Vidalia, ממשק גרפי העוזר בשליטה, ניטור והגדרת "
+"Tor.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "ברוכים הבאים לאשף התקנת ${VIDALIA_NAME}"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "עמוד הבית של ${VIDALIA_NAME}"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia הינו ממשק גרפי המאפשר שליטה, ניטור והגדרת Tor."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "הרץ בעת אתחול"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "הרץ ${VIDALIA_NAME} אוטומטית בעת אתחול."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "הוסף לתפריט התחלה"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "הוסף את ${VIDALIA_NAME} לתפריט התחלה."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "הרץ את ${VIDALIA_NAME} כעת"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor היא מערכת לשימוש אנונימי באינטרנט, לגלישה ופרסום אתרי רשת, תקשרות מסרים "
+"מידיים, IRC ועוד."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "הסר ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "התקן ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"קובץ הגדרות Tor נמצא.$\n"
+"$\n"
+"האם ברצונך להחליפו בקובץ הגדרות ברירת המחדל?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "מסמכים"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "התקן מסמכי ${TOR_NAME}."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "הוסף לתפריט התחלה"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "הוסף את ${TOR_NAME} לתפריט התחלה."
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+
+#, fuzzy
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "הסר ${POLIPO_DESC}."
+
+#, fuzzy
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "התקן ${POLIPO_DESC}."
+
+#, fuzzy
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "הוסף לתפריט התחלה"
+
+#, fuzzy
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "הוסף את ${POLIPO_NAME} לתפריט התחלה."
+
+#, fuzzy
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "הרץ בעת אתחול"
+
+#, fuzzy
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "הרץ ${POLIPO_NAME} אוטומטית בעת אתחול."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton הינה הרחבת Firefox המאפשרת הפעלה וכיבוי מהיר של גלישה אנונימית."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "הסר ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "התקן ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "הוסף ל-Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "הוסף את הרחבת ${TORBUTTON_DESC} ל-Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "Firefox לא נמצא במערכת. לא מתקין Torbutton."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "מידע תוכנה"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "הסר מידע תוכנה שמור וקבצי הגדרה."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "he"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/hi/vidalia_hi.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/hi/vidalia_hi.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/hi/vidalia_hi.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/hr/vidalia_hr.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/hr/vidalia_hr.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/hr/vidalia_hr.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/hu/vidalia_hu.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/hu/vidalia_hu.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/hu/vidalia_hu.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/id/vidalia_id.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/id/vidalia_id.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/id/vidalia_id.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/is/vidalia_is.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/is/vidalia_is.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/is/vidalia_is.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/it/vidalia_it.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/it/vidalia_it.po
new file mode 100644
index 0000000..6d439bd
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/it/vidalia_it.po
@@ -0,0 +1,307 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2009-10-02 09:39+0000\n"
+"Last-Translator: Jan Reister <jan.reister at unimi.it>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "Installazione di ${BUNDLE_NAME}"
+
+#, fuzzy
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Questo wizard assisterà nell'installazione di Tor, Vidalia, Privoxy e "
+"Torbutton.\n"
+"\n"
+"Tor è un software che consente di usare Internet in modo anonimo, aiutandoti "
+"a rendere anonimela navigazione e la pubblicazione sul web, la messaggistica "
+"istantanea, IRC e altro ancora. Vidalia è una interfaccia grafica che "
+"semplifica il controllo e la configurazione di Tor.\n"
+"\n"
+"Privoxy è un proxy filtrante che protegge la privacy e rimuove pubblicità "
+"(ad, banner e popup).\n"
+"\n"
+"Torbutton è un'estensione di Firefox che consente di attivare o disattivare "
+"rapidamente la navigazione anonima.\n"
+"\n"
+"Se esistono già precedenti installazioni di Tor, Vidalia, Privoxy o Firefox "
+"è consigliabile assicurarsi che questi programmi siano chiusi prima di "
+"continuare con l'installazione.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Benvenuti nell'installazione guidata di ${BUNDLE_NAME}"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "Documenti sull'installazione di ${TOR_NAME}"
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"L'installazione è stata completata.\n"
+"Consultare https://www.torproject.org/docs/tor-doc-windows per informazioni "
+"sull'uso e sulla configurazione di Tor.\n"
+"\n"
+"Se Torbutton è stato installato sarà necessario riavviare Firefox."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Avvia ora i componenti installati"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia è una interfaccia grafica per controllare, monitorare e configurare "
+"Tor."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Disinstalla ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "Installazione di ${VIDALIA_NAME}"
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Questa procedura guidata assisterà nell'installazione di Vidalia, un "
+"programma grafico di controllo e configurazione di Tor.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Benvenuti nell'installazione guidata di ${VIDALIA_NAME}"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "Homepage di ${VIDALIA_NAME}"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia è una GUI per controllare, monitorare e configurare Tor."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Attiva all'avvio del pc"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Avvia ${VIDALIA_NAME} automaticamente all'accensione del pc."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Aggiungi al menu Avvio"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Aggiunge ${VIDALIA_NAME} alla cartella Progammi del menu Avvio."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Avvia ${VIDALIA_NAME} adesso"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor è un sistema per usare Internet in modo anonimo, permettendoti di "
+"rendere anonimi la navigazione e la pubblicazione web, la messaggistica "
+"istantanea, IRC, e altro ancora."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Disinstalla ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Installa ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Un file di configurazione Tor è già presente nel sistema.$\n"
+"$\n"
+"Sovrascriverlo con il file di configurazione standard?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Documentazione"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Installa la documentazione di ${TOR_NAME}."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Aggiungi al menu Avvio"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Aggiunge ${TOR_NAME} alla cartella Programmi del menu Avvio."
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+"Polipo è un caching web proxy che migliora le prestazioni dela navigazione "
+"web con Tor."
+
+#, fuzzy
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "Disinstalla ${POLIPO_DESC}."
+
+#, fuzzy
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "Installa ${POLIPO_DESC}."
+
+#, fuzzy
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "Aggiungi al menu Avvio"
+
+#, fuzzy
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "Aggiunge ${POLIPO_NAME} alla cartella Programmi del menu Avvio."
+
+#, fuzzy
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "Attiva all'avvio del pc"
+
+#, fuzzy
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "Avvia ${POLIPO_NAME} all'accensione del pc."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton è un'estensione per Firefox che consente di attivare o disattivare "
+"rapidamente la navigazione anonima."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Disinstalla ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Installa ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Aggiungi a Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Aggiunge l'estensione ${TORBUTTON_DESC} a Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+"Firefox non è stato trovato nel sistema. Torbutton non sarà installato."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Dati dell'applicazione"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Elimina i dati dell'applicazione salvati ed i file di configurazione."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "it"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Firefox non è installato"
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+"Consigliamo di installare Firefox prima di continuare, per una maggiore "
+"sicurezza"
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"Il browser web Mozilla Firefox non è installato sul tuo computer.\n"
+"Tor funzionerà con altri browser, come Internet Explorer, ma\n"
+"è più semplice da utilizzare con Firefox, che funziona anche meglio\n"
+"per proteggere il tuo anonimato.\n"
+"\n"
+"Se vuoi installare Firefox, premi Annulla, quindi vai\n"
+"alla pagina di download di Firefox a"
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+"Quando hai installato Firefox, puoi nuovamente eseguire\n"
+"l'installatore di Tor.\n"
+"\n"
+"O, se preferisci installare Tor senza Firefox,\n"
+"premi Avanti per continuare"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ja/vidalia_ja.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ja/vidalia_ja.po
new file mode 100755
index 0000000..68b1c55
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ja/vidalia_ja.po
@@ -0,0 +1,226 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2010-04-10 02:25-0600\n"
+"Last-Translator: Shinji R. Yamane <s-yamane at computer.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"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} セットアップ"
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+"このウィザードはTor, Vidalia, Privoxy, and Torbuttonのインストールを案内します.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Privoxy, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "${BUNDLE_NAME} セットアップウィザードへようこそ"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"インストールは終了しました。\n"
+"Torを利用するための設定については、https://www.torproject.org/docs/tor-doc-windows をご覧ください。\n"
+"\n"
+"Torbuttonをインストールされた方は、Firefoxを再起動する必要があります."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia はTorの制御・監視・設定を支援するグラフィカルユーザーインタフェースです。"
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} セットアップ"
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "${VIDALIA_NAME} セットアップウィザードへようこそ"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "VidaliaはTorの制御・監視・設定を支援するグラフィカルユーザーインタフェースです。"
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr "Torはインターネットを介した匿名性によって、ウェブでの閲覧・公表・インスタントメッセージ・チャットを支援するシステムです。"
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr "Privoxyは、広告・バナー・ポップアップを取り除き、あなたのプライバシを守るフィルタリング用のウェブプロクシです。"
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr "Torbuttonは匿名でのウェブ閲覧を簡単に有効化・無効化できるFirefoxエクステンションです。"
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ka/vidalia_ka.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ka/vidalia_ka.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ka/vidalia_ka.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/km/vidalia_km.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/km/vidalia_km.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/km/vidalia_km.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ko/vidalia_ko.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ko/vidalia_ko.po
new file mode 100755
index 0000000..b208358
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ko/vidalia_ko.po
@@ -0,0 +1,210 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2010-02-06 04:37-0700\n"
+"Last-Translator: Ui Sung Lee <free5177 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"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} 설치"
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "환영합니다. ${BUNDLE_NAME} 설치 마법사"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "설치 설명서"
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"설치가 완료됩니다. \\ n자세한 내용은 https://www.torproject.org/docs/tor-doc-windows토르를 "
+"사용하여 응용 프로그램을 구성하는 방법을 배울 수있습니다.\n"
+"\n"
+"Torbutton 설치되어있는 경우, 당신은 파이어 폭스를 다시 시작해야 할 것입니다."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ku/vidalia_ku.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ku/vidalia_ku.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ku/vidalia_ku.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/mktransform.vbs b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/mktransform.vbs
new file mode 100644
index 0000000..0d2e5e5
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/mktransform.vbs
@@ -0,0 +1,67 @@
+' Copyright (C) 2008-2009 The Tor Project, Inc.
+' See LICENSE file for rights and terms.
+'
+' This script automates the task of creating transforms from one MSI database
+' to another. This is required for language based transforms, for example.
+'
+' To apply vidalia_fr.msi localization to vidalia.msi with name 'fr':
+' cscript.exe mktransform.vbs fr vidalia.msi vidalia_fr.msi
+'
+Const msiOpenDatabaseModeReadOnly = 0
+Const msiOpenDatabaseModeTransact = 1
+Const msiViewModifyAssign = 3
+Const msiTransformErrorNone = 0
+Const msiTransformValidationNone = 0
+
+Dim message
+If Wscript.Arguments.Count < 3 Then
+ message = "Usage: mktransform <transform name> <minimal msi> <target msi>"
+ Wscript.Echo message
+ Wscript.Quit 1
+End If
+
+Dim transformName
+Dim minMsiFile
+Dim currMsiFile
+transformName = Wscript.Arguments.Item(0)
+minMsiFile = Wscript.Arguments.Item(1)
+currMsiFile = Wscript.Arguments.Item(2)
+
+CreateTransform transformName, minMsiFile, currMsiFile
+Wscript.Quit 0
+
+Sub CreateTransform (TransformName, MinMsiFile, CurrMsiFile)
+ ' Create transform from minimal to current/target MSI database
+ Set installer = Wscript.CreateObject("WindowsInstaller.Installer") : CheckError
+ Dim database1 : Set database1 = installer.OpenDatabase(MinMsiFile, msiOpenDatabaseModeTransact) : CheckError
+ Dim database2 : Set database2 = installer.OpenDatabase(CurrMsiFile, msiOpenDatabaseModeReadOnly) : CheckError
+ Dim transform : transform = TransformName & ".mst"
+ database2.GenerateTransform database1, transform : CheckError
+ database2.CreateTransformSummaryInfo database1, transform, msiTransformErrorNone, msiTransformValidationNone : CheckError
+
+ ' Embed Transform into the database with the requested name
+ Set view = database1.OpenView("SELECT `Name`,`Data` FROM _Storages") : CheckError
+ view.Execute : CheckError
+ Set record = installer.CreateRecord(2)
+ record.StringData(1) = TransformName
+ record.SetStream 2, transform : CheckError
+ view.Modify msiViewModifyAssign, record : CheckError
+ database1.Commit : CheckError
+ Set database1 = Nothing
+ Set database2 = Nothing
+End Sub
+
+Sub CheckError
+ If Err = 0 Then Exit Sub
+ Dim message, errRec
+ message = Err.Source & " " & Hex(Err) & ": " & Err.Description
+ If Not installer Is Nothing Then
+ Set errRec = installer.LastErrorRecord
+ If Not errRec Is Nothing Then
+ message = message & vbNewLine & errRec.FormatText
+ End If
+ End If
+ Wscript.Echo message
+ Wscript.Quit 1
+End Sub
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/mt/vidalia_mt.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/mt/vidalia_mt.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/mt/vidalia_mt.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/nb/vidalia_nb.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/nb/vidalia_nb.po
new file mode 100755
index 0000000..351a278
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/nb/vidalia_nb.po
@@ -0,0 +1,260 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2009-12-26 17:42-0700\n"
+"Last-Translator: Cato Auestad <c2auestad 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"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} oppsett"
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+"Denne veiledningen vil innstallere Tor, Vidalia, Privoxy og Torbutton.\n"
+"\n"
+"Tor er et system for å surfe internett anonymt, ved å anonymisere "
+"internettlesingen og publiseringen din, lynmeldinger, IRC og mer. Vidalia er "
+"et grafisk brukergrensesnitt som hjelper deg med å kontrollere, overvåke og "
+"konfigurere Tor.\n"
+"\n"
+"Privoxy er en web proxy som hjelper deg med å filtere vekk reklame, bannere "
+"og sprettvinduer for å beskytte din sikkerhet.\n"
+"\n"
+"Torbutton er en Firefox-utvidelse som tillater deg å kjapt bytte mellom å "
+"aktivere og deaktivere anonym nettlesing.\n"
+"\n"
+"Hvis du har en tidligere versjon av Tor, Vidalia, Privoxy eller Firefox så "
+"vær sikker på at de ikke kjører før du fortsetter med denne innstallasjonen.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Velkommen til ${BUNDLE_NAME} Oppsettveiledning"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "${TOR_NAME} innstallasjonsdokumentasjon"
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"Innstalleringen er fullført.\n"
+"Vennligst se https://www.torproject.org/docs/tor-doc-windows om hvordan du "
+"skal konfigurere dine programmer til bruk med Tor.\n"
+"\n"
+"Hvis du innstallerte Torbutton trenger du å restarte Firefox."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Kjør innstallerte komponenter nå."
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia er et grafisk brukergrensesnitt som hjelper deg med å kontrollere, "
+"overvåke og konfigurere Tor."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Fjern ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} oppsett"
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+"Denne veiledningen vil vise deg innstallasjonen av Vidalia, et grafisk "
+"brukergrensesnitt som hjelper deg med å kontrollere, overvåke og konfigurere "
+"Tor.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Velkommen til ${VIDALIA_NAME} Oppsettsveiledning"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "${VIDALIA_NAME} nettside"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia er et grafisk brukergrensesnitt som hjelper deg med å kontrollere, "
+"overvåke og konfigurere Tor."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Kjør på oppstart"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Automatisk kjør ${VIDALIA_NAME} på oppstart."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Legg til i Start-menyen"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Legg til ${VIDALIA_NAME} i din Start-meny."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Kjør ${VIDALIA_NAME}"
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor er et system for å surfe internett anonymt, ved å anonymisere din "
+"internettlesing og publisering, lynmeldinger, IRC og mer."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Fjern ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Innstaller ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Hvis du allerede har en Tor-konfigurasjonsfil.$\n"
+"$\n"
+"Vil du overskrive den med en standard konfigurasjonsfil?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Dokumentasjon"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Innstaller ${TOR_NAME} dokumentasjon."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Legg til Start-meny"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Legg til ${TOR_NAME} i din Start-meny."
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+"Privoxy er en web proxy som hjelper deg med å filtere vekk reklame, bannere "
+"og sprettvinduer for å beskytte din sikkerhet."
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr "Fjern ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr "Innstaller ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr "Legg til i Start-meny"
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr "Legg til ${PRIVOXY_NAME} i din Start-meny."
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr "Kjør på oppstart"
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr "Automatisk kjør ${PRIVOXY_NAME} i oppstart."
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+"Torbutton er en Firefox-utvidelse som tillater deg å kjapt bytte mellom å "
+"aktivere og deaktivere anonym nettlesing."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Fjern ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Innstaller ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Legg til i Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Legg til ${TORBUTTON_DESC} i Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "Firefox var ikke funnet på ditt system. Innstallerer ikke Torbutton."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Programdata"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Fjern lagret programdata og konfigurasjonsfiler."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "en"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Firefox er ikke innstallert"
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+"Vi anbefaler at du innstallerer Firefox før du fortsetter, for best "
+"sikkerhet."
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"Mozilla Firefox nettleseren er ikke innstallert på din maskin.\n"
+"Tor vil fungere med andre nettlesere, som Internet Explorer, men\n"
+"det er enklere og bruke med Firefox, som også gjør en bedre innsats med\n"
+"å beskytte din anonymitet.\n"
+"\n"
+"Hvis du vil innstallere Firefox, vennligst trykk Avbryt og gå\n"
+"til Firefox-nedlastingsside hos"
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/nl/vidalia_nl.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/nl/vidalia_nl.po
new file mode 100644
index 0000000..0159fc7
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/nl/vidalia_nl.po
@@ -0,0 +1,295 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2009-09-22 10:57+0000\n"
+"Last-Translator: Flabber <flabber at online.be>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} setup"
+
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Deze wizard zal u leiden door de installatie van Tor, Vidalia, Privoxy, and "
+"Torbutton.\n"
+"\n"
+"Tor is een systeem om het internet anoniem te gebruiken, om anoniem te "
+"surfen, te publiceren, berichten te sturen, IRC enzomeer. Vidalia is een "
+"programma om Tor te configureren en op te volgen.\n"
+"\n"
+"Polipo is een net-proxy dat de performantie van het surfen met Tor verhoogt.\n"
+"\n"
+"Torbutten is een Firefox-extensie dat toelaat om snel te wisselen tussen "
+"gewoon en anoniem surfen.\n"
+"\n"
+"Indien u eerder Tor, Vidalia, Polipo, of Firefox heeft geïnstalleerd, zorg "
+"dan dat deze zijn afgesloten voordat u verder gaat met deze installatie.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Welkom bij de ${BUNDLE_NAME} Setup Wizard"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "${TOR_NAME} installatie documentatie"
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"De installatie is voltooid.\n"
+"Bekijk alstublieft https://www.torproject.org/docs/tor-doc-windows voor meer "
+"informatie over het configureren van applicaties voor gebruik via Tor.\n"
+"\n"
+"Indien u Torbutton heeft geïnstalleerd, dient u Firefox te herstarten."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Start de geïnstalleerde onderdelen nu"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia is een programma om Tor te configureren en op te volgen."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Verwijder ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} setup"
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Deze wizard zal u leiden door de installatie van Vidalia, een programma om "
+"Tor te configureren en op te volgen.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Welkom bij de ${VIDALIA_NAME} Setup Wizard"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "${VIDALIA_NAME} webpagina"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia is een programma om Tor te configureren en op te volgen."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Start automatisch"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Start ${VIDALIA_NAME} automatisch bij het opstarten van Windows."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Voeg toe aan Start Menu"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Voeg ${VIDALIA_NAME} toe aan uw Start menu."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Start ${VIDALIA_NAME} nu"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor is een systeem om het internet anoniem te gebruiken, om anoniem op het "
+"net te surfen, te publiceren, berichten te sturen, IRC, en zo meer."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Verwijder ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Installeer ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"U heeft reeds een Tor configuratie bestand.$\n"
+"$\n"
+"Wilt u het overschrijven met het standaard voorbeeld configuratie bestand?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Documentatie"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Installeer ${TOR_NAME} documentatie."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Voeg toe aan Start Menu"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Voeg ${TOR_NAME} toe aan uw Start menu."
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+"Polipo is een net-proxy om de performantie van het surfen via Tor te "
+"verhogen."
+
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "Verwijder ${POLIPO_DESC}."
+
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "Installeer ${POLIPO_DESC}."
+
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "Voeg toe aan Start Menu"
+
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "Voeg ${POLIPO_NAME} toe aan uw Start menu."
+
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "Start automatisch"
+
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "Start ${POLIPO_NAME} automatisch bij het opstarten van Windows."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton is een Firefox-extensie dat toelaat snel te wisselen tussen gewoon "
+"en anoniem surfen."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Verwijder ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Installeer ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Voeg toe aan Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Voeg de ${TORBUTTON_DESC} extensie toe aan Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+"Firefox werd niet gevonden op uw systeem. Torbutton wordt niet geïnstalleerd."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Toepassingsgegevens"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+"Verwijder de opgeslagen toepassingsgegevens en de configuratiebestanden."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "nl"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Firefox is niet geïnstalleerd."
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+"Wij raden U aan om Firefox te installeren voor de hoogste veiligheid "
+"vooraleer verder te gaan."
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"Mozilla Firefox is niet geïnstalleerd op uw computer.\n"
+"Tor werkt wel met andere programma's als Internet Explorer, maar \n"
+"is gemakkellijker in gebruik met Firefox, dat daarenboven beter werkt om uw "
+"anonimiteit te bewaren.\n"
+"\n"
+"Als U Firefox wilt installeren, druk op Annuleer, en ga \n"
+"naar de Firefox-pagina op"
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+"Als U klaar bent met de installatie van Firefox, \n"
+"kan U het Tor-installatieprogramma opnieuw starten.\n"
+"\n"
+"Of, indien U Tor wil installeren zonder Firefox, druk \n"
+"Volgende om verder te gaan."
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/pa/vidalia_pa.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/pa/vidalia_pa.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/pa/vidalia_pa.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/pl/vidalia_pl.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/pl/vidalia_pl.po
new file mode 100644
index 0000000..9ec596f
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/pl/vidalia_pl.po
@@ -0,0 +1,304 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia Windows Installers\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2009-09-06 14:24+0000\n"
+"Last-Translator: Lukasz Kieres <zeewolf16 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"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "Instalator ${BUNDLE_NAME}"
+
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Kreator przeprowadzi Cię przez instalację Tora, Vidalii, Polipo oraz "
+"Torbuttona.\n"
+"\n"
+"Tor jest systemem pozwalającym anonimowo surfować po internecie, pomaga "
+"zachować anonimowość podczas przeglądania i publikacji stron www, używania "
+"komunikatorów, IRC i innych. Vidalia jest graficznym interfejsem "
+"użytkownika, który pomaga sterować, monitorować i konfigurować Tora.\n"
+"\n"
+"Polipi jest cache'ującym serwerem proxy, który pomaga zwiększyć wydajność "
+"podczas przeglądania sieci z użycien Tora.\n"
+"Torbutton jest rozszerzeniem Firefoxa, które umożliwa w szybki sposób "
+"przełączanie się w tryb anonimowego surfowania.\n"
+"\n"
+"Jeśli poprzednio instalowałeś Tora, Vidalię, Polipo lub Firefoxa, upewnij "
+"się, że żadne z nich nie jest w tej chwili uruchomione, zanim kontynuujesz "
+"tę instalację.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Witaj w Kreatorze Instalacji ${BUNDLE_NAME}"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "Dokumentacja instalacji ${TOR_NAME}"
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"Instalacja zakończona.\n"
+"Proszę zobaczyć https://www.torproject.org/docs/tor-doc-windows aby "
+"dowiedzieć sić, jak skonfigurować aplikacje do współpracy z Torem.\n"
+"\n"
+"Jeśli instalowałeś Torbutton'a, będziesz musiał uruchomić ponownie Firefox'a."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Uruchom teraz zainstalowane komponenty."
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia jest graficznym interfejsem użytkownika, który pomaga sterować, "
+"monitorować i konfigurować Tora."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Usuń ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "Instalator ${VIDALIA_NAME}"
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Kreator przeprowadzi Cię przez proces instalacji Vidalii, graficznego "
+"interfejsu użytkownika który umożliwia sterowanie, monitorowanie i "
+"konfigurację Tora.\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Witaj w Kreatorze Instalacji ${VIDALIA_NAME}"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "Strona domowa ${VIDALIA_NAME}"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia jest graficznym interfejsem użytkownika, który umożliwa sterowanie, "
+"monitorowanie i konfigurację Tora."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Uruchom na starcie"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Automatycznie uruchamia ${VIDALIA_NAME} przy starcie systemu."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Dodaj do Menu Start"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Dodaje skrót ${VIDALIA_NAME} do Twojego Menu Start."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Uruchom ${VIDALIA_NAME}"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor jest systemem umożliwiającym anonimowe użytkowanie Internetu, pomagając "
+"pozostać Ci anonimowym podczas przeglądania stron www, wysyłania plików, "
+"komunikacji, IRC i innych."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Usuń ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Instaluj ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Posiadasz już plik konfiguracyjny Tora.$\n"
+"$\n"
+"Czy chcesz nadpisać go przykładowym domyślnym plikiem konfiguracyjnym ?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Dokumentacja"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Instaluj dokumentację ${TOR_NAME}."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Dodaj do Menu Start"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Dodaje ${TOR_NAME} do Twojego Menu Start"
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+"Polipo jest cache'ującym serwerem proxy, który przyspiesza przeglądanie "
+"sieci przy użyciu Tora."
+
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "Usuń ${POLIPO_DESC}."
+
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "Instaluj ${POLIPO_DESC}."
+
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "Dodaj do Menu Start"
+
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "Dodaje ${POLIPO_NAME} do Twojego Menu Start"
+
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "Uruchom na starcie"
+
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "Automatycznie uruchamia ${POLIPO_NAME} na starcie systemu."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton jest rozszerzeniem Firefoxa, które umożliwia włączanie i "
+"wyłączanie anonimowego przeglądania stron www w szybki sposób."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Usuń ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Instaluj ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Dodaj do Firefoxa"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Dodaje rozszerzenie ${TORBUTTON_DESC} do Firefoxa."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+"Firefox nie został znaleziony w Twoim systemie. Torbutton nie zostanie "
+"zainstalowany.Firefox nie został znaleziony w systemie. Instalacja "
+"Torbuttona zaniechana."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Dane aplikacji"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Usuń dane aplikacji oraz pliki konfiguracyjne."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "pl"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Firefox nie jest zainstalowany"
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+"Zalecamy zainstalowanie Firefoxa zanim kontynuujesz, dla zachowania "
+"najlepszego bezpieczeństwa."
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"Przeglądarka Mozilla Firefox nie jest zainstalowana na tym komputerze.\n"
+"Tor będzie działać z innymi przeglądarkami, jak Internet Explorer, lecz\n"
+"jest łatwiejszy w użyciu z Firefoxem, który również pomaga lepiej chronić "
+"Twoją anonimowość.\n"
+"\n"
+"Jeśli chcesz zainstalować Firefoxa, proszę nacisnąć Anuluj, i przejść \n"
+"do strony Firefoxa"
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/polipo.conf b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/polipo.conf
new file mode 100644
index 0000000..8691717
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/polipo.conf
@@ -0,0 +1,163 @@
+### $Id: polipo.conf 4189 2009-12-22 16:09:23Z phobos $
+#
+### Basic configuration
+### *******************
+
+# Uncomment one of these if you want to allow remote clients to
+# connect:
+
+# proxyAddress = "::0" # both IPv4 and IPv6
+# proxyAddress = "0.0.0.0" # IPv4 only
+
+proxyAddress = "127.0.0.1"
+proxyPort = 8118
+
+# If you do that, you'll want to restrict the set of hosts allowed to
+# connect:
+
+# allowedClients = "127.0.0.1, 134.157.168.57"
+# allowedClients = "127.0.0.1, 134.157.168.0/24"
+
+allowedClients = 127.0.0.1
+allowedPorts = 1-65535
+
+# Uncomment this if you want your Polipo to identify itself by
+# something else than the host name:
+
+proxyName = "localhost"
+
+# Uncomment this if there's only one user using this instance of Polipo:
+
+cacheIsShared = false
+
+# Uncomment this if you want to use a parent proxy:
+
+# parentProxy = "squid.example.org:3128"
+
+# Uncomment this if you want to use a parent SOCKS proxy:
+
+socksParentProxy = "localhost:9050"
+socksProxyType = socks5
+
+
+### Memory
+### ******
+
+# Uncomment this if you want Polipo to use a ridiculously small amount
+# of memory (a hundred C-64 worth or so):
+
+# chunkHighMark = 819200
+# objectHighMark = 128
+
+# Uncomment this if you've got plenty of memory:
+
+# chunkHighMark = 50331648
+# objectHighMark = 16384
+
+chunkHighMark = 33554432
+
+### On-disk data
+### ************
+
+# Uncomment this if you want to disable the on-disk cache:
+
+diskCacheRoot = ""
+
+# Uncomment this if you want to put the on-disk cache in a
+# non-standard location:
+
+# diskCacheRoot = "~/.polipo-cache/"
+
+# Uncomment this if you want to disable the local web server:
+
+localDocumentRoot = ""
+
+# Uncomment this if you want to enable the pages under /polipo/index?
+# and /polipo/servers?. This is a serious privacy leak if your proxy
+# is shared.
+
+# disableIndexing = false
+# disableServersList = false
+
+disableLocalInterface = true
+disableConfiguration = true
+
+### Domain Name System
+### ******************
+
+# Uncomment this if you want to contact IPv4 hosts only (and make DNS
+# queries somewhat faster):
+#
+# dnsQueryIPv6 = no
+
+# Uncomment this if you want Polipo to prefer IPv4 to IPv6 for
+# double-stack hosts:
+#
+# dnsQueryIPv6 = reluctantly
+
+# Uncomment this to disable Polipo's DNS resolver and use the system's
+# default resolver instead. If you do that, Polipo will freeze during
+# every DNS query:
+
+dnsUseGethostbyname = yes
+
+
+### HTTP
+### ****
+
+# Uncomment this if you want to enable detection of proxy loops.
+# This will cause your hostname (or whatever you put into proxyName
+# above) to be included in every request:
+
+disableVia = true
+
+# Uncomment this if you want to slightly reduce the amount of
+# information that you leak about yourself:
+
+# censoredHeaders = from, accept-language
+# censorReferer = maybe
+
+censoredHeaders = from,accept-language,x-pad,link
+censorReferer = maybe
+
+# Uncomment this if you're paranoid. This will break a lot of sites,
+# though:
+
+# censoredHeaders = set-cookie, cookie, cookie2, from, accept-language
+# censorReferer = true
+
+# Uncomment this if you want to use Poor Man's Multiplexing; increase
+# the sizes if you're on a fast line. They should each amount to a few
+# seconds' worth of transfer; if pmmSize is small, you'll want
+# pmmFirstSize to be larger.
+
+# Note that PMM is somewhat unreliable.
+
+# pmmFirstSize = 16384
+# pmmSize = 8192
+
+# Uncomment this if your user-agent does something reasonable with
+# Warning headers (most don't):
+
+# relaxTransparency = maybe
+
+# Uncomment this if you never want to revalidate instances for which
+# data is available (this is not a good idea):
+
+# relaxTransparency = yes
+
+# Uncomment this if you have no network:
+
+# proxyOffline = yes
+
+# Uncomment this if you want to avoid revalidating instances with a
+# Vary header (this is not a good idea):
+
+# mindlesslyCacheVary = true
+
+# Suggestions from Incognito configuration
+maxConnectionAge = 5m
+maxConnectionRequests = 120
+serverMaxSlots = 8
+serverSlots = 2
+tunnelAllowedPorts = 1-65535
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/polipo.wxs.in b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/polipo.wxs.in
new file mode 100644
index 0000000..c915b1e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/polipo.wxs.in
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="Windows-1252" ?>
+<!--
+ Copyright (C) 2008-2009 The Tor Project, Inc.
+ See LICENSE file for rights and terms.
+ -->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <?define ThisProductVersion="1.0.4" ?>
+ <?define ThisProductVersionDisp="1.0.4.1" ?>
+ <?define UpgradeCode="b45b9db8-8670-4546-8dd4-e9284ca81616" ?>
+
+ <?define CurrProductGUID="22c59fc2-8c94-4151-ad82-2c90bfa7ff99" ?>
+ <?define CurrExecutableGUID="cef195c5-817c-4963-a1f7-03e88c79985b" ?>
+ <?define CurrRegExLibsGUID="04b3e6f5-a4f3-4cc0-adb1-765c39050865" ?>
+ <?define CurrMingwLibsGUID="bd31ec38-27a3-415e-b19f-ccd61bc41d9a" ?>
+ <?define CurrDocumentsGUID="ff70f640-1a87-4eed-9897-277059e55c4f" ?>
+ <?define CurrConfigFileGUID="fbe1473f-de4d-4ca2-a8a4-66f3f92fff7d" ?>
+ <?define CurrStartMenuGUID="0b577f55-1ca5-43b8-9df2-3834843fc80b" ?>
+ <?define CurrDesktopGUID="0e7e07f2-b21b-49ea-a25e-569eae46e0ce" ?>
+ <?define CurrDocsOnDesktopGUID="783fb5f6-835d-4a81-988b-d46c683ac0e2" ?>
+ <?define CurrStartupGUID="60bc5fc3-74d2-4d7b-a659-8acebea93aa4" ?>
+ <?define CurrLocalProgramsGUID="e0c517aa-5eb7-4909-a23f-7fccd7fddeef" ?>
+
+ <Product Name="Polipo $(var.ThisProductVersionDisp)" Id="$(var.CurrProductGUID)"
+ Version="$(var.ThisProductVersion)"
+ Manufacturer="mailto: coderman at gmail.com - test package for The Tor Project, Inc."
+ Language="!(loc.LCID)"
+ UpgradeCode="$(var.UpgradeCode)">
+
+ <Package Id="*" Keywords="Installer"
+ Description="Polipo $(var.ThisProductVersionDisp) Installer"
+ Manufacturer="mailto: coderman at gmail.com - test package for The Tor Project, Inc."
+ InstallerVersion="200" Compressed="yes"
+ InstallPrivileges="limited" />
+
+ <Media Id="1" Cabinet="Polipo.cab" CompressionLevel="high"
+ EmbedCab="yes" DiskPrompt="CD-ROM #1" />
+ <Property Id="DiskPrompt" Value="Polipo $(var.ThisProductVersionDisp) Installation Volume [1]" />
+ <Property Id="ALLUSERS" Secure="yes"/>
+ <Property Id="ReinstallModeText">omus</Property>
+
+ <!-- To avoid placing shortcuts all over the desktop / start menu during a
+ silent installation the NOSC=1 option can be passed to omit shortcuts.
+ This is useful if bundled with other applications like Vidalia that manage
+ configuration and Tor related processes themselves.
+ -->
+ <Property Id="NOSC" Secure="yes"/>
+
+ <!-- Associate this package with the upgrade code for this series
+ to ensure that upgrade installations by Thandy or other means work
+ as expected.
+ The OnlyDetect option must be false to ensure that existing files
+ from an older version are removed and replaced with current files.
+ -->
+ <Upgrade Id="$(var.UpgradeCode)">
+ <UpgradeVersion
+ Property="UPGRADEFOUND"
+ OnlyDetect="no"
+ Minimum="0.0.0"
+ IncludeMinimum="yes"
+ Maximum="$(var.ThisProductVersion)"
+ IncludeMaximum="no"
+ />
+ </Upgrade>
+
+
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="LocalAppDataFolder" Name="LocalAppData">
+ <Directory Id="LocalProgramsFolder" Name="Programs">
+
+ <!-- Until proper support for per-user installs is available we manage Programs folder.
+ Note that this directory will be left in place if it is in use by any other app.
+ -->
+ <Component Id="LocalProgramsFolderRef" Guid="$(var.CurrLocalProgramsGUID)">
+ <CreateFolder />
+ <RemoveFolder Id="RemoveLocalProgramsFolder" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Polipo" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="LocalProgramsFolderRef" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ </Component>
+
+ <Directory Id="LocalProgramsInstDir" Name="Polipo">
+
+ <!-- Main Polipo application files -->
+ <Component Id="PolipoExecutable" Guid="$(var.CurrExecutableGUID)">
+ <CreateFolder/>
+ <RemoveFolder Id="RemoveLocalProgramsInstDir" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Polipo" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="Version" Value="$(var.ThisProductVersionDisp)" Type="string" KeyPath="yes" />
+ </RegistryKey>
+ <File Id="PolipoExe" DiskId="1"
+ Name="polipo.exe" Source="bin\polipo.exe" />
+ </Component>
+
+ <!-- MinGW-related library files -->
+ <Component Id="MinGWLibrary" Guid="$(var.CurrMingwLibsGUID)">
+ <RegistryKey Root="HKCU" Key="Software\Polipo" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="MinGWLibrary" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <File Id="MinGWDll" DiskId="1"
+ Name="mingwm10.dll" Source="bin\mingwm10.dll" />
+ </Component>
+
+ <!-- GNU RegEx library files -->
+ <Component Id="GnuRegExLibrary" Guid="$(var.CurrRegExLibsGUID)">
+ <RegistryKey Root="HKCU" Key="Software\Polipo" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="RegExLibrary" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <File Id="gnurxdll" DiskId="1"
+ Name="libgnurx-0.dll" Source="bin\libgnurx-0.dll" />
+ </Component>
+
+ </Directory>
+ </Directory>
+
+ <Directory Id="INSTALLDIR" Name="Polipo">
+ <Component Id="PolipoConfig" Guid="$(var.CurrConfigFileGUID)">
+ <CreateFolder />
+ <RemoveFolder Id="RemoveINSTALLDIR" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Polipo" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="ConfigFile" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <File
+ Id="PolipoConfigFile"
+ Name="config.txt"
+ Source="bin\polipo.conf"
+ Vital="yes"
+ ReadOnly="no"
+ DiskId="1">
+ <CopyFile
+ Id="PolipoSavedConfig"
+ DestinationName="save-cfg.txt"
+ />
+ </File>
+ </Component>
+
+ </Directory>
+ </Directory>
+
+ <Directory Id="ProgramMenuFolder" Name="Programs">
+ <Directory Id="ShortcutFolder" Name="Polipo">
+ <Component Id="AddPolipoToStartMenu" Guid="$(var.CurrStartMenuGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU" Key="Software\Polipo" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="StartMenuShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="PolipoStartMenuShortcut"
+ Name="Polipo" Target="[LocalProgramsInstDir]polipo.exe"
+ Directory="ShortcutFolder" WorkingDirectory="LocalProgramsInstDir" />
+ <RemoveFolder Id="RemoveShortcutFolder" On="uninstall" />
+ </Component>
+ </Directory>
+ </Directory>
+
+ <Directory Id="DesktopFolder" Name="Desktop">
+ <Component Id="AddPolipoToDesktop" Guid="$(var.CurrDesktopGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU" Key="Software\Polipo" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="DesktopShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="PolipoDesktopShortcut"
+ Name="Polipo" Target="[LocalProgramsInstDir]polipo.exe"
+ Directory="DesktopFolder" WorkingDirectory="LocalProgramsInstDir" />
+ </Component>
+ </Directory>
+
+ <Component Id="AddToStartupItems" Guid="$(var.CurrStartupGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU"
+ Key="Software\Microsoft\Windows\CurrentVersion\Run"
+ Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="Polipo" Value='"[LocalProgramsInstDir]polipo.exe"' Type="string" />
+ </RegistryKey>
+ </Component>
+ </Directory>
+
+ <!-- Build up the feature hierarchy -->
+ <Feature Id="Complete" Title="Polipo"
+ Level="1" Display="expand" ConfigurableDirectory="INSTALLDIR"
+ Description="Polipo is application that helps you control, monitor, and configure the Tor software.">
+ <Feature Id="MainApplication" Title="Polipo $(var.ThisProductVersionDisp)"
+ AllowAdvertise="no" Absent="disallow" Level="1"
+ Description="Main application">
+ <ComponentRef Id="LocalProgramsFolderRef" />
+ <ComponentRef Id="PolipoExecutable" />
+ <ComponentRef Id="MinGWLibrary" />
+ <ComponentRef Id="GnuRegExLibrary" />
+ <ComponentRef Id="PolipoConfig" />
+ </Feature>
+ <Feature Id="Shortcuts" Title="Shortcuts"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add a shortcut to Polipo to your Start menu or Desktop.">
+ <Feature Id="StartMenuShortcuts" Title="Add to Start menu"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add Polipo to your Start menu">
+ <ComponentRef Id="AddPolipoToStartMenu" />
+ </Feature>
+ <Feature Id="DesktopShortcuts" Title="Add to Desktop"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add Polipo to your Desktop">
+ <ComponentRef Id="AddPolipoToDesktop" />
+ </Feature>
+ <Feature Id="RunAtStartup" Title="Run at Startup"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Run Polipo automatically when your system starts">
+ <ComponentRef Id="AddToStartupItems" />
+ </Feature>
+ </Feature>
+ </Feature>
+
+ <!-- Upgrade installation sequence. -->
+ <InstallExecuteSequence>
+ <RemoveExistingProducts After="InstallValidate" />
+ </InstallExecuteSequence>
+
+ <!-- Set the UI options -->
+ <UIRef Id="WixUI_Custom" />
+ <WixVariable Id="WixUIBannerBmp" Value="default-header.bmp" />
+ <WixVariable Id="WixUIDialogBmp" Value="default-welcome.bmp" />
+ </Product>
+</Wix>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/privoxy.config b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/privoxy.config
new file mode 100644
index 0000000..968d1b1
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/privoxy.config
@@ -0,0 +1,1179 @@
+# Sample Configuration File for Privoxy v3.0.6
+#
+# $Id: config,v 1.56 2006/11/14 01:54:36 hal9 Exp $
+#
+# Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org
+#
+####################################################################
+# #
+# Table of Contents #
+# #
+# I. INTRODUCTION #
+# II. FORMAT OF THE CONFIGURATION FILE #
+# #
+# 1. LOCAL SET-UP DOCUMENTATION #
+# 2. CONFIGURATION AND LOG FILE LOCATIONS #
+# 3. DEBUGGING #
+# 4. ACCESS CONTROL AND SECURITY #
+# 5. FORWARDING #
+# 6. WINDOWS GUI OPTIONS #
+# #
+####################################################################
+#
+#
+# I. INTRODUCTION
+# ===============
+#
+# This file holds the Privoxy configuration. If you modify this file,
+# you will need to send a couple of requests (of any kind) to the
+# proxy before any changes take effect.
+#
+# When starting Privoxy on Unix systems, give the name of this file as
+# an argument. On Windows systems, Privoxy will look for this file
+# with the name 'config.txt' in the same directory where Privoxy
+# is installed.
+#
+#
+# II. FORMAT OF THE CONFIGURATION FILE
+# ====================================
+#
+# Configuration lines consist of an initial keyword followed by a
+# list of values, all separated by whitespace (any number of spaces
+# or tabs). For example,
+#
+# actionsfile default.action
+#
+# Indicates that the actionsfile is named 'default.action'.
+#
+# The '#' indicates a comment. Any part of a line following a '#'
+# is ignored, except if the '#' is preceded by a '\'.
+#
+# Thus, by placing a # at the start of an existing configuration line,
+# you can make it a comment and it will be treated as if it weren't
+# there. This is called "commenting out" an option and can be useful.
+#
+# Note that commenting out and option and leaving it at its default
+# are two completely different things! Most options behave very
+# differently when unset. See the the "Effect if unset" explanation
+# in each option's description for details.
+#
+# Long lines can be continued on the next line by using a `\' as the
+# last character.
+#
+
+#
+# 1. LOCAL SET-UP DOCUMENTATION
+# =============================
+#
+# If you intend to operate Privoxy for more users than just yourself,
+# it might be a good idea to let them know how to reach you, what
+# you block and why you do that, your policies, etc.
+#
+
+#
+# 1.1. user-manual
+# ================
+#
+# Specifies:
+#
+# Location of the Privoxy User Manual.
+#
+# Type of value:
+#
+# A fully qualified URI
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# http://www.privoxy.org/version/user-manual/ will be used,
+# where version is the Privoxy version.
+#
+# Notes:
+#
+# The User Manual URI is the single best source of information on
+# Privoxy, and is used for help links from some of the internal
+# CGI pages. The manual itself is normally packaged with the
+# binary distributions, so you probably want to set this to
+# a locally installed copy. For multi-user setups, you could
+# provide a copy on a local webserver for all your users and use
+# the corresponding URL here.
+#
+# Examples:
+#
+# The best all purpose solution is simply to put the full local
+# PATH to where the User Manual is located:
+#
+# user-manual /usr/share/doc/privoxy/user-manual
+#
+# The User Manual is then available to anyone with
+# access to the proxy, by following the built-in URL:
+# http://config.privoxy.org/user-manual/ (or the shortcut:
+# http://p.p/user-manual/).
+#
+# If the documentation is not on the local system, it can be
+# accessed from a remote server, as:
+#
+# user-manual http://example.com/privoxy/user-manual/
+#
+# WARNING!!!
+#
+# If set, this option should be the first option in the config
+# file, because it is used while the config file is being read.
+#
+#user-manual http://www.privoxy.org/user-manual/
+
+#
+# 1.2. trust-info-url
+# ===================
+#
+# Specifies:
+#
+# A URL to be displayed in the error page that users will see if
+# access to an untrusted page is denied.
+#
+# Type of value:
+#
+# URL
+#
+# Default value:
+#
+# Two example URL are provided
+#
+# Effect if unset:
+#
+# No links are displayed on the "untrusted" error page.
+#
+# Notes:
+#
+# The value of this option only matters if the experimental trust
+# mechanism has been activated. (See trustfile above.)
+#
+# If you use the trust mechanism, it is a good idea to write
+# up some on-line documentation about your trust policy and to
+# specify the URL(s) here. Use multiple times for multiple URLs.
+#
+# The URL(s) should be added to the trustfile as well, so users
+# don't end up locked out from the information on why they were
+# locked out in the first place!
+#
+trust-info-url http://www.example.com/why_we_block.html
+trust-info-url http://www.example.com/what_we_allow.html
+
+#
+# 1.3. admin-address
+# ==================
+#
+# Specifies:
+#
+# An email address to reach the proxy administrator.
+#
+# Type of value:
+#
+# Email address
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# No email address is displayed on error pages and the CGI user
+# interface.
+#
+# Notes:
+#
+# If both admin-address and proxy-info-url are unset, the whole
+# "Local Privoxy Support" box on all generated pages will not
+# be shown.
+#
+#admin-address privoxy-admin at example.com
+
+#
+# 1.4. proxy-info-url
+# ===================
+#
+# Specifies:
+#
+# A URL to documentation about the local Privoxy setup,
+# configuration or policies.
+#
+# Type of value:
+#
+# URL
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# No link to local documentation is displayed on error pages and
+# the CGI user interface.
+#
+# Notes:
+#
+# If both admin-address and proxy-info-url are unset, the whole
+# "Local Privoxy Support" box on all generated pages will not
+# be shown.
+#
+# This URL shouldn't be blocked ;-)
+#
+#proxy-info-url http://www.example.com/proxy-service.html
+
+#
+# 2. CONFIGURATION AND LOG FILE LOCATIONS
+# =======================================
+#
+# Privoxy can (and normally does) use a number of other files for
+# additional configuration, help and logging. This section of the
+# configuration file tells Privoxy where to find those other files.
+#
+# The user running Privoxy, must have read permission for all
+# configuration files, and write permission to any files that would
+# be modified, such as log files and actions files.
+#
+
+#
+# 2.1. confdir
+# ============
+#
+# Specifies:
+#
+# The directory where the other configuration files are located
+#
+# Type of value:
+#
+# Path name
+#
+# Default value:
+#
+# /etc/privoxy (Unix) or Privoxy installation dir (Windows)
+#
+# Effect if unset:
+#
+# Mandatory
+#
+# Notes:
+#
+# No trailing "/", please
+#
+# When development goes modular and multi-user, the blocker,
+# filter, and per-user config will be stored in subdirectories of
+# "confdir". For now, the configuration directory structure is
+# flat, except for confdir/templates, where the HTML templates
+# for CGI output reside (e.g. Privoxy's 404 error page).
+#
+confdir .
+
+#
+# 2.2. logdir
+# ===========
+#
+# Specifies:
+#
+# The directory where all logging takes place (i.e. where logfile
+# and jarfile are located)
+#
+# Type of value:
+#
+# Path name
+#
+# Default value:
+#
+# /var/log/privoxy (Unix) or Privoxy installation dir (Windows)
+#
+# Effect if unset:
+#
+# Mandatory
+#
+# Notes:
+#
+# No trailing "/", please
+#
+logdir .
+
+#
+# 2.3. actionsfile
+# ================
+#
+# Specifies:
+#
+# The actions file(s) to use
+#
+# Type of value:
+#
+# File name, relative to confdir, without the .action suffix
+#
+# Default values:
+#
+# standard # Internal purposes, no editing recommended
+#
+# default # Main actions file
+#
+# user # User customizations
+#
+# Effect if unset:
+#
+# No actions are taken at all. Simple neutral proxying.
+#
+# Notes:
+#
+# Multiple actionsfile lines are permitted, and are in fact
+# recommended!
+#
+# The default values include standard.action, which is used
+# for internal purposes and should be loaded, default.action,
+# which is the "main" actions file maintained by the developers,
+# and user.action, where you can make your personal additions.
+#
+# Actions files are where all the per site and per URL
+# configuration is done for ad blocking, cookie management,
+# privacy considerations, etc. There is no point in using Privoxy
+# without at least one actions file.
+#
+actionsfile standard # Internal purpose, recommended
+actionsfile default # Main actions file
+actionsfile user # User customizations
+
+#
+# 2.4. filterfile
+# ===============
+#
+# Specifies:
+#
+# The filter file(s) to use
+#
+# Type of value:
+#
+# File name, relative to confdir
+#
+# Default value:
+#
+# default.filter (Unix) or default.filter.txt (Windows)
+#
+# Effect if unset:
+#
+# No textual content filtering takes place, i.e. all +filter{name}
+# actions in the actions files are turned neutral.
+#
+# Notes:
+#
+# Multiple filterfile lines are permitted.
+#
+# The filter files contain content modification rules that use
+# regular expressions. These rules permit powerful changes on
+# the content of Web pages, and optionally the headers as well,
+# e.g., you could disable your favorite JavaScript annoyances,
+# re-write the actual displayed text, or just have some fun
+# playing buzzword bingo with web pages.
+#
+# The +filter{name} actions rely on the relevant filter (name)
+# to be defined in a filter file!
+#
+# A pre-defined filter file called default.filter that contains a
+# number of useful filters for common problems is included in the
+# distribution. See the section on the filter action for a list.
+#
+# It is recommended to place any locally adapted filters into a
+# separate file, such as user.filter.
+#
+filterfile default.filter
+#filterfile user.filter # User customizations
+
+#
+# 2.5. logfile
+# ============
+#
+# Specifies:
+#
+# The log file to use
+#
+# Type of value:
+#
+# File name, relative to logdir
+#
+# Default value:
+#
+# logfile (Unix) or privoxy.log (Windows)
+#
+# Effect if unset:
+#
+# No log file is used, all log messages go to the console (STDERR).
+#
+# Notes:
+#
+# The logfile is where all logging and error messages are
+# written. The level of detail and number of messages are set with
+# the debug option (see below). The logfile can be useful for
+# tracking down a problem with Privoxy (e.g., it's not blocking
+# an ad you think it should block) but in most cases you probably
+# will never look at it.
+#
+# Your logfile will grow indefinitely, and you will probably
+# want to periodically remove it. On Unix systems, you can do
+# this with a cron job (see "man cron"). For Red Hat, a logrotate
+# script has been included.
+#
+# On SuSE Linux systems, you can place a line like
+# "/var/log/privoxy.* +1024k 644 nobody.nogroup" in /etc/logfiles,
+# with the effect that cron.daily will automatically archive,
+# gzip, and empty the log, when it exceeds 1M size.
+#
+# Any log files must be writable by whatever user Privoxy is
+# being run as (default on UNIX, user id is "privoxy").
+#
+#logfile privoxy.log
+
+#
+# 2.6. jarfile
+# ============
+#
+# Specifies:
+#
+# The file to store intercepted cookies in
+#
+# Type of value:
+#
+# File name, relative to logdir
+#
+# Default value:
+#
+# Unset (commented out). When activated: jarfile (Unix) or
+# privoxy.jar (Windows)
+#
+# Effect if unset:
+#
+# Intercepted cookies are not stored in a dedicated log file.
+#
+# Notes:
+#
+# The jarfile may grow to ridiculous sizes over time.
+#
+# If debug 8 (show header parsing) is enabled, cookies are written
+# to the logfile with the rest of the headers.
+#
+#jarfile jar.log
+
+#
+# 2.7. trustfile
+# ==============
+#
+# Specifies:
+#
+# The trust file to use
+#
+# Type of value:
+#
+# File name, relative to confdir
+#
+# Default value:
+#
+# Unset (commented out). When activated: trust (Unix) or trust.txt
+# (Windows)
+#
+# Effect if unset:
+#
+# The entire trust mechanism is turned off.
+#
+# Notes:
+#
+# The trust mechanism is an experimental feature for building
+# white-lists and should be used with care. It is NOT recommended
+# for the casual user.
+#
+# If you specify a trust file, Privoxy will only allow access to
+# sites that are specified in the trustfile. Sites can be listed
+# in one of two ways:
+#
+# Prepending a ~ character limits access to this site only (and
+# any sub-paths within this site), e.g. ~www.example.com.
+#
+# Or, you can designate sites as trusted referrers, by prepending
+# the name with a + character. The effect is that access to
+# untrusted sites will be granted -- but only if a link from this
+# trusted referrer was used. The link target will then be added
+# to the "trustfile" so that future, direct accesses will be
+# granted. Sites added via this mechanism do not become trusted
+# referrers themselves (i.e. they are added with a ~ designation).
+#
+# If you use the + operator in the trust file, it may grow
+# considerably over time.
+#
+# It is recommended that Privoxy be compiled with the
+# --disable-force, --disable-toggle and --disable-editor options,
+# if this feature is to be used.
+#
+# Possible applications include limiting Internet access for
+# children.
+#
+#trustfile trust
+
+#
+# 3. DEBUGGING
+# ============
+#
+# These options are mainly useful when tracing a problem. Note that
+# you might also want to invoke Privoxy with the --no-daemon command
+# line option when debugging.
+#
+
+#
+# 3.1. debug
+# ==========
+#
+# Specifies:
+#
+# Key values that determine what information gets logged to
+# the logfile.
+#
+# Type of value:
+#
+# Integer values
+#
+# Default value:
+#
+# 12289 (i.e.: URLs plus informational and warning messages)
+#
+# Effect if unset:
+#
+# Nothing gets logged.
+#
+# Notes:
+#
+# The available debug levels are:
+#
+# debug 1 # show each GET/POST/CONNECT request
+# debug 2 # show each connection status
+# debug 4 # show I/O status
+# debug 8 # show header parsing
+# debug 16 # log all data into the logfile
+# debug 32 # debug force feature
+# debug 64 # debug regular expression filter
+# debug 128 # debug fast redirects
+# debug 256 # debug GIF de-animation
+# debug 512 # Common Log Format
+# debug 1024 # debug kill pop-ups
+# debug 2048 # CGI user interface
+# debug 4096 # Startup banner and warnings.
+# debug 8192 # Non-fatal errors
+#
+# To select multiple debug levels, you can either add them or
+# use multiple debug lines.
+#
+# A debug level of 1 is informative because it will show you each
+# request as it happens. 1, 4096 and 8192 are highly recommended
+# so that you will notice when things go wrong. The other levels
+# are probably only of interest if you are hunting down a specific
+# problem. They can produce a hell of an output (especially 16).
+#
+# The reporting of fatal errors (i.e. ones which crash Privoxy)
+# is always on and cannot be disabled.
+#
+# If you want to use CLF (Common Log Format), you should set
+# "debug 512" ONLY and not enable anything else.
+#
+#debug 1 # show each GET/POST/CONNECT request
+debug 4096 # Startup banner and warnings
+debug 8192 # Errors - *we highly recommended enabling this*
+
+#
+# 3.2. single-threaded
+# ====================
+#
+# Specifies:
+#
+# Whether to run only one server thread
+#
+# Type of value:
+#
+# None
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# Multi-threaded (or, where unavailable: forked) operation,
+# i.e. the ability to serve multiple requests simultaneously.
+#
+# Notes:
+#
+# This option is only there for debug purposes and you should
+# never need to use it. It will drastically reduce performance.
+#
+#single-threaded
+
+#
+# 4. ACCESS CONTROL AND SECURITY
+# ==============================
+#
+# This section of the config file controls the security-relevant
+# aspects of Privoxy's configuration.
+#
+
+#
+# 4.1. listen-address
+# ===================
+#
+# Specifies:
+#
+# The IP address and TCP port on which Privoxy will listen for
+# client requests.
+#
+# Type of value:
+#
+# [IP-Address]:Port
+#
+# Default value:
+#
+# 127.0.0.1:8118
+#
+# Effect if unset:
+#
+# Bind to 127.0.0.1 (localhost), port 8118. This is suitable and
+# recommended for home users who run Privoxy on the same machine
+# as their browser.
+#
+# Notes:
+#
+# You will need to configure your browser(s) to this proxy address
+# and port.
+#
+# If you already have another service running on port 8118, or
+# if you want to serve requests from other machines (e.g. on your
+# local network) as well, you will need to override the default.
+#
+# If you leave out the IP address, Privoxy will bind to all
+# interfaces (addresses) on your machine and may become reachable
+# from the Internet. In that case, consider using access control
+# lists (ACL's, see below), and/or a firewall.
+#
+# If you open Privoxy to untrusted users, you will also want
+# to turn off the enable-edit-actions and enable-remote-toggle
+# options!
+#
+# Example:
+#
+# Suppose you are running Privoxy on a machine which has the
+# address 192.168.0.1 on your local private network (192.168.0.0)
+# and has another outside connection with a different address. You
+# want it to serve requests from inside only:
+#
+# listen-address 192.168.0.1:8118
+#
+listen-address 127.0.0.1:8118
+
+#
+# 4.2. toggle
+# ===========
+#
+# Specifies:
+#
+# Initial state of "toggle" status
+#
+# Type of value:
+#
+# 1 or 0
+#
+# Default value:
+#
+# 1
+#
+# Effect if unset:
+#
+# Act as if toggled on
+#
+# Notes:
+#
+# If set to 0, Privoxy will start in "toggled off" mode,
+# i.e. behave like a normal, content-neutral proxy where all ad
+# blocking, filtering, etc are disabled. See enable-remote-toggle
+# below. This is not really useful anymore, since toggling is
+# much easier via the web interface than via editing the conf file.
+#
+# The windows version will only display the toggle icon in the
+# system tray if this option is present.
+#
+toggle 1
+
+#
+# 4.3. enable-remote-toggle
+# =========================
+#
+# Specifies:
+#
+# Whether or not the web-based toggle feature may be used
+#
+# Type of value:
+#
+# 0 or 1
+#
+# Default value:
+#
+# 1
+#
+# Effect if unset:
+#
+# The web-based toggle feature is disabled.
+#
+# Notes:
+#
+# When toggled off, Privoxy acts like a normal, content-neutral
+# proxy, i.e. it acts as if none of the actions applied to
+# any URL.
+#
+# For the time being, access to the toggle feature can not be
+# controlled separately by "ACLs" or HTTP authentication, so that
+# everybody who can access Privoxy (see "ACLs" and listen-address
+# above) can toggle it for all users. So this option is not
+# recommended for multi-user environments with untrusted users.
+#
+# Note that you must have compiled Privoxy with support for this
+# feature, otherwise this option has no effect.
+#
+enable-remote-toggle 0
+
+#
+# 4.4. enable-remote-http-toggle
+# ==============================
+#
+# Specifies:
+#
+# Whether or not Privoxy recognizes special HTTP headers to change
+# its behaviour.
+#
+# Type of value:
+#
+# 0 or 1
+#
+# Default value:
+#
+# 1
+#
+# Effect if unset:
+#
+# Privoxy ignores special HTTP headers.
+#
+# Notes:
+#
+# When toggled on, the client can change Privoxy's behaviour by
+# setting special HTTP headers. Currently the only supported
+# special header is "X-Filter: No", to disable filtering for
+# the ongoing request, even if it is enabled in one of the
+# action files.
+#
+# If you are using Privoxy in a multi-user environment or with
+# untrustworthy clients and want to enforce filtering, you will
+# have to disable this option, otherwise you can ignore it.
+#
+enable-remote-http-toggle 0
+
+#
+# 4.5. enable-edit-actions
+# ========================
+#
+# Specifies:
+#
+# Whether or not the web-based actions file editor may be used
+#
+# Type of value:
+#
+# 0 or 1
+#
+# Default value:
+#
+# 1
+#
+# Effect if unset:
+#
+# The web-based actions file editor is disabled.
+#
+# Notes:
+#
+# For the time being, access to the editor can not be controlled
+# separately by "ACLs" or HTTP authentication, so that everybody
+# who can access Privoxy (see "ACLs" and listen-address above)
+# can modify its configuration for all users. So this option is
+# not recommended for multi-user environments with untrusted users.
+#
+# Note that you must have compiled Privoxy with support for this
+# feature, otherwise this option has no effect.
+#
+enable-edit-actions 0
+
+#
+# 4.6. ACLs: permit-access and deny-access
+# ========================================
+#
+# Specifies:
+#
+# Who can access what.
+#
+# Type of value:
+#
+# src_addr[/src_masklen] [dst_addr[/dst_masklen]]
+#
+# Where src_addr and dst_addr are IP addresses in dotted decimal
+# notation or valid DNS names, and src_masklen and dst_masklen are
+# subnet masks in CIDR notation, i.e. integer values from 2 to 30
+# representing the length (in bits) of the network address. The
+# masks and the whole destination part are optional.
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# Don't restrict access further than implied by listen-address
+#
+# Notes:
+#
+# Access controls are included at the request of ISPs and systems
+# administrators, and are not usually needed by individual
+# users. For a typical home user, it will normally suffice to
+# ensure that Privoxy only listens on the localhost (127.0.0.1)
+# or internal (home) network address by means of the listen-address
+# option.
+#
+# Please see the warnings in the FAQ that this proxy is not
+# intended to be a substitute for a firewall or to encourage
+# anyone to defer addressing basic security weaknesses.
+#
+# Multiple ACL lines are OK. If any ACLs are specified, then
+# the Privoxy talks only to IP addresses that match at least one
+# permit-access line and don't match any subsequent deny-access
+# line. In other words, the last match wins, with the default
+# being deny-access.
+#
+# If Privoxy is using a forwarder (see forward below) for a
+# particular destination URL, the dst_addr that is examined is
+# the address of the forwarder and NOT the address of the ultimate
+# target. This is necessary because it may be impossible for the
+# local Privoxy to determine the IP address of the ultimate target
+# (that's often what gateways are used for).
+#
+# You should prefer using IP addresses over DNS names, because
+# the address lookups take time. All DNS names must resolve! You
+# can not use domain patterns like "*.org" or partial domain
+# names. If a DNS name resolves to multiple IP addresses, only
+# the first one is used.
+#
+# Denying access to particular sites by ACL may have undesired
+# side effects if the site in question is hosted on a machine
+# which also hosts other sites.
+#
+# Examples:
+#
+# Explicitly define the default behavior if no ACL and
+# listen-address are set: "localhost" is OK. The absence of a
+# dst_addr implies that all destination addresses are OK:
+#
+# permit-access localhost
+#
+# Allow any host on the same class C subnet as www.privoxy.org
+# access to nothing but www.example.com:
+#
+# permit-access www.privoxy.org/24 www.example.com/32
+#
+# Allow access from any host on the 26-bit subnet 192.168.45.64
+# to anywhere, with the exception that 192.168.45.73 may not
+# access www.dirty-stuff.example.com:
+#
+# permit-access 192.168.45.64/26
+# deny-access 192.168.45.73 www.dirty-stuff.example.com
+#
+
+#
+# 4.7. buffer-limit
+# =================
+#
+# Specifies:
+#
+# Maximum size of the buffer for content filtering.
+#
+# Type of value:
+#
+# Size in Kbytes
+#
+# Default value:
+#
+# 4096
+#
+# Effect if unset:
+#
+# Use a 4MB (4096 KB) limit.
+#
+# Notes:
+#
+# For content filtering, i.e. the +filter and +deanimate-gif
+# actions, it is necessary that Privoxy buffers the entire document
+# body. This can be potentially dangerous, since a server could
+# just keep sending data indefinitely and wait for your RAM to
+# exhaust -- with nasty consequences. Hence this option.
+#
+# When a document buffer size reaches the buffer-limit, it is
+# flushed to the client unfiltered and no further attempt to filter
+# the rest of the document is made. Remember that there may be
+# multiple threads running, which might require up to buffer-limit
+# Kbytes each, unless you have enabled "single-threaded" above.
+#
+buffer-limit 4096
+
+#
+# 5. FORWARDING
+# =============
+#
+# This feature allows routing of HTTP requests through a chain
+# of multiple proxies. It can be used to better protect privacy
+# and confidentiality when accessing specific domains by routing
+# requests to those domains through an anonymous public proxy.
+# Or to use a caching proxy to speed up browsing. Or chaining to
+# a parent proxy may be necessary because the machine that Privoxy
+# runs on has no direct Internet access.
+#
+# Also specified here are SOCKS proxies. Privoxy supports the SOCKS
+# 4 and SOCKS 4A protocols.
+#
+
+#
+# 5.1. forward
+# ============
+#
+# Specifies:
+#
+# To which parent HTTP proxy specific requests should be routed.
+#
+# Type of value:
+#
+# target_pattern http_parent[:port]
+#
+# where target_pattern is a URL pattern that specifies to which
+# requests (i.e. URLs) this forward rule shall apply. Use /
+# to denote "all URLs". http_parent[:port] is the DNS name or
+# IP address of the parent HTTP proxy through which the requests
+# should be forwarded, optionally followed by its listening port
+# (default: 8080). Use a single dot (.) to denote "no forwarding".
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# Don't use parent HTTP proxies.
+#
+# Notes:
+#
+# If http_parent is ".", then requests are not forwarded to
+# another HTTP proxy but are made directly to the web servers.
+#
+# Multiple lines are OK, they are checked in sequence, and the
+# last match wins.
+#
+# Examples:
+#
+# Everything goes to an example anonymizing proxy, except SSL on
+# port 443 (which it doesn't handle):
+#
+# forward / anon-proxy.example.org:8080
+# forward :443 .
+#
+# Everything goes to our example ISP's caching proxy, except for
+# requests to that ISP's sites:
+#
+# forward / caching-proxy.example-isp.net:8000
+# forward .example-isp.net .
+#
+
+#
+# 5.2. forward-socks4 and forward-socks4a
+# =======================================
+#
+# Specifies:
+#
+# Through which SOCKS proxy (and to which parent HTTP proxy)
+# specific requests should be routed.
+#
+# Type of value:
+#
+# target_pattern socks_proxy[:port] http_parent[:port]
+#
+# where target_pattern is a URL pattern that specifies to which
+# requests (i.e. URLs) this forward rule shall apply. Use / to
+# denote "all URLs". http_parent and socks_proxy are IP addresses
+# in dotted decimal notation or valid DNS names (http_parent may
+# be "." to denote "no HTTP forwarding"), and the optional port
+# parameters are TCP ports, i.e. integer values from 1 to 64535
+#
+# Default value:
+#
+# Unset
+#
+# Effect if unset:
+#
+# Don't use SOCKS proxies.
+#
+# Notes:
+#
+# Multiple lines are OK, they are checked in sequence, and the
+# last match wins.
+#
+# The difference between forward-socks4 and forward-socks4a
+# is that in the SOCKS 4A protocol, the DNS resolution of the
+# target hostname happens on the SOCKS server, while in SOCKS 4
+# it happens locally.
+#
+# If http_parent is ".", then requests are not forwarded to another
+# HTTP proxy but are made (HTTP-wise) directly to the web servers,
+# albeit through a SOCKS proxy.
+#
+# Examples:
+#
+# From the company example.com, direct connections are made to all
+# "internal" domains, but everything outbound goes through their
+# ISP's proxy by way of example.com's corporate SOCKS 4A gateway
+# to the Internet.
+#
+# forward-socks4a / socks-gw.example.com:1080 www-cache.example-isp.net:8080
+# forward .example.com .
+#
+# A rule that uses a SOCKS 4 gateway for all destinations but no
+# HTTP parent looks like this:
+#
+# forward-socks4 / socks-gw.example.com:1080 .
+#
+# To chain Privoxy and Tor, both running on the same system,
+# you should use the rule:
+#
+forward-socks4a / 127.0.0.1:9050 .
+
+#
+# The public Tor network can't be used to reach your local network,
+# therefore it's a good idea to make some exceptions:
+#
+# forward 192.168.*.*/ .
+# forward 10.*.*.*/ .
+# forward 127.*.*.*/ .
+#
+# Unencrypted connections to systems in these address ranges will
+# be as (un)secure as the local network is, but the alternative is
+# that you can't reach the network at all.
+#
+# If you also want to be able to reach servers in your local
+# network by using their names, you will need additional
+# exceptions that look like this:
+#
+# forward localhost/ .
+#
+
+#
+# 5.3. forwarded-connect-retries
+# ==============================
+#
+# Specifies:
+#
+# How often Privoxy retries if a forwarded connection request
+# fails.
+#
+# Type of value:
+#
+# Number of retries.
+#
+# Default value:
+#
+# 0
+#
+# Effect if unset:
+#
+# Forwarded connections are treated like direct connections and
+# no retry attempts are made.
+#
+# Notes:
+#
+# forwarded-connect-retries is mainly interesting for socks4a
+# connections, where Privoxy can't detect why the connections
+# failed. The connection might have failed because of a DNS timeout
+# in which case a retry makes sense, but it might also have failed
+# because the server doesn't exist or isn't reachable. In this
+# case the retry will just delay the appearance of Privoxy's
+# error message.
+#
+# Only use this option, if you are getting many forwarding related
+# error messages, that go away when you try again manually. Start
+# with a small value and check Privoxy's logfile from time to time,
+# to see how many retries are usually needed.
+#
+# Examples:
+#
+# forwarded-connect-retries 1
+#
+forwarded-connect-retries 0
+
+#
+# 6. WINDOWS GUI OPTIONS
+# ======================
+#
+# Privoxy has a number of options specific to the Windows GUI
+# interface:
+#
+
+# If "activity-animation" is set to 1, the Privoxy icon will animate
+# when "Privoxy" is active. To turn off, set to 0.
+#
+#activity-animation 1
+
+# If "log-messages" is set to 1, Privoxy will log messages to the
+# console window:
+#
+log-messages 0
+
+# If "log-buffer-size" is set to 1, the size of the log buffer,
+# i.e. the amount of memory used for the log messages displayed in
+# the console window, will be limited to "log-max-lines" (see below).
+#
+# Warning: Setting this to 0 will result in the buffer to grow
+# infinitely and eat up all your memory!
+#
+#log-buffer-size 1
+
+# log-max-lines is the maximum number of lines held in the log
+# buffer. See above.
+#
+#log-max-lines 200
+
+# If "log-highlight-messages" is set to 1, Privoxy will highlight
+# portions of the log messages with a bold-faced font:
+#
+#log-highlight-messages 1
+
+# The font used in the console window:
+#
+#log-font-name Comic Sans MS
+
+# Font size used in the console window:
+#
+#log-font-size 8
+
+# "show-on-task-bar" controls whether or not Privoxy will appear as
+# a button on the Task bar when minimized:
+#
+#show-on-task-bar 0
+
+# If "close-button-minimizes" is set to 1, the Windows close button
+# will minimize Privoxy instead of closing the program (close with
+# the exit option on the File menu).
+#
+#close-button-minimizes 1
+
+# The "hide-console" option is specific to the MS-Win console version
+# of Privoxy. If this option is used, Privoxy will disconnect from
+# and hide the command console.
+#
+#hide-console
+
+#
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/pt/vidalia_pt.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/pt/vidalia_pt.po
new file mode 100644
index 0000000..42521c2
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/pt/vidalia_pt.po
@@ -0,0 +1,304 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2009-12-14 04:19-0700\n"
+"Last-Translator: Tiago Faria <gouki at goukihq.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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "Instalação do ${BUNDLE_NAME}"
+
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Este assistente irá guiá-lo na instalação do Tor, Vidalia, Privoxy e "
+"Torbutton.\n"
+"\n"
+"Tor é um sistema que lhe permite utilizar a Internet de uma forma anónima, "
+"ajudando-o a manter o anonimato no seu navegador e publicador, mensagens "
+"instantâneas, IRC, e outras aplicações. Vidalia é uma aplicação gráfica que "
+"o ajuda a controlar, monitorizar e configurar o Tor.\n"
+"\n"
+"Polipo é um proxy que mantém cópias locais das páginas visitadas, melhorando "
+"a velocidade de acesso a páginas enquanto utiliza Tor.\n"
+"\n"
+"Torbutton é uma extensão do Firefox que permite activar e desactivar "
+"rapidamente o anonimato de seu navegador.\n"
+"\n"
+"Se já instalou previamente o Tor, Vidalia, Polipo ou Firefox, por favor "
+"certifique-se de que nenhuma das aplicações está actualmente em "
+"funcionamento, antes de prosseguir com esta instalação.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Bem vindo ao Assistente de Instalação do ${BUNDLE_NAME}"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "Documentação da instalação ${TOR_NAME}"
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"A instalação foi completada.\n"
+"Por favor visite https://www.torproject.org/docs/tor-doc-windows para "
+"aprender como configurar as suas aplicaçãoes para utilizar o Tor.\n"
+"\n"
+"Se instalou o Torbutton, terá que reiniciar o Firefox."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Executar os componentes instalados agora"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia é uma aplicação gráfica que o ajuda a controlar, monitorizar e "
+"configurar o Tor."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Remover ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "Instalação do ${VIDALIA_NAME}"
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Este assistente irá guiá-lo na instalação do Vidalia, uma aplicação gráfica "
+"que lhe permite controlar, monitorizar e configurar o Tor.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Bem vindo ao Assistente de Instalação do ${VIDALIA_NAME}"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "${VIDALIA_NAME} website"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia é uma aplicação gráfica que o ajuda a controlar, monitorizar, e "
+"configurar o Tor."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Executar Na Inicialização"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Executar o ${VIDALIA_NAME} automaticamente na inicialização."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Adicionar ao Menu Iniciar"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Adicionar ${VIDALIA_NAME} ao seu Menu Iniciar."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Executar o ${VIDALIA_NAME}"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor é um sistema para utilizar a Internet anonimamente, ajudando-o a manter "
+"o anonimato no navegador e publicador, aplicação de mensagens instantâneas, "
+"IRC, e outras."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Remover ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Instalar ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Você já tem um ficheiro de configuração do Tor.$\n"
+"$\n"
+"Você deseja substituí-lo com o ficheiro de exemplo de configuração padrão?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Documentação"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Instalar a documentação do ${TOR_NAME}."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Adicionar ao Menu Iniciar"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Adicionar o ${TOR_NAME} ao seu Menu Iniciar."
+
+# caching web proxy? Acham bem? - Tiago
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+"O Polipo é um proxy de cópias locais que melhora o desempenho da rede "
+"enquanto utiliza Tor."
+
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "Remover ${POLIPO_DESC}."
+
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "Instalar ${POLIPO_DESC}."
+
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "Adicionar ao Menu Iniciar"
+
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "Adicionar o ${POLIPO_NAME} ao seu Menu Iniciar."
+
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "Executar Na Inicialização"
+
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "Executar o ${POLIPO_NAME} automaticamente na inicialização."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton é uma extensão do Firefox que permite activar e desactivar "
+"rapidamente o anonimato do seu navegador."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Remover ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Instalar ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Adicionar ao Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Adicionar a extensão ${TORBUTTON_DESC} ao Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+"O Firefox não foi encontrado no seu sistema. O Torbutton não será instalado."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Dados de Aplicação"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Remover dados da aplicação e ficheiros de configuração salvos."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "pt"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "O Firefox não está instalado"
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+"Nós recomendamos a instalação do Firefox antes de continuar, para maior "
+"segurança."
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"O navegador de Internet Mozilla Firefox não está instalado no seu "
+"computador.\n"
+"O Tor vai funcionar com outros navegadores, assim como no Internet Explorer, "
+"mas é mais fácil a sua utilização com o Firefox, que fará um melhor "
+"trabalho para manter o seu anonimato.\n"
+"\n"
+"Se quer instalar o Firefox, por favor clique no botão Cancelar, e será "
+"redireccionado para a página de download do Firefox "
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/pt_BR/vidalia_pt_BR.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/pt_BR/vidalia_pt_BR.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/pt_BR/vidalia_pt_BR.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ro/vidalia_ro.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ro/vidalia_ro.po
new file mode 100644
index 0000000..b8f6783
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ro/vidalia_ro.po
@@ -0,0 +1,306 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2010-05-15 14:48-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"
+"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 "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "Instalare ${BUNDLE_NAME}"
+
+# "supliment Firefox" este terminologia folosita de Mozilla in interfata in limba romana a mozilla.org. De aceea am preferat aceasta exprimare in locul "extensie Firefox".
+# Pe viitor, incercati ca in traduceri, atunci cand va adresati utiliyatorului, sa folositi persoana a II-a plural si nu singular.
+# De asemenea, evitati articularea inutila a numelor proprii, de exemplu "Tor-ului". "Tor" e mai corect, mai curat si mai simplu.
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Acest program vă va ghida prin instalarea Tor, Vidalia, Privoxy şi "
+"Torbutton.\n"
+"\n"
+"Tor este un sistem pentru folosirea în mod anonim a Internetului, ce vă "
+"ajută la anonimizarea navigării pe internet, mesageriei instant, IRC şi "
+"multe altele. Vidalia este o interfaţă grafică ce vă ajută să controlaţi, "
+"monitorizaţi şi configuraţi Tor.\n"
+"\n"
+"Privoxy este un proxy web pentru filtrare care îţi protejează intimitatea şi "
+"ajută la înlăturarea reclamelor, bannerelor şi ferestrelor de tip pop-up.\n"
+"\n"
+"Torbutton este un supliment Firefox care vă permite activarea sau "
+"dezactivarea rapidă a Tor.\n"
+"\n"
+"Daca aţi instalat în trecut Tor, Vidalia, Privoxy sau Firefox, vă rugăm să "
+"vă asiguraţi că acestea nu rulează, înainte de a continua cu instalarea.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Bine aţi venit la instalarea ${BUNDLE_NAME}"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "Instalarea documentaţiei ${TOR_NAME}"
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"Instalarea s-a terminat cu succes.\n"
+"Vă rugăm vizitaţi https://www.torproject.org/docs/tor-doc-windows pentru a "
+"învăţa cum să configuraţi diferite aplicaţii pentru folosirea Tor.\n"
+"\n"
+"Daca aţi instalat Torbutton, este nevoie să reporniţi Firefox."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Porneşte acum componentele instalate"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia este o interfaţă grafică ce vă ajută să controlaţi, monitorizaţi şi "
+"configuraţi Tor."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Înlătură ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "Instalare ${VIDALIA_NAME}"
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Acest program vă va ghida prin instalarea Vidalia, un program ce vă ajută să "
+"controlaţi, monitorizaţi şi configuraţi Tor.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Bine aţi venit la instalarea ${VIDALIA_NAME}"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "Site-ul oficial ${VIDALIA_NAME}"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia este o interfaţă grafică ce vă ajută să controlaţi, monitorizaţi şi "
+"configuraţi Tor."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Porneşte odată cu sistemul de operare"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Rulează automat ${VIDALIA_NAME} la pornire."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Adaugă în meniul Start"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Adaugă ${VIDALIA_NAME} în meniul Start."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Porneşte ${VIDALIA_NAME}"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor este un sistem pentru folosirea în mod anonim a internetului, ce vă "
+"ajută la anonimizarea navigării pe web, mesageriei instant, IRC şi multe "
+"altele."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Înlătură ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Instalează ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Există deja un fişier de configurare pentru Tor.$\n"
+"$\n"
+"Doriţi să îl suprascrieţi cu un fişier implicit de configurare?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Documentaţie"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Instalează documentaţia ${TOR_NAME}."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Adaugă în meniul Start"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Adaugă ${TOR_NAME} în meniul Start."
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+"Polipo este un proxy web pentru depozitare care creşte performanţele "
+"navigării pe Web prin Tor."
+
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "Elimini ${POLIPO_DESC}."
+
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "Instalezi ${POLIPO_DESC}."
+
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "Adaugă în meniul Start"
+
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "Adaugă ${POLIPO_NAME} în meniul Start."
+
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "Porneşte odată cu sistemul de operare"
+
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "Rulează ${POLIPO_NAME} la pornire."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton este un supliment Firefox care vă permite activarea sau "
+"dezactivarea rapidă a Tor."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Înlătură ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Instalează ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Adaugă la Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Adaugă suplimentul ${TORBUTTON_DESC} la Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+"Firefox nu a fost găsit pe sistemul dumneavoastră. Torbutton nu va fi "
+"instalat."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Date aplicaţie"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Înlătură datele salvate şi fişierele de configurare a aplicaţiei."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "ro"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Firefox nu este instalat."
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+"Vă recomandăm să instalaţi Firefox înainte să continuaţi, pentru o siguranţă "
+"sporită."
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"Navigatorul Mozilla Firefox nu este instalat pe computerul dumneavoastră.\n"
+"Tor va funcţiona cu alte navigatoare, precum Internet Explorer, dar\n"
+"este mai uşor de folosit cu Firefox, care protejează mai bine\n"
+"anonimitatea dumneavoastră.\n"
+"\n"
+"Dacă doriţi să instalaţi Firefox, apăsaţi Revocare, apoi vizitaţi\n"
+" pagina oficială a Firefox, la"
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+"După ce Firefox a fost instalat cu success, puteţi rula încă o dată\n"
+"programul de instalare Tor.\n"
+"\n"
+"Dacă preferaţi să instalaţi Tor fără Firefox,\n"
+"apăsaţi Înainte pentru a continua."
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ru/vidalia_ru.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ru/vidalia_ru.po
new file mode 100644
index 0000000..65da237
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/ru/vidalia_ru.po
@@ -0,0 +1,298 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2009-10-30 18:56+0000\n"
+"Last-Translator: Alexey Vertinsky <webbegemot at gmail.com>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "Установка ${BUNDLE_NAME}"
+
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Этот помощник поможет вам установить Tor, Vidalia, Privoxy, и Torbutton.\n"
+"\n"
+"Tor это система анонимного использования сети Internet, которая поможет "
+"анонимизировать просмотр страниц, публикации, обмен сообщениями, IRC, и "
+"многое другое. Vidalia это программа с оконным интерфейсом для настройки, "
+"управления и контроля Tor.\n"
+"\n"
+"Privoxy это кэширующий веб-прокси который ускоряет работу в интернете.\n"
+"\n"
+"Torbutton это расширение Firefox позволяющее быстро включить или выключить "
+"режим анонимного просмотра страниц.\n"
+"\n"
+"Если у вас уже установлены Tor, Vidalia, Privoxy, или Firefox; Прежде чем "
+"продолжить установку: убедитесь что эти программы не запущены.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Вас приветствует мастер установки ${BUNDLE_NAME}"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "Инструкция по установке ${TOR_NAME}"
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"Установка завершена.\n"
+"Пожалуйста прочитайте https://www.torproject.org/docs/tor-doc-windows чтобы "
+"узнать, как настроить другие приложения использовать Tor.\n"
+"\n"
+"Если вы установили Torbutton, вам придётся перезапустить Firefox."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Запустить установленные компоненты"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia это программа с оконным интерфейсом для настройки, управления и "
+"контроля Tor."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Удалить ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "Установка ${VIDALIA_NAME}"
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Этот мастер установит Vidalia, программу с оконным интерфейсом для "
+"настройки, управления и контроля Tor.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Вас приветствует мастер установки ${VIDALIA_NAME}"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "Страница проекта ${VIDALIA_NAME}"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia это программа с оконным интерфейсом для настройки, управления и "
+"контроля Tor."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Автозапуск"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Автоматически запускать ${VIDALIA_NAME} при загрузке системы."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Ярлыки в Главное Меню"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Добавить ${VIDALIA_NAME} в Главное Меню."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Запустить ${VIDALIA_NAME}"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor это система анонимного использования сети Internet, которая поможет "
+"анонимизировать Вашу веб-деятельность, системы мгновенного обмена "
+"сообщениями, IRC, и многое другое."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Удалить ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Установить ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"У вас уже есть файл настроек Tor.$\n"
+"$\n"
+"Хотите ли вы перезаписать его файлом из дистрибутива?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Документация"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Установить документацию ${TOR_NAME}."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Ярлыки в Главное Меню"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Добавить ${TOR_NAME} в Главное Меню."
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+"Polipo это кэширующий прокси сервер, он ускоряет работу с интернетом через "
+"Tor."
+
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "Удалить ${POLIPO_DESC}."
+
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "Установить ${POLIPO_DESC}."
+
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "Добавить в Меню \"Пуск\""
+
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "Добавить ${POLIPO_NAME} в ваше меню \"Пуск\"."
+
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "Запускать при старте системы"
+
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "Автоматически запускать ${POLIPO_NAME} при загрузке системы."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton это расширение Firefox для быстрого включения/выключения режима "
+"анонимного использования браузера."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Удалить ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Установить ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Добавить в Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Добавить расширение ${TORBUTTON_DESC} в Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+"Не удалось найти Firefox на вашем компьютере. Torbutton не будет установлен."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Application Data"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Удалить данные приложений и файлы настроек."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "ru"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Firefox не установлен на компьютере"
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr "Из соображений безопасности, мы рекомендуем сначала установить Firefox"
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"Firefox не установлен на вашем компьютере.\n"
+"Tor будет работать с другими браузерами, такими как Internet Explorer, но\n"
+"лучше использовать Firefox, который, к тому же, заботится о Вашей "
+"анонимности.\n"
+"\n"
+"Если Вы хотите установить Firefox , нажмите Отмена, а затем перейдите \n"
+"на страницу для скачиваания Firefox"
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+"Когда Вы закончите установку Firefox, Вы можете опять запустить\n"
+"установку Tor. \n"
+"\n"
+"Или, если Вы хотите установить Tor без Firefox, просто\n"
+"нажмите Далее."
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/sl/vidalia_sl.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/sl/vidalia_sl.po
new file mode 100755
index 0000000..5176201
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/sl/vidalia_sl.po
@@ -0,0 +1,181 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/sq/vidalia_sq.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/sq/vidalia_sq.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/sq/vidalia_sq.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/sr/vidalia_sr.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/sr/vidalia_sr.po
new file mode 100644
index 0000000..90bf4a6
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/sr/vidalia_sr.po
@@ -0,0 +1,217 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, "
+"Vidalia, Polipo, and Torbutton.\n\nTor is a system for using the "
+"Internet anonymously, helping you anonymize Web browsing and publishing, "
+"instant messaging, IRC, and more. Vidalia is a GUI that helps you "
+"control, monitor, and configure Tor.\n\nPolipo is a caching web proxy "
+"that helps increase performance of browsing the web through "
+"Tor.\n\nTorbutton is a Firefox extension that allows you to quickly "
+"enable or disable anonymous web browsing.\n\nIf you have previously "
+"installed Tor, Vidalia, Polipo, or Firefox, please make sure they are "
+"not running before continuing this installation.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PolipoGroupDesc"
+msgid "Polipo is a caching web proxy that increases performance of web browsing through Tor."
+msgstr ""
+
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr ""
+
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr ""
+
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/sv/vidalia_sv.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/sv/vidalia_sv.po
new file mode 100644
index 0000000..30c3ca2
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/sv/vidalia_sv.po
@@ -0,0 +1,306 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia Windows Installers\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2009-01-23 20:42+0000\n"
+"Last-Translator: Robin <redyey 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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME}-installer"
+
+#, fuzzy
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Denna guide tar dig igenom installationen av Tor, Vidalia, Privoxy och "
+"Torbutton.\n"
+"\\nTor är ett program för att vara anonym på Internet och gör det möjligt "
+"att anonymt surfa och publicera information, skicka snabbmeddelanden, "
+"använda IRC, och mycket annat. Vidalia är ett användargränssnitt till Tor "
+"som gör det enkelt att hantera, övervaka och konfigurera Tor.\n"
+"\n"
+"Privoxy är en filtrerande webbproxy som tar bort reklam, bannrar och pop-"
+"ups.\n"
+"\n"
+"Torbutton är ett tillägg till Firefox som gör det möjligt att snabbt "
+"aktivera eller inaktivera anonym surfning.\n"
+"\n"
+"Om du tidigare har installerat Tor, Vidalia, Privoxy eller Firefox, vänligen "
+"försäkra dig om att de inte är igång innan du fortsätter installationen.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Välkommen till installationsguiden för ${BUNDLE_NAME}"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "Installeringsdokumentation för ${TOR_NAME}"
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"Installationen är klar. \n"
+"Vänligen se https://www.torproject.org/docs/tor-doc-windows för information "
+"om hur du använder Tor med dina existerande program.\n"
+"\n"
+"Om du valde att installera Torbutton, måste du starta om Firefox."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Kör igång installerade program"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia är ett användargränssnitt som gör det enkelt att hantera, övervaka "
+"och konfigurera Tor."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Ta bort ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME}-installer"
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Denna guide tar dig igenom installationen av Vidalia, ett användargränssnitt "
+"som gör det enkelt att hantera, övervaka och konfigurera Tor.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Välkommen till installationsguiden för ${VIDALIA_NAME}"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "${VIDALIA_NAME}-websidan"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia är ett användargränssnitt som gör det enkelt att hantera, övervaka "
+"och konfigurera Tor."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Kör vid uppstart"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Kör automatiskt igång ${VIDALIA_NAME} vid uppstart."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Lägg till i startmenyn"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Lägg till ${VIDALIA_NAME} i din startmeny."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Kör igång ${VIDALIA_NAME}"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor är ett program för att vara anonym på Internet och gör det möjligt att "
+"anonymt surfa och publicera information, skicka snabbmeddelanden, använda "
+"IRC, och mycket annat."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Ta bort ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Installera ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Du har redan en konfigurationsfil för Tor.$\n"
+"$\n"
+"Vill du skriva över den med standardkonfigurationsfilen?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Dokumentation"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Installera dokumentationen för ${TOR_NAME}."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Lägg till i startmenyn"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Lägg till ${TOR_NAME} i din startmeny."
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+
+#, fuzzy
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "Ta bort ${POLIPO_DESC}."
+
+#, fuzzy
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "Installera ${POLIPO_DESC}."
+
+#, fuzzy
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "Lägg till i startmenyn"
+
+#, fuzzy
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "Lägg till ${POLIPO_NAME} i din startmeny."
+
+#, fuzzy
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "Kör vid uppstart"
+
+#, fuzzy
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "Kör automatiskt igång ${POLIPO_NAME} vid uppstart."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton är ett tillägg till Firefox som gör det möjligt att snabbt "
+"aktivera eller inaktivera anonym surfning."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Ta bort ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Installera ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Lägg till i Mozilla Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Lägg till tillägget ${TORBUTTON_DESC} till Mozilla Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+"Torbutton kan ej installeras: Mozilla Firefox hittades ej på din dator."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Programdata"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Ta bort tilläggat programdata och konfigurationsfiler."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "sv"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Firefox är inte installerat"
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+"Vi rekommenderar att du installerar Firefox innan du fortsätter för bästa "
+"skydd."
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"Mozilla Firefox Web browsern är inte installerad på din dator.\n"
+"Tor kommer att fungera med andra browsers t.ex. Internet Explorer, Men\n"
+"det är enklare att använda Firefox vilket också gör ett bättre jobb att\n"
+"skydda din anonymitet.\n"
+"\n"
+"Om du vill installera Firefox, tryck på Avsluta,gå sedan\n"
+"till Firefox hemsidan"
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+"När du är färdig med att installera Firefox så kan du köra om\n"
+"Tor installationen.\n"
+"\n"
+"Eller om du föredrar att installera Tor utan Firefox, så\n"
+"tryck på Nästa för att fortsätta"
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/sw/vidalia_sw.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/sw/vidalia_sw.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/sw/vidalia_sw.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/templates/vidalia.pot b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/templates/vidalia.pot
new file mode 100644
index 0000000..2209e2d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/templates/vidalia.pot
@@ -0,0 +1,216 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia Windows Installers\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, "
+"Vidalia, Polipo, and Torbutton.\n\nTor is a system for using the "
+"Internet anonymously, helping you anonymize Web browsing and publishing, "
+"instant messaging, IRC, and more. Vidalia is a GUI that helps you "
+"control, monitor, and configure Tor.\n\nPolipo is a caching web proxy "
+"that helps increase performance of browsing the web through "
+"Tor.\n\nTorbutton is a Firefox extension that allows you to quickly "
+"enable or disable anonymous web browsing.\n\nIf you have previously "
+"installed Tor, Vidalia, Polipo, or Firefox, please make sure they are "
+"not running before continuing this installation.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PolipoGroupDesc"
+msgid "Polipo is a caching web proxy that increases performance of web browsing through Tor."
+msgstr ""
+
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr ""
+
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr ""
+
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/th/vidalia_th.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/th/vidalia_th.po
new file mode 100755
index 0000000..1571f51
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/th/vidalia_th.po
@@ -0,0 +1,213 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2009-07-14 19:59+0000\n"
+"Last-Translator: Teerawat Kunlayanopakorn <deutsche3289 at yahoo.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"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "ยินดีต้อนรับสู่ ${BUNDLE_NAME} Setup Wizard"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"ติดตั้งสำเร็จ\n"
+"เพื่อที่จะกำหนดให้โปรแกรมของท่านใช้ Tor กรุณาไปยัง "
+"https://www.torproject.org/docs/tor-doc-windows \n"
+"\n"
+"ถ้าท่านติดตั้ง Torbutton กรุณาเปิดโปรแกรม Firefox ใหม่"
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "กำลังติดตั้ง Components "
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia คือโปรแกรมที่ช่วยให้ท่านควบคุม, ติดตาม, และกำหนดค่าให้แก่ Tor "
+"ในรูปแบบกราฟฟิก"
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "ติดตั้งใน Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "ไม่พบ Firefox ในระบบ ยกเลิกการติดตั้ง Torbutton"
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "ข้อมูลโปรแกรม"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "ภาษาอังกฤษ"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "ไม่ได้ติดตั้ง Firefox "
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr "เพื่อความปลอดภัย กรุณาติดตั้ง Firefox ก่อนที่จะดำเนินการต่อ"
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/thandy.wxs.in b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/thandy.wxs.in
new file mode 100644
index 0000000..1257af2
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/thandy.wxs.in
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="Windows-1252" ?>
+<!--
+ Copyright (C) 2008-2009 The Tor Project, Inc.
+ See LICENSE file for rights and terms.
+ -->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <?define ThisProductVersion="0.0.1" ?>
+ <?define ThisProductVersionDisp="0.0.1" ?>
+ <?define UpgradeCode="d0465b47-1872-4766-874d-add2a320687e" ?>
+
+ <?define CurrProductGUID="7aef0490-9ba5-40c2-9d33-4353063c475e" ?>
+ <?define CurrExecutableGUID="8609afe7-c272-48ce-a6a3-ac80759b0c49" ?>
+ <?define CurrLocalProgramsGUID="c5971fba-b0bc-46e1-881c-a9139122a45d" ?>
+
+ <Product Name="Thandy $(var.ThisProductVersionDisp)" Id="$(var.CurrProductGUID)"
+ Version="$(var.ThisProductVersion)"
+ Manufacturer="www.torproject.org"
+ Language="!(loc.LCID)"
+ UpgradeCode="$(var.UpgradeCode)">
+
+ <Package Id="*" Keywords="Installer"
+ Description="Thandy $(var.ThisProductVersionDisp) Installer"
+ Manufacturer="www.torproject.org"
+ InstallerVersion="200" Compressed="yes"
+ InstallPrivileges="limited" />
+
+ <Media Id="1" Cabinet="Thandy.cab" CompressionLevel="high"
+ EmbedCab="yes" DiskPrompt="CD-ROM #1" />
+ <Property Id="DiskPrompt" Value="Thandy $(var.ThisProductVersionDisp) Installation Volume [1]" />
+ <Property Id="ALLUSERS" Secure="yes"/>
+ <Property Id="ReinstallModeText">omus</Property>
+
+ <!-- Associate this package with the upgrade code for this series
+ to ensure that upgrade installations by Thandy or other means work
+ as expected.
+ The OnlyDetect option must be false to ensure that existing files
+ from an older version are removed and replaced with current files.
+ -->
+ <Upgrade Id="$(var.UpgradeCode)">
+ <UpgradeVersion
+ Property="UPGRADEFOUND"
+ OnlyDetect="no"
+ Minimum="0.0.0"
+ IncludeMinimum="yes"
+ Maximum="$(var.ThisProductVersion)"
+ IncludeMaximum="no"
+ />
+ </Upgrade>
+
+
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="LocalAppDataFolder" Name="LocalAppData">
+ <Directory Id="LocalProgramsFolder" Name="Programs">
+
+ <!-- Until proper support for per-user installs is available we manage Programs folder.
+ Note that this directory will be left in place if it is in use by any other app.
+ -->
+ <Component Id="LocalProgramsFolderRef" Guid="$(var.CurrLocalProgramsGUID)">
+ <CreateFolder/>
+ <RemoveFolder Id="RemoveLocalProgramsFolder" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Thandy" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="LocalProgramsFolderRef" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ </Component>
+
+ <Directory Id="INSTALLDIR" Name="Thandy">
+
+ <!-- Main Thandy application files -->
+ <Component Id="ThandyExecutable" Guid="$(var.CurrExecutableGUID)">
+ <CreateFolder/>
+ <RemoveFolder Id="RemoveINSTALLDIR" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Thandy" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="Version" Value="$(var.ThisProductVersionDisp)" Type="string" KeyPath="yes" />
+ </RegistryKey>
+ <File Id="ThandyExe" DiskId="1"
+ Name="thandy.exe" Source="bin\Thandy.exe" />
+ </Component>
+
+ </Directory>
+ </Directory>
+ </Directory>
+ </Directory>
+
+ <!-- Build up the feature hierarchy -->
+ <Feature Id="Complete" Title="Thandy"
+ Level="1" Display="expand" ConfigurableDirectory="INSTALLDIR"
+ Description="Thandy is an automatic update client for Tor software.">
+ <Feature Id="MainApplication" Title="Thandy $(var.ThisProductVersionDisp)"
+ AllowAdvertise="no" Absent="disallow" Level="1"
+ Description="Main application">
+ <ComponentRef Id="LocalProgramsFolderRef" />
+ <ComponentRef Id="ThandyExecutable" />
+ </Feature>
+ </Feature>
+
+ <!-- Upgrade installation sequence. -->
+ <InstallExecuteSequence>
+ <RemoveExistingProducts After="InstallValidate" />
+ </InstallExecuteSequence>
+
+ <!-- Set the UI options -->
+ <UIRef Id="WixUI_Custom" />
+ <WixVariable Id="WixUIBannerBmp" Value="default-header.bmp" />
+ <WixVariable Id="WixUIDialogBmp" Value="default-welcome.bmp" />
+ </Product>
+</Wix>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/tor.wxs.in b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/tor.wxs.in
new file mode 100644
index 0000000..c125fef
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/tor.wxs.in
@@ -0,0 +1,405 @@
+<?xml version="1.0" encoding="Windows-1252" ?>
+<!--
+ Copyright (C) 2008-2009 The Tor Project, Inc.
+ See LICENSE file for rights and terms.
+
+ WiX is a Microsoft Installer tool that parses an installation
+ specification XML document and produces an MSI package for use on
+ updated Windows 2000 and newer systems.
+
+ The MSI package format provides some advantages over the existing NSIS
+ packages when used in an automated fashion. A modified version of
+ the Mondo UI installer is included without EULA and other unnecessary
+ dialogs. You must update the UIRef element below to change UI.
+
+ Compile MSI installer via WiX:
+ candle.exe *.wxs
+ light.exe *.wixobj -out tor.msi -ext C:\Path\to\Wix\bin\WixUIExtension.dll
+
+ A silent installation can be performed with a /quiet option passed.
+ msiexec /i tor.msi /log debug.txt /qn
+
+ A repair operation can be performed with /f and remove via /x
+
+ Language transforms can be explicitly set via TRANFORMS, for example:
+ msiexec /i tor.msi TRANSFORMS=:en
+
+ More msiexec command line details at:
+ http://technet.microsoft.com/en-us/library/cc759262.aspx
+ -->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <!-- Definitions for critical elements of this MSI package.
+ Note that the product version is compressed into a X.X.X format. If the four
+ element version is used, the last octet is ignored when comparing versions
+ for upgrade, thus forcing the use of the three element version format.
+ UpgradeCode must remain the same for all packages of this type regardless of
+ Product or Package ID's. This is how existing versions are located.
+ -->
+ <?define ThisProductVersion="2.1.13" ?>
+ <?define ThisProductVersionDisp="0.2.1.13-alpha-dev" ?>
+ <?define UpgradeCode="64323a0c-9712-4a7a-8db8-d3c5c0b963df" ?>
+ <?define TPI="The Tor Project, Inc." ?>
+
+ <!-- The remaining GUIDs are assigned to components or other variable
+ identifiers. Whenever a new package is built these values MUST be
+ modified for upgrades to work correctly! Note that future MSI packages should
+ re-use components that haven't changed to speed installation.
+ -->
+ <?define CurrTorProductGUID="133cbf2f-33ec-4d2e-b0ee-49173a9b269f" ?>
+ <?define CurrTorExecutableGUID="ca2dd05e-5219-4e7a-a268-7e5b928a5efc" ?>
+ <?define CurrTorSvcLinksGUID="beb3fbda-ec3b-4f03-8c95-ad82283d287c" ?>
+ <?define CurrOpenSSLLibraryGUID="056d34c5-6984-4553-8e31-53575e62e4f2" ?>
+ <?define CurrTorDocumentsGUID="2572e0ea-6a5f-49f1-a1eb-4a81c9765e0e" ?>
+ <?define CurrTorConfigFileGUID="cde6851c-733a-4261-aacd-e429abe49936" ?>
+ <?define CurrTorGeoIPFileGUID="eb21489b-4054-4576-9227-cac5b02393d8" ?>
+ <?define CurrAddTorToStartMenuGUID="c34397b6-840b-4000-a1d7-f3dc0c1daa20" ?>
+ <?define CurrAddTorToDesktopGUID="a564a3c3-b212-4014-9ee5-32a088e2d81a" ?>
+ <?define CurrAddTorDocsToDesktopGUID="97921371-f6e3-496b-9a0a-dbf01432e479" ?>
+ <?define CurrAddTorEditConfToDesktopGUID="40b2debe-15b6-4dbb-babf-7c897da3a33c" ?>
+ <?define CurrLocalProgramsGUID="37b03fd0-73b2-45d8-8108-813e18c7a194" ?>
+
+ <Product
+ Name="Tor $(var.ThisProductVersionDisp)"
+ Id="$(var.CurrTorProductGUID)"
+ UpgradeCode="$(var.UpgradeCode)"
+ Version="$(var.ThisProductVersion)"
+ Manufacturer="$(var.TPI)"
+ Language="!(loc.LCID)">
+
+ <!-- Common package definitions. Most of these elements are self
+ explanatory or do not need modification.
+ Note that there is no support for signature verification nor
+ patched upgrades at this time.
+ -->
+ <Package
+ Id="*"
+ Keywords="Tor,Installer"
+ Description="Tor $(var.ThisProductVersionDisp) Installer"
+ Manufacturer="$(var.TPI)"
+ Compressed="yes"
+ InstallerVersion="200"
+ InstallPrivileges="limited"
+ />
+ <Media Id="1"
+ Cabinet="Tor.cab"
+ CompressionLevel="high"
+ EmbedCab="yes"
+ DiskPrompt="na"
+ />
+
+ <!-- Associate this package with the upgrade code for this series
+ to ensure that upgrade installations by Thandy or other means work
+ as expected.
+ The OnlyDetect option must be false to ensure that existing files
+ from an older version are removed and replaced with current files.
+ -->
+ <Upgrade Id="$(var.UpgradeCode)">
+ <UpgradeVersion
+ Property="UPGRADEFOUND"
+ OnlyDetect="no"
+ Minimum="0.0.1"
+ IncludeMinimum="yes"
+ Maximum="$(var.ThisProductVersion)"
+ IncludeMaximum="no"
+ />
+ </Upgrade>
+
+ <!-- for now force per-user installation until run as service is completed. -->
+ <Property Id="ALLUSERS" Secure="yes"/>
+
+ <!-- To avoid placing shortcuts all over the desktop / start menu during a
+ silent installation the NOSC=1 option can be passed to omit shortcuts.
+ This is useful if bundled with other applications like Vidalia that manage
+ configuration and Tor related processes themselves.
+ -->
+ <Property Id="NOSC" Secure="yes"/>
+
+ <!-- Properties used to control installation or repair features
+ and other invocation options.
+ -->
+ <Property Id="ReinstallModeText">omus</Property>
+ <Property Id="DiskPrompt">Tor Installation</Property>
+
+ <!-- Support for service type Tor installations (soon). -->
+ <Property Id="SVCINSTALL">0</Property>
+ <Property Id="SERVICENAME">Tor</Property>
+ <Property Id="SERVICEINTERNALNAME">Tor</Property>
+ <Property Id="EXISTING_TOR_SERVICE_PATH">
+ <RegistrySearch
+ Id="ExistingTorService"
+ Root="HKLM"
+ Key="System\CurrentControlSet\Services\[SERVICEINTERNALNAME]"
+ Name="TorSvcPath"
+ Type="raw"
+ />
+ </Property>
+
+ <!-- Most of the installation directives are for populating the
+ "Program Files" directory with the Tor binaries, dynamic link
+ libraries, configuration files, and other documents.
+ -->
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="LocalAppDataFolder" Name="LocalAppData">
+ <Directory Id="LocalProgramsFolder" Name="Programs">
+
+ <!-- Until proper support for per-user installs is available we manage Programs folder.
+ Note that this directory will be left in place if it is in use by any other app.
+ -->
+ <Component Id="LocalProgramsFolderRef" Guid="$(var.CurrLocalProgramsGUID)">
+ <CreateFolder />
+ <RemoveFolder Id="RemoveLocalProgramsFolder" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="LocalProgramsFolderRef" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ </Component>
+
+ <Directory Id="LocalProgramsInstDir" Name="Tor">
+ <!-- Tor application file -->
+ <Component Id="TorExecutable" Guid="$(var.CurrTorExecutableGUID)">
+ <CreateFolder />
+ <RemoveFolder Id="RemoveLocalProgramsInstDir" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="Version" Value="$(var.ThisProductVersionDisp)" Type="string" KeyPath="yes" />
+ </RegistryKey>
+ <File
+ Id="TorExe"
+ Name="Tor.exe"
+ Source="bin/tor.exe"
+ Vital="yes"
+ DiskId="1"
+ />
+ </Component>
+
+ <!-- Tor OpenSSL shared libraries
+ This optional component is required for shared builds
+ of Tor. For static builds it is ignored.
+ -->
+ <Component Id="OpenSSLLibrary" Guid="$(var.CurrOpenSSLLibraryGUID)">
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="UserSSLLibrary" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <File
+ Id="cryptoeay32dll"
+ Name="cryptoeay32-0.9.8.dll"
+ Source="bin/cryptoeay32-0.9.8.dll"
+ DiskId="1"
+ />
+ <File
+ Id="ssleay32dll"
+ Name="ssleay32-0.9.8.dll"
+ Source="bin/ssleay32-0.9.8.dll"
+ DiskId="1"
+ />
+ </Component>
+ </Directory>
+ </Directory>
+
+ <Directory Id="INSTALLDIR" Name="Tor">
+ <!-- Tor configuration files
+ The sample config is always kept up to date and the torrc
+ is left as is if it exists and copied from the sample
+ config otherwise.
+ -->
+ <Component Id="TorConfigFile" Guid="$(var.CurrTorConfigFileGUID)">
+ <CreateFolder />
+ <RemoveFolder Id="RemoveINSTALLDIR" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="UserConfigFile" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <File
+ Id="TorSampleConfig"
+ Name="torrc-example.txt"
+ Source="torrc.sample"
+ Vital="yes"
+ ReadOnly="no"
+ DiskId="1"
+ >
+ <CopyFile
+ Id="TorConfig"
+ DestinationName="torrc.txt"
+ />
+ </File>
+ </Component>
+
+ <!-- GeoIP data file. This is an optional component. -->
+ <Component Id="TorGeoIPFile" Guid="$(var.CurrTorGeoIPFileGUID)">
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="UserGeoIPFile" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <File
+ Id="GeoIPFile"
+ Name="geoip"
+ Source="geoip"
+ Vital="no"
+ ReadOnly="yes"
+ DiskId="1"
+ />
+ </Component>
+
+ <!-- Tor docs. unix2dos.exe on each text file is recommended for win32 packages. -->
+ <Directory Id="TorDocsDirectory" Name="docs">
+ <Component Id="TorDocuments" Guid="$(var.CurrTorDocumentsGUID)">
+ <CreateFolder />
+ <RemoveFolder Id="RemoveTorDocsDirectory" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="UserDocs" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <File
+ Id="TorReadme"
+ Name="README.txt"
+ Source="README"
+ DiskId="1"
+ />
+ <!-- HTML generated via: groff -man doc/tor.1 -T html > Usage.html -->
+ <File
+ Id="TorUsage"
+ Name="Usage.html"
+ Source="Usage.html"
+ DiskId="1"
+ />
+ <File
+ Id="TorAuthors"
+ Name="Authors.txt"
+ Source="Authors"
+ DiskId="1"
+ />
+ <File
+ Id="TorChangelog"
+ Name="ChangeLog.txt"
+ Source="ChangeLog"
+ DiskId="1"
+ />
+<?ifndef EXTLICENSE ?>
+ <File
+ Id="TorLicense"
+ Name="LICENSE.txt"
+ Source="LICENSE"
+ DiskId="1"
+ />
+<?endif?>
+ </Component>
+ </Directory>
+ </Directory>
+ </Directory>
+
+ <!-- Create shortcuts if requested
+ Remember that shortcuts must always be tied to a "key"
+ registry value for proper repair and removal.
+ -->
+ <Directory Id="ProgramMenuFolder" Name="Programs">
+ <Directory Id="ShortcutFolder" Name="Tor">
+ <Component Id="AddTorToStartMenu" Guid="$(var.CurrAddTorToStartMenuGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="StartMenuShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="TorStartMenuShortcut"
+ Name="Tor" Target="[LocalProgramsInstDir]tor.exe"
+ Directory="ShortcutFolder" WorkingDirectory="LocalProgramsInstDir"
+ Icon="tor.ico" IconIndex="0" />
+ <RemoveFolder Id="RemoveShortcutFolder" On="uninstall" />
+ </Component>
+ </Directory>
+ </Directory>
+
+ <Directory Id="DesktopFolder" Name="Desktop">
+ <Component Id="AddTorToDesktop" Guid="$(var.CurrAddTorToDesktopGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="DesktopShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="TorDesktopShortcut"
+ Name="Tor" Target="[LocalProgramsInstDir]tor.exe"
+ Directory="DesktopFolder" WorkingDirectory="LocalProgramsInstDir"
+ Icon="tor.ico" IconIndex="0" />
+ </Component>
+ <Component Id="AddTorDocsToDesktop" Guid="$(var.CurrAddTorDocsToDesktopGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="DesktopDocsShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="TorDocsDesktopShortcut"
+ Name="Tor Docs" Target="[TorDocsDirectory]"
+ Directory="DesktopFolder" WorkingDirectory="INSTDIR" />
+ </Component>
+ <Component Id="AddTorEditConfToDesktop" Guid="$(var.CurrAddTorEditConfToDesktopGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="DesktopEditConfShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="TorEditConfDesktopShortcut"
+ Name="Edit Tor Config"
+ Target="[WindowsFolder]notepad.exe"
+ Arguments="[INSTALLDIR]torrc.txt"
+ Directory="DesktopFolder" WorkingDirectory="INSTDIR" />
+ </Component>
+ </Directory>
+ </Directory>
+
+ <!-- Define list of application features available for install
+ There are two main sections to this list. The "MainApplication"
+ section which defines a core set of mandatory files and setup
+ and the other optional components like shortcuts which are not
+ required for functional installation.
+ -->
+ <Feature Id="Complete" Title="Tor"
+ Level="1" Display="expand" ConfigurableDirectory="INSTALLDIR"
+ Description="Tor is an implementation of Onion Routing. You can read more at https://www.torproject.org/">
+
+ <!-- Core files and setup tasks that must always be included in installation -->
+ <Feature Id="MainApplication" Title="Tor Application"
+ AllowAdvertise="no" Absent="disallow" Level="1"
+ Description="Main Tor application">
+ <ComponentRef Id="LocalProgramsFolderRef" />
+ <ComponentRef Id="TorExecutable" />
+ <ComponentRef Id="TorConfigFile" />
+ <ComponentRef Id="TorGeoIPFile" />
+ <ComponentRef Id="OpenSSLLibrary" />
+ <ComponentRef Id="TorDocuments" />
+ </Feature>
+
+ <!-- Shortcuts on the Start Menu and Desktop are optional but
+ provided by default. -->
+ <Feature Id="Shortcuts" Title="Shortcuts"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add shortcuts to Tor.">
+
+ <Feature Id="StartMenuShortcuts" Title="Add Tor to Start menu"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add Tor to your Start menu">
+ <ComponentRef Id="AddTorToStartMenu" />
+ </Feature>
+ <Feature Id="DesktopShortcuts" Title="Add Tor shortcut to Desktop"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add shortcut to launch Tor on Desktop">
+ <ComponentRef Id="AddTorToDesktop" />
+ </Feature>
+ <Feature Id="DesktopDocsShortcuts" Title="Add Tor docs folder to Desktop"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add Tor documentation folder to Desktop">
+ <ComponentRef Id="AddTorDocsToDesktop" />
+ </Feature>
+ <Feature Id="DesktopEditConfShortcuts" Title="Edit Tor config shortcut on Desktop"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Edit Tor config file shortcut on Desktop">
+ <ComponentRef Id="AddTorEditConfToDesktop" />
+ </Feature>
+ </Feature>
+ </Feature>
+
+ <!-- Upgrade installation sequence. -->
+ <InstallExecuteSequence>
+ <RemoveExistingProducts After="InstallValidate" />
+ </InstallExecuteSequence>
+
+ <!-- Set the UI options
+ Use a custom UI sequence to avoid EULA and other extraneous
+ parts of Mondo and other GUIs
+ -->
+ <UIRef Id="WixUI_Custom" />
+ <Icon Id="tor.ico" SourceFile="tor.ico" />
+ <WixVariable Id="WixUIBannerBmp" Value="default-header.bmp" />
+ <WixVariable Id="WixUIDialogBmp" Value="default-welcome.bmp" />
+ </Product>
+</Wix>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/torbutton.wxs.in b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/torbutton.wxs.in
new file mode 100644
index 0000000..77842c2
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/torbutton.wxs.in
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="Windows-1252" ?>
+<!--
+ Copyright (C) 2008-2009 The Tor Project, Inc.
+ See LICENSE file for rights and terms.
+ -->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <?define ThisProductVersion="1.2.0" ?>
+ <?define ThisProductVersionDisp="1.2.0" ?>
+ <?define UpgradeCode="e13a294d-6ac6-4ddd-a300-8ee8dee768c6" ?>
+
+ <?define CurrProductGUID="5c09de77-eceb-44b7-a9cc-7308ed7dd0fa" ?>
+ <?define CurrExtensionGUID="cb29b0ed-4fb0-4f69-ab87-98cc3ae96eec" ?>
+ <?define CurrStartMenuGUID="24cabe82-2fd6-408e-9af4-e3792cac9feb" ?>
+ <?define CurrDesktopGUID="c1352049-ec2e-4b72-ab34-313b20016e84" ?>
+
+ <Product Name="TorButton $(var.ThisProductVersionDisp)" Id="$(var.CurrProductGUID)"
+ Version="$(var.ThisProductVersion)"
+ Manufacturer="www.torproject.org"
+ Language="!(loc.LCID)"
+ UpgradeCode="$(var.UpgradeCode)">
+
+ <Package Id="*" Keywords="Installer"
+ Description="TorButton $(var.ThisProductVersionDisp) Installer"
+ Manufacturer="www.torproject.org"
+ InstallerVersion="200" Compressed="yes"
+ InstallPrivileges="limited" />
+
+ <Media Id="1" Cabinet="TorButton.cab" CompressionLevel="high"
+ EmbedCab="yes" DiskPrompt="CD-ROM #1" />
+ <Property Id="DiskPrompt" Value="TorButton $(var.ThisProductVersionDisp) Installation Volume [1]" />
+ <Property Id="ALLUSERS" Secure="yes"/>
+ <Property Id="ReinstallModeText">omus</Property>
+
+ <!-- To avoid placing shortcuts all over the desktop / start menu during a
+ silent installation the NOSC=1 option can be passed to omit shortcuts.
+ This is useful if bundled with other applications like Vidalia that manage
+ configuration and Tor related processes themselves.
+ -->
+ <Property Id="NOSC" Secure="yes"/>
+
+ <!-- Associate this package with the upgrade code for this series
+ to ensure that upgrade installations by Thandy or other means work
+ as expected.
+ The OnlyDetect option must be false to ensure that existing files
+ from an older version are removed and replaced with current files.
+ -->
+ <Upgrade Id="$(var.UpgradeCode)">
+ <UpgradeVersion
+ Property="UPGRADEFOUND"
+ OnlyDetect="no"
+ Minimum="0.0.0"
+ IncludeMinimum="yes"
+ Maximum="$(var.ThisProductVersion)"
+ IncludeMaximum="no"
+ />
+ </Upgrade>
+
+
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="LocalAppDataFolder" Name="LocalAppData">
+
+ <Directory Id="INSTALLDIR" Name="TorButton">
+ <Component Id="TorButtonExtension" Guid="$(var.CurrExtensionGUID)">
+ <CreateFolder/>
+ <RemoveFolder Id="RemoveINSTALLDIR" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\TorButton" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="Version" Value="$(var.ThisProductVersion)" Type="string" KeyPath="yes" />
+ </RegistryKey>
+ <File
+ Id="TorButtonExtensionFile"
+ Name="torbutton.xpi"
+ Source="torbutton.xpi"
+ Vital="yes"
+ ReadOnly="no"
+ DiskId="1">
+ </File>
+ </Component>
+
+ </Directory>
+ </Directory>
+
+ <Directory Id="ProgramMenuFolder" Name="Programs">
+ <Directory Id="ShortcutFolder" Name="TorButton">
+ <Component Id="AddTorButtonToStartMenu" Guid="$(var.CurrStartMenuGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU" Key="Software\TorButton" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="StartMenuShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="TorButtonStartMenuShortcut"
+ Name="Install TorButton" Target="[ProgramFilesFolder]Mozilla Firefox\firefox.exe"
+ Arguments="torbutton.xpi"
+ Directory="ShortcutFolder" WorkingDirectory="INSTALLDIR" />
+ <RemoveFolder Id="RemoveShortcutFolder" On="uninstall" />
+ </Component>
+ </Directory>
+ </Directory>
+
+ <Directory Id="DesktopFolder" Name="Desktop">
+ <Component Id="AddTorButtonToDesktop" Guid="$(var.CurrDesktopGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU" Key="Software\TorButton" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="DesktopShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="TorButtonDesktopShortcut"
+ Name="Install TorButton" Target="[ProgramFilesFolder]Mozilla Firefox\firefox.exe"
+ Arguments="torbutton.xpi"
+ Directory="DesktopFolder" WorkingDirectory="INSTALLDIR" />
+ </Component>
+ </Directory>
+ </Directory>
+
+ <!-- Build up the feature hierarchy -->
+ <Feature Id="Complete" Title="TorButton"
+ Level="1" Display="expand" ConfigurableDirectory="INSTALLDIR"
+ Description="TorButton protects your FireFox browser while using the Tor network.">
+ <Feature Id="MainApplication" Title="TorButton $(var.ThisProductVersionDisp)"
+ AllowAdvertise="no" Absent="disallow" Level="1"
+ Description="Main application">
+ <ComponentRef Id="TorButtonExtension" />
+ </Feature>
+ <Feature Id="Shortcuts" Title="Shortcuts"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add a shortcut to TorButton to your Start menu or Desktop.">
+ <Feature Id="StartMenuShortcuts" Title="Add to Start menu"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add TorButton to your Start menu">
+ <ComponentRef Id="AddTorButtonToStartMenu" />
+ </Feature>
+ <Feature Id="DesktopShortcuts" Title="Add to Desktop"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add TorButton to your Desktop">
+ <ComponentRef Id="AddTorButtonToDesktop" />
+ </Feature>
+ </Feature>
+ </Feature>
+
+ <!-- Upgrade installation sequence. -->
+ <InstallExecuteSequence>
+ <RemoveExistingProducts After="InstallValidate" />
+ </InstallExecuteSequence>
+
+ <!-- Set the UI options -->
+ <UIRef Id="WixUI_Custom" />
+ <WixVariable Id="WixUIBannerBmp" Value="default-header.bmp" />
+ <WixVariable Id="WixUIDialogBmp" Value="default-welcome.bmp" />
+ </Product>
+</Wix>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/tr/vidalia_tr.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/tr/vidalia_tr.po
new file mode 100644
index 0000000..480063e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/tr/vidalia_tr.po
@@ -0,0 +1,256 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2010-05-12 06:41-0600\n"
+"Last-Translator: yunus kaba <yunuskaba 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"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} Kurulumu"
+
+#, fuzzy
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Bu sihirbaz Tor, Vidalia, Polipo ve Torbutonu yüklerken size yardımcı "
+"olacak.Tor internette gezinmenizi, anlık mesajlaşmayı ve bir çok hizmeti "
+"güvenli ve gizli şekilde kullanmanızı sağlar.Vidalia bu sistemi kontrol, "
+"ayarlamanızı sağlar."
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "${BUNDLE_NAME} Kurulum sihibazına Hoş Geldiniz"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "${TOR_NAME} kurulum dökümanları"
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Yüklü bileşenleri çalıştır"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Kaldır ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} Kurulumu"
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "${VIDALIA_NAME} Kurulum sihibazına Hoş Geldiniz"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "${VIDALIA_NAME} anasayfası"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia arayüzü Tor'u kolayca yönetmenize yardımcı eder."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "${VIDALIA_NAME} başlangıçta çalıştır."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr " ${VIDALIA_NAME} Başlangıca ekle."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Çalıştır ${VIDALIA_NAME}"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Kaldır ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Kur ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Dökümanlar"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "${TOR_NAME} kurulum dökümanlarını yükle."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr " ${TOR_NAME} Başlangıca ekle."
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+
+#, fuzzy
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "Kaldır ${POLIPO_DESC}."
+
+#, fuzzy
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "Kur ${POLIPO_DESC}."
+
+#, fuzzy
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "Başlangıç Menüsüne Ekle"
+
+#, fuzzy
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr " ${POLIPO_NAME} Başlangıca ekle."
+
+#, fuzzy
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "Başlangıçta Çalıştır"
+
+#, fuzzy
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "${POLIPO_NAME} başlangıçta otomaik olarak çalıştır."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbuton bir Firefox eklentisi olup gizlice internette gezinmenizi sağlar."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Kaldır ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Kur ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Firefoxa ekle"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr " ${TORBUTTON_DESC} eklentisini Firefoxa ekle."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "Yüklü bir Firefox bulunamadı, torbutton kurulamadı"
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Uygulama Verisi"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Uygulama veriliverini ve ayar dosylarını kaldır"
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "İngilizce"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Firefox yüklü değil"
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr "Güvenliğiniz için yüklemeden önce Firefoxu yüklemenizi tavsiye ederiz."
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/uk/vidalia_uk.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/uk/vidalia_uk.po
new file mode 100644
index 0000000..3af7ef0
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/uk/vidalia_uk.po
@@ -0,0 +1,261 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2008-12-24 21:56+0000\n"
+"Last-Translator: Roger Dingledine <arma at mit.edu>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} інсталяція"
+
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Запустити встановленні компоненти зараз"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "Домашня сторінка ${VIDALIA_NAME}"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia це інтерфейс який допоможе вам керувати, спостерігати, та "
+"налаштовувати Tor."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Запускати при завантаженні"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Автоматично запускати ${VIDALIA_NAME} при завантаженні."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Додати до меню Пуск"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Додати ${VIDALIA_NAME} до вашого меню Пуск."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Запустити ${VIDALIA_NAME}"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor це система для анонімного користування Інтернет, допомагає зберегти "
+"анонімність при перегляді Веб сторінок та публікації, обміну миттєвими "
+"повідомленнями, IRC, і багато чого іншого."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Видалити ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Встановити ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"У вас вже є конфігураційний файл Tor.$\n"
+"$\n"
+"Бажаєте перезаписати його типовим зразком конфігураційного файла?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Документація"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Встановити документацію ${TOR_NAME}."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Додати до меню Пуск"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Додати ${TOR_NAME} до вашого меню Пуск."
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+
+#, fuzzy
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "Видалити ${POLIPO_DESC}."
+
+#, fuzzy
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "Встановити ${POLIPO_DESC}."
+
+#, fuzzy
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "Додати до меню Пуск"
+
+#, fuzzy
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "Додати ${POLIPO_NAME} до вашого меню Пуск."
+
+#, fuzzy
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "Запускати при завантаженні"
+
+#, fuzzy
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "Автоматично запускати ${POLIPO_NAME} при завантаженні."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton це розширення для Firefox яке дозволяє вам швидко включати або "
+"виключати анонімний перегляд веб сторінок."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Видалити ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Встановити ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Додати до Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Додати розширення ${TORBUTTON_DESC} до Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Дані програми"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Видалити збережені дані програми та файли конфігурації."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "en"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Firefox не встановлено"
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/vi/vidalia_vi.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/vi/vidalia_vi.po
new file mode 100755
index 0000000..1a84b29
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/vi/vidalia_vi.po
@@ -0,0 +1,256 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2010-03-05 22:28+0930\n"
+"Last-Translator: Lyndon Johnson <lyndon.johnson58 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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} thiết lập"
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+"Pháp thuật này sẽ hướng dẫn bạn thông qua sự cài đặt của Tor, Vidalia, "
+"Privoxy, và Torbutton. \n"
+"\n"
+"Tor là một hệ thống để sử dụng Internet nặc danh, giúp bạn dấu lước duyệt "
+"mạng web và xuất bản, tin nhắn tức thì, IRC, và nhiều hơn nữa. Vidalia là "
+"một giao diện GUI giúp bạn kiểm soát, giám sát, và cấu hình Tor.\n"
+"\n"
+"Privoxy là một bộ lọc cho web ủy nhiệm để bảo vệ quyền riêng tư của bạn và "
+"giúp loại bỏ các quảng cáo, biểu ngữ, và bộ tự mở.\n"
+" \n"
+"Torbutton là một phần mở rộng của Firefox để cho phép bạn nhanh chóng bật "
+"hoặc tắt chức năng duyệt web ẩn danh.\n"
+"\n"
+"Nếu trước đó bạn đã cài đặt Tor, Vidalia, Privoxy, hoặc Firefox, hãy đảm bảo "
+"rằng chúng không đang chạy trước khi tiếp tục sự cài đặt này.\n"
+" \n"
+" $_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Chào mừng đến với ${BUNDLE_NAME} Pháp thuật Thiết lập"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "${TOR_NAME} tài liệu hướng dẫn cài đặt"
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"Cài đặt xong.\n"
+"Vui lòng xem https://www.torproject.org/docs/tor-doc-windows để tìm hiểu làm "
+"thế nào để cấu hình những ứng dụng của bạn để dùng Tor.\n"
+"\n"
+"Nếu bạn đã cài đặt nút Torbutton, bạn sẽ cần phải khởi động lại Firefox."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Cho chạy các thành phần đã cài đặt bây giờ"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Gỡ bỏ ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} thiết lập"
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+"Pháp thuật này sẽ hướng dẫn bạn thông qua việc cài đặt Vidalia, một giao "
+"diện giúp bạn kiểm soát, giám sát, và cấu hình Tor.\n"
+"\n"
+" $_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Chào mừng đến với ${VIDALIA_NAME} Pháp thuật Thiết lập"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "${VIDALIA_NAME} trang chủ"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia là một giao diện giúp bạn kiểm soát, giám sát, và cấu hình Tor."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Tự động cho chạy ${VIDALIA_NAME} lúc khởi chạy."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Thêm ${VIDALIA_NAME} vào Trình đơn Start của bạn."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Cho chạy ${VIDALIA_NAME}"
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor là một hệ thống để sử dụng Internet nặc danh, giúp bạn dấu tên mạng Web "
+"duyệt lước và xuất bản, tin nhắn tức thì, IRC, và nhiều hơn nữa."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Gỡ bỏ ${TOR_DESC}"
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Cài đặt ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Bạn đã có một tập tin cấu hình Tor.$\n"
+"$\n"
+" Bạn có muốn ghi đè lên nó với tập tin mặc định các cấu hình mẫu không?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Tài liệu"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Cài đặt ${TOR_NAME} tài liệu."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Thêm ${TOR_NAME} vào Trình đơn Start của bạn."
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+"Privoxy là một proxy web lọc để bảo vệ quyền riêng tư của bạn và giúp loại "
+"bỏ các quảng cáo, biểu ngữ, và bộ tự mở."
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr "Gỡ bỏ ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr "Cài đặt ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr "Thêm vào Trình đơn Start"
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr "Thêm ${PRIVOXY_NAME} vào Trình đơn Start của bạn."
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr "Cho chạy lúc Khởi chạy"
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr "Tự động cho chạy ${PRIVOXY_NAME} lúc khởi chạy."
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+"Torbutton là một phần mở rộng của Firefox để cho phép bạn nhanh chóng bật "
+"hoặc tắt chức năng duyệt web ẩn danh."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Gỡ bỏ ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Cài đặt ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Thêm vào Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Thêm ${TORBUTTON_DESC} vào phần mở rộng cho Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "Không tìm thấy Firefox trên hệ thống của bạn. Không cài đặt Torbutton."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Dữ liệu Ứng dụng "
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Gỡ bỏ dữ liệu ứng dụng và những tập tin cấu hình lưu trữ."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "en"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "Firefox không được cài đặt"
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+"Chúng tôi khuyên bạn cài đặt Firefox trước khi tiếp tục, để an toàn nhất."
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"Các trình duyệt Web Mozilla Firefox không được cài đặt trên máy tính của "
+"bạn.\n"
+"Tor sẽ làm việc với các trình duyệt khác, chẳng hạn như Internet Explorer, "
+"nhưng\n"
+"dễ xử dụng với Firefox hơn, cũng như làm việc tốt hơn để\n"
+"bảo vệ danh tính của bạn.\n"
+"\n"
+" Nếu bạn muốn cài đặt Firefox, xin vui lòng nhấn Hủy bỏ, sau đó đi \n"
+" đến trang download Firefox tại"
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+"Khi bạn đã thực hiện xong việc cài đặt Firefox, bạn có thể chạy Bộ cài đặt\n"
+"Tor một lần nữa.\n"
+"\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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/vidalia-bundle.nsi.in b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/vidalia-bundle.nsi.in
new file mode 100644
index 0000000..3ac8325
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/vidalia-bundle.nsi.in
@@ -0,0 +1,662 @@
+;;
+;; $Id: vidalia-bundle.nsi.in 4290 2010-05-17 16:15:27Z phobos $
+;;
+;; This file is part of Vidalia, and is subject to the license terms in the
+;; LICENSE file, found in the top level directory of this distribution. If
+;; you did not 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.
+;;
+
+!include "MUI.nsh"
+
+SetCompressor /SOLID lzma
+!packhdr header.dat "upx --best header.dat"
+
+;---------------------------------
+; Global definitions
+!define VIDALIA_NAME "Vidalia"
+!define VIDALIA_EXEC "vidalia.exe"
+!define VIDALIA_APPVERSION "@VERSION@"
+!define VIDALIA_DESC "${VIDALIA_NAME} ${VIDALIA_APPVERSION}"
+
+!define TOR_NAME "Tor"
+!define TOR_EXEC "tor.exe"
+!define TOR_APPVERSION "0.2.1.26"
+!define TOR_DESC "${TOR_NAME} ${TOR_APPVERSION}"
+
+!define POLIPO_NAME "Polipo"
+!define POLIPO_EXEC "polipo.exe"
+!define POLIPO_APPVERSION "1.0.4.1"
+!define POLIPO_DESC "${POLIPO_NAME} ${POLIPO_APPVERSION}"
+
+!define TORBUTTON_NAME "Torbutton"
+!define TORBUTTON_APPVERSION "1.2.5"
+!define TORBUTTON_DESC "${TORBUTTON_NAME} ${TORBUTTON_APPVERSION}"
+
+!define BUNDLE_NAME "Vidalia Bundle"
+!define BUNDLE_APPVERSION "${TOR_APPVERSION}-${VIDALIA_APPVERSION}"
+!define BUNDLE_REVISION "1"
+!define BUNDLE_PRODVERSION "@VER_MAJOR at .@VER_MINOR at .@VER_PATCH at .${BUNDLE_REVISION}"
+!define BUNDLE_DESC "${BUNDLE_NAME} ${BUNDLE_APPVERSION}"
+!define INSTALLFILE "vidalia-bundle-${BUNDLE_APPVERSION}.exe"
+!define UNINSTALLER "Uninstall.exe"
+!define SHORTCUTS "$SMPROGRAMS\${BUNDLE_NAME}"
+
+;--------------------------------
+; Installer file details
+VIAddVersionKey "ProductName" "${BUNDLE_NAME}"
+VIAddVersionKey "Comments" "${BUNDLE_DESC}"
+VIAddVersionKey "FileVersion" "${BUNDLE_APPVERSION}"
+VIAddVersionKey "FileDescription" "${BUNDLE_DESC}"
+VIProductVersion "${BUNDLE_PRODVERSION}"
+
+;--------------------------------
+; Basic installer information
+Name "${BUNDLE_NAME}"
+Caption "$(BundleSetupCaption)"
+BrandingText "${BUNDLE_DESC} (Rev. ${BUNDLE_REVISION})"
+OutFile "${INSTALLFILE}"
+InstallDir "$PROGRAMFILES\Vidalia Bundle"
+InstallDirRegKey HKCU "Software" "${BUNDLE_NAME}"
+SetOverWrite ifnewer
+AutoCloseWindow false
+ShowInstDetails show
+CRCCheck on
+XPStyle on
+
+;--------------------------------
+; MUI Options
+!define MUI_WELCOMEPAGE_TITLE "$(BundleWelcomeTitle)"
+!define MUI_WELCOMEPAGE_TEXT "$(BundleWelcomeText)"
+!define MUI_ABORTWARNING
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
+!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
+!define MUI_HEADERIMAGE
+!define MUI_FINISHPAGE_TEXT "$(BundleFinishText)"
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_FUNCTION CustomFinishFn
+!define MUI_FINISHPAGE_RUN_TEXT "$(BundleRunNow)"
+!define MUI_FINISHPAGE_LINK "$(BundleLinkText)"
+!define MUI_FINISHPAGE_LINK_LOCATION "https://www.torproject.org/docs/tor-doc-win32.html"
+
+;--------------------------------
+; Pages
+!insertmacro MUI_PAGE_WELCOME
+Page custom FirefoxWarningPage
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_COMPONENTS
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+
+;--------------------------------
+; Available languages
+!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "Dutch"
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "Farsi"
+!insertmacro MUI_LANGUAGE "Finnish"
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Hebrew"
+!insertmacro MUI_LANGUAGE "Italian"
+!insertmacro MUI_LANGUAGE "Polish"
+!insertmacro MUI_LANGUAGE "Portuguese"
+!insertmacro MUI_LANGUAGE "Romanian"
+!insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Spanish"
+#!insertmacro MUI_LANGUAGE "SimpChinese"
+!insertmacro MUI_LANGUAGE "Swedish"
+#!insertmacro MUI_LANGUAGE "TradChinese"
+!include "vidalia_cs.nsh"
+!include "vidalia_de.nsh"
+!include "vidalia_en.nsh"
+!include "vidalia_es.nsh"
+!include "vidalia_fa.nsh"
+!include "vidalia_fi.nsh"
+!include "vidalia_fr.nsh"
+!include "vidalia_he.nsh"
+!include "vidalia_it.nsh"
+!include "vidalia_nl.nsh"
+!include "vidalia_pl.nsh"
+!include "vidalia_pt.nsh"
+!include "vidalia_ro.nsh"
+!include "vidalia_ru.nsh"
+!include "vidalia_sv.nsh"
+#!include "vidalia_zh-cn.nsh"
+#!include "vidalia_zh-tw.nsh"
+
+;--------------------------------
+; Install types
+!ifndef NOINSTTYPES ; only if not defined
+ InstType "Full"
+ InstType "Base"
+ ;InstType /COMPONENTSONLYONCUSTOM
+!endif
+
+;--------------------------------
+; Vidalia
+Var configfile
+var bInstallVidalia
+SectionGroup "${VIDALIA_DESC}" VidaliaGroup
+ ;--------------------------------
+ ; Vidalia application binaries
+ Section "${VIDALIA_NAME}" Vidalia
+ SectionIn 1 2
+
+ ; Set output path to the installation directory.
+ SetOutPath "$INSTDIR\Vidalia"
+ File "@Vidalia_BINARY_DIR@\src\vidalia\${VIDALIA_EXEC}"
+ File "@QT_BINARY_DIR@\QtCore4.dll"
+ File "@QT_BINARY_DIR@\QtGui4.dll"
+ File "@QT_BINARY_DIR@\QtNetwork4.dll"
+ File "@QT_BINARY_DIR@\QtXml4.dll"
+ File "@QT_BINARY_DIR@\libgcc_s_dw2-1.dll"
+ File "@MINGW_BINARY_DIR@\mingwm10.dll"
+ File "@OPENSSL_BINARY_DIR@\ssleay32.dll"
+ File "@OPENSSL_BINARY_DIR@\libeay32.dll"
+ File "@Vidalia_SOURCE_DIR@\README"
+ File "@Vidalia_SOURCE_DIR@\CHANGELOG"
+ File "@Vidalia_SOURCE_DIR@\LICENSE"
+ File "@Vidalia_SOURCE_DIR@\LICENSE-GPLV2"
+ File "@Vidalia_SOURCE_DIR@\LICENSE-GPLV3"
+ File "@Vidalia_SOURCE_DIR@\LICENSE-LGPLV3"
+ File "@Vidalia_SOURCE_DIR@\LICENSE-OPENSSL"
+ File "@Vidalia_SOURCE_DIR@\CREDITS"
+
+ ; Include a prebuilt GeoIP cache
+ SetShellVarContext current
+ CreateDirectory "$APPDATA\Vidalia"
+ SetOutPath "$APPDATA\Vidalia"
+ File "@Vidalia_SOURCE_DIR@\pkg\geoip-cache"
+
+ ;If there's already a torrc config file, ask if they want to
+ ;overwrite it with the new one.
+ StrCpy $configfile "torrc"
+ IfFileExists "$APPDATA\Vidalia\torrc" "" endiftorrc
+ MessageBox MB_ICONQUESTION|MB_YESNO "$(TorAskOverwriteTorrc)" IDNO noreplace
+ Delete "$APPDATA\Vidalia\torrc"
+ Goto endiftorrc
+ noreplace:
+ StrCpy $configfile "torrc.sample"
+ endiftorrc:
+ File /oname=$configfile "@TOR_PACKAGE_DIR@\torrc.sample"
+
+ ; Tor gets installed to $INSTDIR\Tor, so let's remember it
+ ; But first, we have to replace all the '\'s with '\\'s in the $INSTDIR
+ ; Does NSIS make this easy by providing the ability to replace substrings? No.
+ Push $INSTDIR
+ Push "\"
+ Push "\\"
+ Call StrRep
+ Pop $R0 ; contains the modified version of $INSTDIR
+ WriteINIStr "$APPDATA\Vidalia\vidalia.conf" Tor TorExecutable "$R0\\Tor\\${TOR_EXEC}"
+ WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General LanguageCode "$(LanguageCode)"
+
+ ; Write the uninstall keys for Windows
+ SetShellVarContext all
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "DisplayName" "${VIDALIA_DESC}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "UninstallString" '"$INSTDIR\${UNINSTALLER}"'
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "NoModify" 1
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "NoRepair" 1
+
+ IntOp $bInstallVidalia 0 + 1
+ SectionEnd
+
+ ;--------------------------------
+ ; Vidalia Start menu shortcuts
+ Section "$(VidaliaShortcuts)" VidaliaShortcuts
+ SectionIn 1
+ SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
+ CreateDirectory "${SHORTCUTS}"
+ CreateShortCut "${SHORTCUTS}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\${UNINSTALLER}" 0
+ CreateShortCut "${SHORTCUTS}\Vidalia.lnk" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" "" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" 0
+
+ WriteIniStr "$INSTDIR\Vidalia\Vidalia Website.url" "InternetShortcut" "URL" "http://www.vidalia-project.net"
+ CreateShortCut "${SHORTCUTS}\Vidalia Website.lnk" "$INSTDIR\Vidalia\Vidalia Website.url"
+ SectionEnd
+
+ ;--------------------------------
+ ; Run Vidalia at startup
+ Section "$(VidaliaStartup)" VidaliaStartup
+ SectionIn 1
+ WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${VIDALIA_NAME}" '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"'
+ SectionEnd
+SectionGroupEnd
+
+
+;--------------------------------
+; Tor
+var bInstallTor
+SectionGroup "${TOR_DESC}" TorGroup
+ ;--------------------------------
+ ; Tor application binaries
+ Section "${TOR_NAME}" Tor
+ ;Files that have to be installed for tor to run and that the user
+ ;cannot choose not to install
+ SectionIn 1 2
+ SetShellVarContext current
+ SetOutPath "$INSTDIR\Tor"
+ File "@TOR_PACKAGE_DIR@\tor.exe"
+ File "@TOR_PACKAGE_DIR@\tor-resolve.exe"
+ WriteIniStr "$INSTDIR\Tor\Tor Website.url" "InternetShortcut" "URL" "https://www.torproject.org"
+ ; Include tor's geoip file, too
+ SetOutPath "$APPDATA\Tor"
+ File "@TOR_PACKAGE_DIR@\geoip"
+
+ ; If the user is also installing Vidalia, then don't confuse them by
+ ; an extra torrc in %APPDATA%\Tor
+ SectionGetFlags ${Vidalia} $0
+ IntOp $0 $0 & ${SF_SELECTED}
+ IntCmp $0 ${SF_SELECTED} skiptorrc
+
+ StrCpy $configfile "torrc"
+
+ ; If there's already a torrc config file, ask if they want to
+ ; overwrite it with the new one.
+ IfFileExists "$APPDATA\Tor\torrc" "" endiftorrc
+ MessageBox MB_ICONQUESTION|MB_YESNO "$(TorAskOverwriteTorrc)" IDNO noreplace
+ Delete "$APPDATA\Tor\torrc"
+ Goto endiftorrc
+ noreplace:
+ StrCpy $configfile "torrc.sample"
+ endiftorrc:
+ File /oname=$configfile "@TOR_PACKAGE_DIR@\torrc.sample"
+
+ skiptorrc:
+ ; Write the uninstall keys for Windows
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "DisplayName" "${TOR_DESC}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "UninstallString" '"$INSTDIR\${UNINSTALLER}"'
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "NoModify" 1
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "NoRepair" 1
+
+ IntOp $bInstallTor 0 + 1
+ SectionEnd
+
+ ;--------------------------------
+ ; Tor documentation
+ Section "$(TorDocumentation)" TorDocs
+ SectionIn 1
+ SetOutPath "$INSTDIR\Tor\Documents"
+ File "@TOR_PACKAGE_DIR@\Documents\*.*"
+ SectionEnd
+
+ ;--------------------------------
+ ; Tor Start menu shortcuts
+ Section "$(TorShortcuts)" TorShortcuts
+ SectionIn 1
+ SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
+ SetOutPath "$INSTDIR\Tor"
+ IfFileExists "${SHORTCUTS}\Tor\*.*" "" +2
+ RMDir /r "${SHORTCUTS}\Tor"
+
+ CreateDirectory "${SHORTCUTS}\Tor"
+ CreateShortCut "${SHORTCUTS}\Tor\Tor.lnk" "$INSTDIR\Tor\tor.exe"
+ CreateShortCut "${SHORTCUTS}\Tor\Tor Website.lnk" "$INSTDIR\Tor\Tor Website.url"
+ CreateShortCut "${SHORTCUTS}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\${UNINSTALLER}" 0
+
+ IfFileExists "$INSTDIR\Tor\Documents\*.*" "" endifdocs
+ CreateDirectory "${SHORTCUTS}\Tor\Documents"
+ CreateShortCut "${SHORTCUTS}\Tor\Documents\Tor Manual.lnk" "$INSTDIR\Tor\Documents\tor-reference.html"
+ CreateShortCut "${SHORTCUTS}\Tor\Documents\Tor Documentation.lnk" "$INSTDIR\Tor\Documents"
+ CreateShortCut "${SHORTCUTS}\Tor\Documents\Tor Specification.lnk" "$INSTDIR\Tor\Documents\tor-spec.txt"
+ endifdocs:
+
+ ; If the user is installing Vidalia, then make the shortcut link to
+ ; %APPDATA%\Vidalia\torrc instead of %APPDATA%\Tor\torrc
+ SetShellVarContext current
+ SectionGetFlags ${Vidalia} $0
+ IntOp $0 $0 & ${SF_SELECTED}
+ IntCmp $0 ${SF_SELECTED} use_vidalia_torrc use_tor_torrc
+ use_vidalia_torrc:
+ StrCpy $configfile "$APPDATA\Vidalia\torrc"
+ goto torrc_shortcut
+ use_tor_torrc:
+ StrCpy $configfile "$APPDATA\Tor\torrc"
+ torrc_shortcut:
+ SetShellVarContext all
+ CreateShortCut "${SHORTCUTS}\Tor\Torrc.lnk" "Notepad.exe" $configfile
+ SectionEnd
+SectionGroupEnd
+
+
+;--------------------------------
+; Polipo
+var bInstallPolipo
+SectionGroup "${POLIPO_DESC}" PolipoGroup
+ ;--------------------------------
+ ; Polipo application binaries
+ Section "${POLIPO_NAME}" Polipo
+ SectionIn 1 2
+ ; add files / whatever that need to be installed here.
+ SetOutPath "$INSTDIR\Polipo"
+ SetShellVarContext current
+
+ File /r /x "@POLIPO_PACKAGE_DIR@\polipo.conf" "@POLIPO_PACKAGE_DIR@\*.*"
+ File "@CMAKE_CURRENT_SOURCE_DIR@\polipo.conf"
+
+ ; Let Vidalia know that Polipo was installed
+ IntCmp $bInstallVidalia 1 AddVidaliaSettings SkipVidaliaSettings SkipVidaliaSettings
+ AddVidaliaSettings:
+ Push $INSTDIR
+ Push "\"
+ Push "\\"
+ Call StrRep
+ Pop $R0
+ WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General ProxyExecutable "$R0\\Polipo\\${POLIPO_EXEC}"
+ WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General ProxyExecutableArguments '-c \"$R0\\Polipo\\polipo.conf\"'
+ WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General RunProxyAtStart "true"
+ SkipVidaliaSettings:
+
+ ; Write the installation path into the registry
+ WriteRegStr HKCU SOFTWARE\Polipo "Install_Dir" "$INSTDIR"
+
+ ; Write the uninstall keys for Windows
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Polipo" "DisplayName" "${POLIPO_DESC}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Polipo" "UninstallString" '"$INSTDIR\${UNINSTALLER}"'
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Polipo" "NoModify" 1
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Polipo" "NoRepair" 1
+
+ IntOp $bInstallPolipo 0 + 1
+ SectionEnd
+
+ ;--------------------------------
+ ; Polipo Start menu shortcuts
+ Section "$(PolipoShortcuts)" PolipoShortcuts
+ SectionIn 1
+ SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
+ RMDir /r "${SHORTCUTS}\Polipo"
+ CreateDirectory "${SHORTCUTS}\Polipo"
+ CreateShortCut "${SHORTCUTS}\Polipo\Polipo.lnk" "$INSTDIR\Polipo\polipo.exe"
+ CreateShortCut "${SHORTCUTS}\Polipo\Web-based Feedback.lnk" "$INSTDIR\Polipo\doc\user-manual\contact.html"
+
+ CreateDirectory "${SHORTCUTS}\Polipo\Edit Config"
+ CreateShortCut "${SHORTCUTS}\Polipo\Edit Config\Main Configuration.lnk" "Notepad.exe" '"$INSTDIR\Polipo\polipo.conf"'
+
+ CreateDirectory "${SHORTCUTS}\Polipo\Documentation"
+ CreateShortCut "${SHORTCUTS}\Polipo\Documentation\User Manual.lnk" "$INSTDIR\Polipo\doc\user-manual\index.html"
+ WriteINIStr "$SMPROGRAMS\Polipo\Documentation\Web Site.url" "InternetShortcut" "URL" "http://www.pps.jussieu.fr/~jch/software/polipo/"
+
+ CreateShortCut "${SHORTCUTS}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\${UNINSTALLER}" 0
+ SectionEnd
+
+SectionGroupEnd
+
+;--------------------------------
+; Torbutton
+SectionGroup "${TORBUTTON_DESC}" TorbuttonGroup
+ Section "${TORBUTTON_NAME}" Torbutton
+ SectionIn 1 2
+ SetOutPath "$INSTDIR\Torbutton"
+ File @TORBUTTON_PACKAGE_DIR@\LICENSE
+ File @TORBUTTON_PACKAGE_DIR@\torbutton-${TORBUTTON_APPVERSION}.xpi
+ SectionEnd
+
+ Section "$(TorbuttonAddToFirefox)" TorbuttonAddToFirefox
+ SectionIn 1 2
+ ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" ""
+ StrCmp $1 "" FirefoxNotFound 0 ; if Path is empty or null, then skip to an error, otherwise proceed
+ Exec '"$1" "$INSTDIR\Torbutton\torbutton-${TORBUTTON_APPVERSION}.xpi"'
+ Goto TorbuttonInstalled
+ FirefoxNotFound:
+ MessageBox MB_OK|MB_ICONSTOP "$(TorbuttonFirefoxNotFound)"
+ TorbuttonInstalled:
+ SectionEnd
+SectionGroupEnd
+
+Section "" end
+ SetOutPath "$INSTDIR"
+ WriteUninstaller "$INSTDIR\${UNINSTALLER}"
+SectionEnd
+
+;--------------------------------
+; Functions
+Function .onInit
+ !insertmacro MUI_LANGDLL_DISPLAY
+ !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "@Vidalia_SOURCE_DIR@\pkg\win32\firefox-warning.ini" "firefox-warning.ini"
+
+ ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" ""
+ StrCmp $1 "" FirefoxNotFound FirefoxFound
+
+ FirefoxNotFound:
+ ; Uncheck the Torbutton options
+ SectionGetFlags ${Torbutton} $0
+ IntOp $0 $0 & ${SECTION_OFF}
+ SectionSetFlags ${Torbutton} $0
+
+ SectionGetFlags ${TorbuttonAddToFirefox} $0
+ IntOp $0 $0 & ${SECTION_OFF}
+ SectionSetFlags ${TorbuttonAddToFirefox} $0
+
+ FirefoxFound:
+FunctionEnd
+
+Function .onSelChange
+ Push $0
+
+ ; Check if the Torbutton option was unchecked
+ SectionGetFlags ${Torbutton} $0
+ IntOp $0 $0 & ${SF_SELECTED}
+ IntCmp $0 0 0 SelChangeDone SelChangeDone
+
+ ; Uncheck the "Add to Firefox" box
+ SectionGetFlags ${TorbuttonAddToFirefox} $0
+ IntOp $0 $0 & ${SECTION_OFF}
+ SectionSetFlags ${TorbuttonAddToFirefox} $0
+
+ SelChangeDone:
+ Pop $0
+FunctionEnd
+
+Function FirefoxWarningPage
+ ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" ""
+ StrCmp $1 "" FirefoxNotFound FirefoxFound
+
+ FirefoxNotFound:
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "firefox-warning.ini" "Settings" "Title" "$(FirefoxWarningPageTitle)"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "firefox-warning.ini" "Field 1" "Text" "$(FirefoxWarningPageUpperText)"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "firefox-warning.ini" "Field 3" "Text" "$(FirefoxWarningPageLowerText)"
+ !insertmacro MUI_HEADER_TEXT "$(FirefoxWarningPageTitle)" "$(FirefoxWarningPageSubtitle)"
+ !insertmacro MUI_INSTALLOPTIONS_DISPLAY "firefox-warning.ini"
+
+ FirefoxFound:
+FunctionEnd
+
+Function CustomFinishFn
+ IntCmp $bInstallVidalia 1 run_vidalia check_tor check_tor
+ run_vidalia:
+ Exec '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"'
+ goto done
+
+ check_tor:
+ IntCmp $bInstallTor 1 run_tor check_polipo check_polipo
+ run_tor:
+ Exec '"$INSTDIR\Tor\${TOR_EXEC}"'
+
+ check_polipo:
+ IntCmp $bInstallPolipo 1 run_polipo done done
+ run_polipo:
+ SetOutPath "$INSTDIR\Polipo"
+ Exec '"$INSTDIR\Polipo\${POLIPO_EXEC}" -c "$INSTDIR\Polipo\polipo.conf"'
+ done:
+FunctionEnd
+
+;-------------------------
+; Uninstaller
+Section "-Uninstall" Uninstall
+SectionEnd
+
+SectionGroup "un.Tor ${TOR_APPVERSION}" UninstallTorGroup
+ Section "un.Tor" UninstallTor
+ SetShellVarContext all
+ RMDir /r "$INSTDIR\Tor"
+ RMDir /r "${SHORTCUTS}\Tor"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Tor"
+ SectionEnd
+
+ Section "un.$(AppData)" UninstallTorAppData
+ SetShellVarContext current
+ RMDir /r "$APPDATA\Tor"
+ SectionEnd
+SectionGroupEnd
+
+SectionGroup "un.Vidalia ${VIDALIA_APPVERSION}" UninstallVidaliaGroup
+ Section "un.Vidalia" UninstallVidalia
+ SetShellVarContext all
+ RMDir /r "$INSTDIR\Vidalia"
+ Delete "${SHORTCUTS}\Vidalia.lnk"
+ Delete "${SHORTCUTS}\Vidalia Website.lnk"
+ DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Run\Vidalia"
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia"
+ SectionEnd
+
+ Section "un.$(AppData)" UninstallVidaliaAppData
+ SetShellVarContext current
+ RMDir /r "$APPDATA\Vidalia"
+ SectionEnd
+SectionGroupEnd
+
+Section "un.Polipo ${POLIPO_APPVERSION}" UninstallPolipo
+ SetShellVarContext all
+ RMDir /r "$INSTDIR\Polipo"
+ RMDir /r "${SHORTCUTS}\Polipo"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Polipo"
+SectionEnd
+
+; XXX: We still need to find a way to actually remove Torbutton from Firefox
+;Section "un.Torbutton ${TORBUTTON_APPVERSION}" UninstallTorbutton
+; RMDir /r "$INSTDIR\Torbutton"
+; DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Tor"
+;SectionEnd
+
+Function un.onInit
+ !insertmacro MUI_LANGDLL_DISPLAY
+ SetShellVarContext current
+
+ IfFileExists "$INSTDIR\Tor\*.*" CheckTorAppData
+ SectionGetFlags ${UninstallTor} $0
+ IntOp $0 $0 & ${SECTION_OFF}
+ SectionSetFlags ${UninstallTor} $0
+
+ CheckTorAppData:
+ IfFileExists "$APPDATA\Tor\*.*" CheckVidalia
+ SectionGetFlags ${UninstallTorAppData} $0
+ IntOp $0 $0 & ${SECTION_OFF}
+ SectionSetFlags ${UninstallTorAppData} $0
+
+ CheckVidalia:
+ IfFileExists "$INSTDIR\Vidalia\*.*" CheckVidaliaAppData
+ SectionGetFlags ${UninstallVidalia} $0
+ IntOp $0 $0 & ${SECTION_OFF}
+ SectionSetFlags ${UninstallVidalia} $0
+
+ CheckVidaliaAppData:
+ IfFileExists "$APPDATA\Vidalia\*.*" CheckPolipo
+ SectionGetFlags ${UninstallVidaliaAppData} $0
+ IntOp $0 $0 & ${SECTION_OFF}
+ SectionSetFlags ${UninstallVidaliaAppData} $0
+
+ CheckPolipo:
+ IfFileExists "$INSTDIR\Polipo\*.*" Done
+ SectionGetFlags ${UninstallPolipo} $0
+ IntOp $0 $0 & ${SECTION_OFF}
+ SectionSetFlags ${UninstallPolipo} $0
+
+ Done:
+FunctionEnd
+
+Function un.onUninstSuccess
+ SetShellVarContext all
+ IfFileExists "$INSTDIR\Tor\*.*" DontRemoveTheUninstaller
+ IfFileExists "$INSTDIR\Vidalia\*.*" DontRemoveTheUninstaller
+ IfFileExists "$INSTDIR\Polipo\*.*" DontRemoveTheUninstaller
+ RMDir /r "$INSTDIR"
+ RMDir /r "${SHORTCUTS}"
+ DontRemoveTheUninstaller:
+FunctionEnd
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${Tor} "$(TorAppDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorGroup} "$(TorGroupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorDocs} "$(TorDocumentationDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorShortcuts} "$(TorShortcutsDesc)"
+
+ !insertmacro MUI_DESCRIPTION_TEXT ${Vidalia} "$(VidaliaAppDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaGroup} "$(VidaliaGroupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaStartup} "$(VidaliaStartupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaShortcuts} "$(VidaliaShortcutsDesc)"
+
+ !insertmacro MUI_DESCRIPTION_TEXT ${Polipo} "$(PolipoAppDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${PolipoGroup} "$(PolipoGroupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${PolipoStartup} "$(PolipoStartupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${PolipoShortcuts} "$(PolipoShortcutsDesc)"
+
+ !insertmacro MUI_DESCRIPTION_TEXT ${Torbutton} "$(TorbuttonAppDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorbuttonGroup} "$(TorbuttonGroupDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${TorbuttonAddToFirefox} "$(TorbuttonAddToFirefoxDesc)"
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+!insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${UninstallTor} "$(TorUninstDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${UninstallTorAppData} "$(AppDataUninstDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${UninstallVidalia} "$(VidaliaUninstDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${UninstallVidaliaAppData} "$(AppDataUninstDesc)"
+ !insertmacro MUI_DESCRIPTION_TEXT ${UninstallPolipo} "$(PolipoUninstDesc)"
+!insertmacro MUI_UNFUNCTION_DESCRIPTION_END
+
+
+Function StrRep
+
+ ;Written by dirtydingus 2003-02-20 04:30:09
+ ; USAGE
+ ;Push String to do replacement in (haystack)
+ ;Push String to replace (needle)
+ ;Push Replacement
+ ;Call StrRep
+ ;Pop $R0 result
+
+ Exch $R4 ; $R4 = Replacement String
+ Exch
+ Exch $R3 ; $R3 = String to replace (needle)
+ Exch 2
+ Exch $R1 ; $R1 = String to do replacement in (haystack)
+ Push $R2 ; Replaced haystack
+ Push $R5 ; Len (needle)
+ Push $R6 ; len (haystack)
+ Push $R7 ; Scratch reg
+ StrCpy $R2 ""
+ StrLen $R5 $R3
+ StrLen $R6 $R1
+loop:
+ StrCpy $R7 $R1 $R5
+ StrCmp $R7 $R3 found
+ StrCpy $R7 $R1 1 ; - optimization can be removed if U know len needle=1
+ StrCpy $R2 "$R2$R7"
+ StrCpy $R1 $R1 $R6 1
+ StrCmp $R1 "" done loop
+found:
+ StrCpy $R2 "$R2$R4"
+ StrCpy $R1 $R1 $R6 $R5
+ StrCmp $R1 "" done loop
+done:
+ StrCpy $R3 $R2
+ Pop $R7
+ Pop $R6
+ Pop $R5
+ Pop $R2
+ Pop $R1
+ Pop $R4
+ Exch $R3
+
+FunctionEnd
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/vidalia.wxs.in b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/vidalia.wxs.in
new file mode 100644
index 0000000..cda9a11
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/vidalia.wxs.in
@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="Windows-1252" ?>
+<!--
+ $Id: vidalia.wxs.in 4277 2010-04-29 05:12:49Z edmanm $
+ -->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+
+ <?define VidaliaVersion="@VER_MAJOR at .@VER_MINOR at .@VER_PATCH@" ?>
+ <?define VidaliaUpgradeCode="B7FBFE11-D7CA-4895-A1FB-1D7E065E4D04" ?>
+ <?define VidaliaProductGuid="65DC4C06-95ED-4AD2-98CE-BEB82D47F84C" ?>
+ <?define VidaliaDocumentsGuid="F6A00477-80AE-43F3-B406-8B53D685BE3B" ?>
+ <?define QtLibraryGuid="420D52CF-D7C0-4BA0-9D4E-A229E6CFAE9D" ?>
+ <?define QtImageFormatPluginsGuid="420D52CF-D7C0-4BA0-9D4E-A229E6CFAE9D" ?>
+ <?define MinGWLibraryGuid="B4925AB4-DEF4-4B1E-88A7-67EACD8F1312" ?>
+ <?define OpenSSLLibraryGuid="F93379CC-F2E8-4476-BCBC-D57FEA0E5320" ?>
+ <?define MarbleWidgetLibraryGuid="8D749190-ADD6-40EA-A59F-3331EDAEDE01" ?>
+ <?define MarblePluginsGuid="D323FF55-CD5F-4EF1-BAE1-1D8A4B79E112" ?>
+ <?define MarbleLegendsDataGuid="46903134-8E51-4D06-9ABB-92A6E1F439BE" ?>
+ <?define MarbleBlueMarbleDataGuid="DE030E4A-0046-4CA7-B8DC-0E3E77A0149D" ?>
+ <?define MarbleCityLightsDataGuid="4C4F3253-38D8-484C-B49A-F0AA2ABE6F91" ?>
+ <?define MarbleMwdbiiDataGuid="5B1C77C4-27F4-4F0F-BCAE-2D48E02A4F93" ?>
+ <?define MarbleSrtmDataGuid="44053C18-D3A9-452A-A37C-E596DCEFD9AF" ?>
+ <?define MarblePlacemarkDataGuid="3166DA37-E905-48B7-AAED-5F891C06824A" ?>
+ <?define MarbleStarsDataGuid="E0C84A4B-A05D-45AE-9890-D4F896517353" ?>
+ <?define MarbleSvgDataGuid="38323BC7-6B96-46F0-BD21-0E7441D9C47C" ?>
+ <?define UseMarble="@USE_MARBLE@"?>
+ <?define UseBreakpad="@USE_BREAKPAD@"?>
+
+ <Product Name="Vidalia @VERSION@" Id="$(var.VidaliaProductGuid)"
+ Language="1033" Codepage="1252"
+ Version="$(var.VidaliaVersion)"
+ Manufacturer="vidalia-project.net"
+ UpgradeCode="$(var.VidaliaUpgradeCode)">
+
+ <Package Id="*" Keywords="Installer"
+ Description="Vidalia @VERSION@ Installer"
+ Manufacturer="vidalia-project.net"
+ InstallerVersion="300" Compressed="yes"
+ Languages="1033" SummaryCodepage="1252" />
+
+ <Media Id="1" Cabinet="Vidalia.cab" CompressionLevel="high"
+ EmbedCab="yes" DiskPrompt="CD-ROM #1" />
+ <Property Id="DiskPrompt" Value="Vidalia @VERSION@ Installation [1]" />
+
+ <Upgrade Id="$(var.VidaliaUpgradeCode)">
+ <UpgradeVersion Property="UPGRADEFOUND" OnlyDetect="no"
+ Minimum="0.0.1" IncludeMinimum="yes"
+ Maximum="$(var.VidaliaVersion)" IncludeMaximum="no" />
+ </Upgrade>
+
+ <!-- Define the target installation directory hierarchy -->
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="ProgramFilesFolder" Name="ProgramFilesDir">
+ <Directory Id="INSTALLDIR" Name="Vidalia">
+ <?if $(var.UseMarble) = "ON"?>
+ <Directory Id="PluginsDir" Name="plugins">
+ <Directory Id="QtPluginsDir" Name="qt">
+ <Directory Id="QtImageFormatPluginsDir" Name="imageformats" />
+ </Directory>
+ <Directory Id="MarblePluginsDir" Name="marble" />
+ </Directory>
+ <Directory Id="MarbleDataDir" Name="data">
+ <Directory Id="MarbleMapsDir" Name="maps">
+ <Directory Id="MarbleEarthMapsDir" Name="earth">
+ <Directory Id="MarbleBlueMarbleDataDir" Name="bluemarble" />
+ <Directory Id="MarbleCityLightsDataDir" Name="citylights" />
+ <Directory Id="MarbleSrtmDataDir" Name="srtm" />
+ </Directory>
+ </Directory>
+ <Directory Id="MarbleMwdbiiDir" Name="mwdbii" />
+ <Directory Id="MarblePlacemarkDataDir" Name="placemarks" />
+ <Directory Id="MarbleStarsDataDir" Name="stars" />
+ <Directory Id="MarbleSvgDataDir" Name="svg" />
+ </Directory>
+ <?endif?>
+ </Directory>
+ </Directory>
+ </Directory>
+
+ <DirectoryRef Id="INSTALLDIR">
+ <!-- Main Vidalia application files -->
+ <Component Id="VidaliaExecutable" Guid="*">
+ <File Id="VidaliaExe" DiskId="1"
+ Name="vidalia.exe" Source="@VIDALIA_EXECUTABLE@" />
+ </Component>
+
+ <!-- Vidalia-related documents -->
+ <Component Id="VidaliaDocuments" Guid="$(var.VidaliaDocumentsGuid)">
+ <File Id="VidaliaReadme" DiskId="1"
+ Name="README" Source="@Vidalia_SOURCE_DIR@\README" />
+ <File Id="VidaliaCredits" DiskId="1"
+ Name="CREDITS" Source="@Vidalia_SOURCE_DIR@\CREDITS" />
+ <File Id="VidaliaChangeLog" DiskId="1"
+ Name="CHANGELOG" Source="@Vidalia_SOURCE_DIR@\CHANGELOG" />
+ <File Id="VidaliaLicense" DiskId="1"
+ Name="LICENSE" Source="@Vidalia_SOURCE_DIR@\LICENSE" />
+ <File Id="VidaliaLicenseGplV2" DiskId="1"
+ Name="LICENSE-GPLV2" Source="@Vidalia_SOURCE_DIR@\LICENSE-GPLV2" />
+ <File Id="VidaliaLicenseGplV3" DiskId="1"
+ Name="LICENSE-GPLV3" Source="@Vidalia_SOURCE_DIR@\LICENSE-GPLV3" />
+ <File Id="VidaliaLicenseLgplV3" DiskId="1"
+ Name="LICENSE-LGPLV3" Source="@Vidalia_SOURCE_DIR@\LICENSE-LGPLV3" />
+ <File Id="VidaliaLicenseOpenSSL" DiskId="1"
+ Name="LICENSE-OPENSSL" Source="@Vidalia_SOURCE_DIR@\LICENSE-OPENSSL" />
+ </Component>
+
+ <!-- Qt-related library files -->
+ <Component Id="QtLibrary" Guid="$(var.QtLibraryGuid)">
+ <File Id="QtCore4Dll" DiskId="1"
+ Name="QtCore4.dll" Source="@QT_BINARY_DIR@\QtCore4.dll" />
+ <File Id="QtGui4Dll" DiskId="1"
+ Name="QtGui4.dll" Source="@QT_BINARY_DIR@\QtGui4.dll" />
+ <File Id="QtNetwork4Dll" DiskId="1"
+ Name="QtNetwork4.dll" Source="@QT_BINARY_DIR@\QtNetwork4.dll" />
+ <File Id="QtXml4Dll" DiskId="1"
+ Name="QtXml4.dll" Source="@QT_BINARY_DIR@\QtXml4.dll" />
+ <File Id="LibGccDll" DiskId="1"
+ Name="libgcc_s_dw2-1.dll" Source="@QT_BINARY_DIR@\libgcc_s_dw2-1.dll" />
+ <?if $(var.UseMarble) = "ON"?>
+ <File Id="QtSvg4Dll" DiskId="1"
+ Name="QtSvg4.dll" Source="@QT_BINARY_DIR@\QtSvg4.dll" />
+ <File Id="QtWebKit4Dll" DiskId="1"
+ Name="QtWebKit4.dll" Source="@QT_BINARY_DIR@\QtWebKit4.dll" />
+ <?endif?>
+ </Component>
+
+ <!-- OpenSSL-related library files -->
+ <Component Id="OpenSSLLibrary" Guid="$(var.OpenSSLLibraryGuid)">
+ <File Id="ssleay32dll" DiskId="1"
+ Name="ssleay32.dll" Source="@OPENSSL_BINARY_DIR@\ssleay32.dll" />
+ <File Id="libeay32dll" DiskId="1"
+ Name="libeay32.dll" Source="@OPENSSL_BINARY_DIR@\libeay32.dll" />
+ </Component>
+
+ <?if $(var.UseBreakpad) = "ON"?>
+ <!-- Builds with Breakpad support must include the CRT. -->
+ <Merge Id="CRT" Language="0" DiskId="1"
+ SourceFile="C:\Program Files\Common Files\Merge Modules\microsoft_vc90_crt_x86.msm" />
+ <Component Id="CrashReporterExecutable" Guid="*">
+ <File Id="CrashReporterExe" DiskId="1"
+ Name="crashreporter.exe"
+ Source="@VIDALIA_CRASHREPORTER_EXECUTABLE@" />
+ </Component>
+ <?else?>
+ <!-- Include MinGW-related library files -->
+ <Component Id="MinGWLibrary" Guid="$(var.MinGWLibraryGuid)">
+ <File Id="MinGWDll" DiskId="1"
+ Name="mingwm10.dll" Source="@MINGW_BINARY_DIR@\mingwm10.dll" />
+ </Component>
+ <?endif?>
+
+ <?if $(var.UseMarble) = "ON"?>
+ <!-- Marble-related library files -->
+ <Component Id="MarbleWidgetLibrary" Guid="$(var.MarbleWidgetLibraryGuid)">
+ <File Id="MarbleWidgetDll" DiskId="1"
+ Name="libmarblewidget.dll" Source="@MARBLEWIDGET_LIBRARY@" />
+ </Component>
+ <?endif?>
+ </DirectoryRef>
+
+ <!-- Qt-related plugin files -->
+ <?if $(var.UseMarble) = "ON"?>
+ <DirectoryRef Id="QtImageFormatPluginsDir">
+ <Component Id="QtImageFormatPlugins" Guid="$(var.QtImageFormatPluginsGuid)">
+ <File Id="QJpeg4Dll" DiskId="1"
+ Name="qjpeg4.dll" Source="@QT_PLUGINS_DIR@\imageformats\qjpeg4.dll" />
+ </Component>
+ </DirectoryRef>
+
+ <!-- Marble-related plugin files -->
+ <DirectoryRef Id="MarblePluginsDir">
+ <Component Id="MarblePlugins" Guid="$(var.MarblePluginsGuid)">
+ <File Id="MarbleOverviewMapPlugin" DiskId="1"
+ Name="libMarbleOverviewMap.dll" Source="@MARBLE_OVERVIEWMAP_PLUGIN@" />
+ <File Id="MarbleStarsPlugin" DiskId="1"
+ Name="libMarbleStarsPlugin.dll" Source="@MARBLE_STARS_PLUGIN@" />
+ </Component>
+ </DirectoryRef>
+
+ <!-- Marble-related data files -->
+ <DirectoryRef Id="MarbleDataDir">
+ <Component Id="MarbleLegendsData" Guid="$(var.MarbleLegendsDataGuid)">
+ <File Id="LandColorsLegend" DiskId="1"
+ Name="landcolors.leg" Source="@MARBLE_DATA_DIR@\landcolors.leg" />
+ <File Id="SeaColorsLegend" DiskId="1"
+ Name="seacolors.leg" Source="@MARBLE_DATA_DIR@\seacolors.leg" />
+ </Component>
+ </DirectoryRef>
+ <DirectoryRef Id="MarbleBlueMarbleDataDir">
+ <Component Id="MarbleBlueMarbleData" Guid="$(var.MarbleBlueMarbleDataGuid)">
+ <File Id="MarbleBlueMarbleDgml" DiskId="1"
+ Name="bluemarble.dgml" Source="@MARBLE_DATA_DIR@\maps\earth\bluemarble\bluemarble.dgml" />
+ </Component>
+ </DirectoryRef>
+ <DirectoryRef Id="MarbleCityLightsDataDir">
+ <Component Id="MarbleCityLightsData" Guid="$(var.MarbleCityLightsDataGuid)">
+ <File Id="MarbleCityLightsDgml" DiskId="1"
+ Name="citylights.dgml" Source="@MARBLE_DATA_DIR@\maps\earth\citylights\citylights.dgml" />
+ </Component>
+ </DirectoryRef>
+ <DirectoryRef Id="MarbleSrtmDataDir">
+ <Component Id="MarbleSrtmData" Guid="$(var.MarbleSrtmDataGuid)">
+ <File Id="MarbleSrtmDgml" DiskId="1"
+ Name="srtm.dgml" Source="@MARBLE_DATA_DIR@\maps\earth\srtm\srtm.dgml" />
+ <File Id="MarbleSrtmJpg" DiskId="1"
+ Name="srtm.jpg" Source="@MARBLE_DATA_DIR@\maps\earth\srtm\srtm.jpg" />
+ </Component>
+ </DirectoryRef>
+ <DirectoryRef Id="MarbleMwdbiiDir">
+ <Component Id="MarbleMwdbiiData" Guid="$(var.MarbleMwdbiiDataGuid)">
+ <File Id="DatelinePnt" DiskId="1"
+ Name="DATELINE.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\DATELINE.PNT" />
+ <File Id="PAustPnt" DiskId="1"
+ Name="PAUST.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PAUST.PNT" />
+ <File Id="PBorderPnt" DiskId="1"
+ Name="PBORDER.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PBORDER.PNT" />
+ <File Id="PCanProvPnt" DiskId="1"
+ Name="PCANPROV.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PCANPROV.PNT" />
+ <File Id="PCoastPnt" DiskId="1"
+ Name="PCOAST.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PCOAST.PNT" />
+ <File Id="PDiffBorderPnt" DiskId="1"
+ Name="PDIFFBORDER.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PDIFFBORDER.PNT" />
+ <File Id="PGlacierPnt" DiskId="1"
+ Name="PGLACIER.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PGLACIER.PNT" />
+ <File Id="PIslandPnt" DiskId="1"
+ Name="PISLAND.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PISLAND.PNT" />
+ <File Id="PLakePnt" DiskId="1"
+ Name="PLAKE.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PLAKE.PNT" />
+ <File Id="PLakeIslandPnt" DiskId="1"
+ Name="PLAKEISLAND.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PLAKEISLAND.PNT" />
+ <File Id="PMexicoPnt" DiskId="1"
+ Name="PMEXICO.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PMEXICO.PNT" />
+ <File Id="PUsa48DiffPnt" DiskId="1"
+ Name="PUSA48.DIFF.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PUSA48.DIFF.PNT" />
+ <File Id="PUsa48Pnt" DiskId="1"
+ Name="PUSA48.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\PUSA48.PNT" />
+ <File Id="RiverPnt" DiskId="1"
+ Name="RIVER.PNT" Source="@MARBLE_DATA_DIR@\mwdbii\RIVER.PNT" />
+ </Component>
+ </DirectoryRef>
+ <DirectoryRef Id="MarblePlacemarkDataDir">
+ <Component Id="MarblePlacemarkData" Guid="$(var.MarblePlacemarkDataGuid)">
+ <File Id="BasePlacemarksCache" DiskId="1"
+ Name="baseplacemarks.cache" Source="@MARBLE_DATA_DIR@\placemarks\baseplacemarks.cache" />
+ <File Id="BoundaryPlacemarksCache" DiskId="1"
+ Name="boundaryplacemarks.cache" Source="@MARBLE_DATA_DIR@\placemarks\boundaryplacemarks.cache" />
+ <File Id="ElevPlacemarksCache" DiskId="1"
+ Name="elevplacemarks.cache" Source="@MARBLE_DATA_DIR@\placemarks\elevplacemarks.cache" />
+ </Component>
+ </DirectoryRef>
+ <DirectoryRef Id="MarbleStarsDataDir">
+ <Component Id="MarbleStarsData" Guid="$(var.MarbleStarsDataGuid)">
+ <File Id="StarsDat" DiskId="1"
+ Name="stars.dat" Source="@MARBLE_DATA_DIR@\stars\stars.dat" />
+ </Component>
+ </DirectoryRef>
+ <DirectoryRef Id="MarbleSvgDataDir">
+ <Component Id="MarbleSvgData" Guid="$(var.MarbleSvgDataGuid)">
+ <File Id="WorldMapSvg" DiskId="1"
+ Name="worldmap.svg" Source="@MARBLE_DATA_DIR@\svg\worldmap.svg" />
+ </Component>
+ </DirectoryRef>
+ <ComponentGroup Id="MarbleData">
+ <ComponentRef Id="MarbleLegendsData" />
+ <ComponentRef Id="MarbleBlueMarbleData" />
+ <ComponentRef Id="MarbleCityLightsData" />
+ <ComponentRef Id="MarbleSrtmData" />
+ <ComponentRef Id="MarbleMwdbiiData" />
+ <ComponentRef Id="MarblePlacemarkData" />
+ <ComponentRef Id="MarbleStarsData" />
+ <ComponentRef Id="MarbleSvgData" />
+ </ComponentGroup>
+ <?endif?>
+
+ <!-- Application shortcuts and menu items -->
+ <DirectoryRef Id="TARGETDIR">
+ <Directory Id="ProgramMenuFolder" Name="Programs">
+ <Directory Id="ShortcutFolder" Name="Vidalia">
+ <Component Id="AddVidaliaToStartMenu" Guid="0F2CEE2C-8730-432e-8A8F-E49AF78AF28C">
+ <RegistryKey Root="HKCU" Key="Software\Vidalia" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="StartMenuShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="VidaliaStartMenuShortcut"
+ Name="Vidalia" Target="[INSTALLDIR]vidalia.exe"
+ Directory="ShortcutFolder" WorkingDirectory="INSTALLDIR"
+ Icon="vidalia.ico" IconIndex="0" />
+ <RemoveFolder Id="RemoveShortcutFolder" On="uninstall" />
+ </Component>
+ </Directory>
+ </Directory>
+
+ <Directory Id="DesktopFolder" Name="Desktop">
+ <Component Id="AddVidaliaToDesktop" Guid="A7688EE5-4EDE-4429-A2D9-C8B9BD85AB5A">
+ <RegistryKey Root="HKCU" Key="Software\Vidalia" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="DesktopShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="VidaliaDesktopShortcut"
+ Name="Vidalia" Target="[INSTALLDIR]vidalia.exe"
+ Directory="DesktopFolder" WorkingDirectory="INSTALLDIR"
+ Icon="vidalia.ico" IconIndex="0" />
+ </Component>
+ </Directory>
+
+ <Component Id="AddToStartupItems" Guid="E7BC3F3C-86BA-4a08-966C-F3F8D8CB3AF4">
+ <RegistryKey Root="HKCU"
+ Key="Software\Microsoft\Windows\CurrentVersion\Run"
+ Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="Vidalia" Value='"[INSTALLDIR]vidalia.exe"' Type="string" />
+ </RegistryKey>
+ </Component>
+ </DirectoryRef>
+
+ <!-- Build up the feature hierarchy -->
+ <Feature Id="Complete" Title="Vidalia"
+ Level="1" Display="expand" ConfigurableDirectory="INSTALLDIR"
+ Description="Vidalia is application that helps you control, monitor, and configure the Tor software.">
+ <Feature Id="MainApplication" Title="Vidalia @VERSION@"
+ AllowAdvertise="no" Absent="disallow" Level="1"
+ Description="Main application">
+ <ComponentRef Id="VidaliaExecutable" />
+ <ComponentRef Id="VidaliaDocuments" />
+ <ComponentRef Id="QtLibrary" />
+ <ComponentRef Id="OpenSSLLibrary" />
+ <?if $(var.UseMarble) = "ON"?>
+ <ComponentRef Id="QtImageFormatPlugins" />
+ <ComponentRef Id="MarbleWidgetLibrary" />
+ <ComponentRef Id="MarblePlugins" />
+ <ComponentGroupRef Id="MarbleData"/>
+ <?endif?>
+ <?if $(var.UseBreakpad) = "ON"?>
+ <MergeRef Id="CRT"/>
+ <ComponentRef Id="CrashReporterExecutable"/>
+ <?else?>
+ <ComponentRef Id="MinGWLibrary" />
+ <?endif?>
+ </Feature>
+ <Feature Id="Shortcuts" Title="Shortcuts"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add a shortcut to Vidalia to your Start menu or Desktop.">
+ <Feature Id="StartMenuShortcuts" Title="Add to Start menu"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add Vidalia to your Start menu">
+ <ComponentRef Id="AddVidaliaToStartMenu" />
+ </Feature>
+ <Feature Id="DesktopShortcuts" Title="Add to Desktop"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add Vidalia to your Desktop">
+ <ComponentRef Id="AddVidaliaToDesktop" />
+ </Feature>
+ <Feature Id="RunAtStartup" Title="Run at Startup"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Run Vidalia automatically when your system starts">
+ <ComponentRef Id="AddToStartupItems" />
+ </Feature>
+ </Feature>
+ </Feature>
+
+ <!-- Upgrade installation sequence -->
+ <InstallExecuteSequence>
+ <RemoveExistingProducts After="InstallValidate" />
+ </InstallExecuteSequence>
+
+ <!-- Set the UI options -->
+ <UIRef Id="WixUI_Custom" />
+ <Icon Id="vidalia.ico" SourceFile="@Vidalia_SOURCE_DIR@\src\vidalia\res\icons\vidalia.ico" />
+ </Product>
+</Wix>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/zh_CN/vidalia_zh_CN.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/zh_CN/vidalia_zh_CN.po
new file mode 100644
index 0000000..9e4d768
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/zh_CN/vidalia_zh_CN.po
@@ -0,0 +1,274 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2009-11-28 12:14-0700\n"
+"Last-Translator: yfdyh000 <yfdyh000 at Gmail.com>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} 安装向导"
+
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"该向导将会引导您完成 Tor、Vidalia、Polipo 和 Torbutton 的安装。\n"
+"\n"
+"Tor 是可以匿名访问 Internt 的系统，能够帮助您隐匿网页的浏览与发布、即时聊天、IRC 及其他活动。Vidalia "
+"是一个用户图形界面，能帮助您控制、监视和配置Tor。\n"
+"\n"
+"Polipo 是一种缓冲型网页代理可以帮助增强 Tor 的网页浏览性能。\n"
+"\n"
+"Torbutton 是一个 Firefox 浏览器扩展，可以快速启用或禁用匿名网页浏览。\n"
+"\n"
+"如果您曾经安装过 Tor、Vidalia、Polipo 或 Firefox，请确保在运行此安装向导前这些程序未在运行。\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "欢迎使用 ${BUNDLE_NAME} 安装向导"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "${TOR_NAME} 安装文档"
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"安装完成。\n"
+"请访问 https://www.torproject.org/docs/tor-doc-windows 了解如何配置应用程序使用 Tor。\n"
+"\n"
+"如果您选择了安装 Torbutton，您需要重新启动火狐 (Firefox) 浏览器。"
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "现在运行已安装组件"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia 是能帮助您控制、监视及配置 Tor 的图形化界面。"
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "移除 ${VIDALIA_DESC}。"
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} 安装向导"
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"该向导将会引导您安装 Vidalia - 一种能帮助您控制、监视及配置 Tor 的图形化界面。\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "欢迎使用 ${VIDALIA_NAME} 安装向导"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "${VIDALIA_NAME} 主页快捷方式"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia 是能帮助您控制、监视及配置 Tor 的图形化界面。"
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "在系统启动时运行"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "自动在系统启动时运行 ${VIDALIA_NAME}。"
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "添加至开始菜单程序组"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "添加 ${VIDALIA_NAME} 至开始菜单程序组。"
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "现在运行 ${VIDALIA_NAME}"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr "Tor 是一种可以匿名访问 Internt 的系统，它可以帮助您隐匿网页的浏览与发布、即时聊天、IRC 及其他更多活动。"
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "移除 ${TOR_DESC}。"
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "安装 ${TOR_DESC}。"
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"安装程序检测到已存在的 Tor 配置文件。$\n"
+"$\n"
+"是否要使用默认的配置文件覆盖它？"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "文档"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "安装 ${TOR_NAME} 文档。"
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "添加至开始菜单程序组"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "添加 ${TOR_NAME} 至开始菜单程序组。"
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr "Polipo 是缓冲型网页代理能够增强使用 Tor 时的网页浏览性能。"
+
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "移除 ${POLIPO_DESC}。"
+
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "安装 ${POLIPO_DESC}。"
+
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "添加至开始菜单"
+
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "添加 ${POLIPO_NAME} 至开始菜单。"
+
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "在系统启动时运行"
+
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "自动在系统启动时运行 ${POLIPO_NAME}。"
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr "Torbutton 是一个 Firefox 浏览器扩展，可以快速开启或关闭匿名网页浏览。"
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "移除 ${TORBUTTON_DESC}。"
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "安装 ${TORBUTTON_DESC}。"
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "添加至火狐 (Firefox) 浏览器"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "添加 ${TORBUTTON_DESC} 扩展至火狐 (Firefox) 浏览器。"
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "安装程序未检测到火狐 (Firefox) 浏览器,因此将停止添加 Torbutton 扩展。"
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Application Data"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "删除保存的程序数据和配置文件。"
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "zh-cn"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr "尚未安装 Firefox 浏览器"
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr "我们建议您在继续安装前安装 Firefox 浏览器，以获得最佳的安全性。"
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+"您的计算机尚未安装 Mozilla Firefox 网页浏览器。\n"
+"Tor 将与配合其他浏览器工作，例如 Internet Explorer，但 Firefox 更易于使用，并能更好的保护您的匿名性。\n"
+"\n"
+"如果您想安装 Firefox，请点击 取消 并访问 Firefox 的下载页面 "
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+"当您完成 Firefox 的安装后，再运行 Tor 安装程序。\n"
+"\n"
+"如果您希望仅安装 Tor 而不使用 Firefox，请点击 下一步 继续安装。"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/zh_HK/vidalia_zh_HK.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/zh_HK/vidalia_zh_HK.po
new file mode 100755
index 0000000..bc333d8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/zh_HK/vidalia_zh_HK.po
@@ -0,0 +1,207 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+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"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr ""
+
+msgctxt "BundleWelcomeText"
+msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disa [...]
+msgstr ""
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr ""
+
+msgctxt "BundleFinishText"
+msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr ""
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr ""
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr ""
+
+msgctxt "VidaliaWelcomeText"
+msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgstr ""
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr ""
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr ""
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr ""
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr ""
+
+msgctxt "TorGroupDesc"
+msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr ""
+
+msgctxt "TorAskOverwriteTorrc"
+msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgstr ""
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr ""
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr ""
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyGroupDesc"
+msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgstr ""
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr ""
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr ""
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr ""
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr ""
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr ""
+
+msgctxt "TorbuttonGroupDesc"
+msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgstr ""
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr ""
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr ""
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid "We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity."
+"\n\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid "When you are done installing Firefox, you can once again run the\n"
+"Tor installer."
+"\n\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/zh_TW/vidalia_zh_TW.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/zh_TW/vidalia_zh_TW.po
new file mode 100644
index 0000000..8b7d920
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/pkg/win32/zh_TW/vidalia_zh_TW.po
@@ -0,0 +1,274 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2008-07-17 03:22+0000\n"
+"Last-Translator: Matt <edmanm at vidalia-project.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"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} 安裝精靈"
+
+#, fuzzy
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, "
+"and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a "
+"GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing "
+"the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"安裝精靈將會引導您安裝 Tor,Vidalia,Privoxy 和 Torbutton.\n"
+"\n"
+"如果您曾經安裝過 Tor,Vidalia,Privoxy 或 Firefox,請確保在執行此安裝精靈前這些"
+"程式未在執行中.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "歡迎使用 ${BUNDLE_NAME} 安裝精靈"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "${TOR_NAME} 安裝文檔"
+
+msgctxt "BundleFinishText"
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
+"configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
+msgstr ""
+"安裝完成.\n"
+"請訪問 https://www.torproject.org/docs/tor-doc-windows 來獲取關於 Tor 的配置"
+"訊息.\n"
+"\n"
+"如果選擇了安裝 Torbutton,您需要重新啟動火狐(Firefox)瀏覽器."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "現在執行已安裝組件"
+
+#, fuzzy
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "安裝 ${VIDALIA_DESC}."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Remove ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} 安裝嚮導"
+
+msgctxt "VidaliaWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"安裝精靈將會引導您安裝 ${VIDALIA_DESC}.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "歡迎使用 ${VIDALIA_NAME} 安裝精靈"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "${VIDALIA_NAME} 主頁捷徑"
+
+#, fuzzy
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "安裝 ${VIDALIA_DESC}."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "在系統啟動時執行"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "自動在系統啟動時執行 ${VIDALIA_NAME}."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "添加至開始菜單程式集"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "添加 ${VIDALIA_NAME} 至開始菜單程式集."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "現在執行 ${VIDALIA_NAME}"
+
+#, fuzzy
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr "安裝 ${TOR_DESC}."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Remove ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "安裝 ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"安裝程式檢測到已存在的 Tor 配置檔案.$\n"
+"$\n"
+"是否要使用默認的配置檔案覆蓋它?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "文檔"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "安裝 ${TOR_NAME} 文檔."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "添加至開始菜單程式集"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "添加 ${TOR_NAME} 至開始菜單程式集."
+
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
+msgstr ""
+
+#, fuzzy
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
+msgstr "Remove ${POLIPO_DESC}."
+
+#, fuzzy
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
+msgstr "安裝 ${POLIPO_DESC}."
+
+#, fuzzy
+msgctxt "PolipoShortcuts"
+msgid "Add to Start Menu"
+msgstr "添加至開始菜單程式集"
+
+#, fuzzy
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
+msgstr "添加 ${POLIPO_NAME} 至開始菜單程式集."
+
+#, fuzzy
+msgctxt "PolipoStartup"
+msgid "Run At Startup"
+msgstr "在系統啟動時執行"
+
+#, fuzzy
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
+msgstr "自動在系統啟動時執行 ${POLIPO_NAME}."
+
+#, fuzzy
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr "安裝 ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "安裝 ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "添加至火狐(Firefox)瀏覽器"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "添加 ${TORBUTTON_DESC} 擴展至火狐(Firefox)瀏覽器."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "安裝程序未檢測到火狐(Firefox)瀏覽器,因此將停止添加 Torbutton 擴展."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Application Data"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "zh_TW"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/CMakeLists.txt
new file mode 100644
index 0000000..72939c1
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/CMakeLists.txt
@@ -0,0 +1,68 @@
+##
+## $Id: CMakeLists.txt 3879 2009-06-23 22:53:29Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+
+include_directories(
+ ${QT_INCLUDES}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/torcontrol
+ ${CMAKE_CURRENT_SOURCE_DIR}/common
+)
+link_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}/torcontrol
+ ${CMAKE_CURRENT_BINARY_DIR}/common
+)
+
+if(MSVC)
+ add_definitions(-D_USE_MATH_DEFINES=1)
+
+ ## Qt's Visual Studio builds explicitly disable treating wchar_t as a
+ ## built-in type, so we need to do that as well otherwise we get linker
+ ## errors due to name mangling if we try to use a wchar_t-related method
+ add_definitions(/Zc:wchar_t-)
+
+ ## Specify that we want the "W" version of Windows methods, such as
+ ## CreateFileW or WriteFileW
+ add_definitions(-DUNICODE=1)
+
+ ## Disable incremental linking for all build types, not just Release
+ ## and MinSizeRel
+ set(CMAKE_EXE_LINKER_FLAGS_DEBUG
+ "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /INCREMENTAL:NO"
+ )
+ set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
+ "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /INCREMENTAL:NO"
+ )
+endif(MSVC)
+
+## Add some Qt definitions
+if (WIN32)
+ add_definitions(-DQT_THREAD_SUPPORT)
+ if (NOT QT_CONFIG MATCHES "static")
+ add_definitions(-DQT_DLL)
+ endif(NOT QT_CONFIG MATCHES "static")
+endif(WIN32)
+
+if (USE_MINIUPNPC)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/miniupnpc)
+ link_directories(${CMAKE_CURRENT_BINARY_DIR}/miniupnpc)
+ add_subdirectory(miniupnpc)
+endif(USE_MINIUPNPC)
+if (USE_BREAKPAD)
+ add_subdirectory(crashreporter)
+endif(USE_BREAKPAD)
+
+add_subdirectory(common)
+add_subdirectory(tools)
+add_subdirectory(torcontrol)
+add_subdirectory(vidalia)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/CMakeLists.txt
new file mode 100644
index 0000000..a125763
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/CMakeLists.txt
@@ -0,0 +1,53 @@
+##
+## $Id: CMakeLists.txt 4276 2010-04-29 04:54:29Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+
+set(common_SRCS
+ CountryInfo.cpp
+ crypto.cpp
+ file.cpp
+ html.cpp
+ Log.cpp
+ net.cpp
+ procutil.cpp
+ stringutil.cpp
+ TorSocket.cpp
+ TorSslSocket.cpp
+ ZlibByteArray.cpp
+)
+qt4_wrap_cpp(common_SRCS
+ CountryInfo.h
+ TorSocket.h
+ TorSslSocket.h
+)
+
+if(WIN32)
+ set(common_SRCS ${common_SRCS}
+ win32.cpp
+ )
+endif(WIN32)
+
+
+add_library(common STATIC ${common_SRCS})
+target_link_libraries(common
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTNETWORK_LIBRARY}
+)
+
+if(OPENSSL_LIBRARIES)
+ target_link_libraries(common ${OPENSSL_LIBRARIES})
+endif(OPENSSL_LIBRARIES)
+if (APPLE)
+ include(FindZLIB)
+ target_link_libraries(common ${ZLIB_LIBRARIES})
+endif(APPLE)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/CountryInfo.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/CountryInfo.cpp
new file mode 100644
index 0000000..51711f3
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/CountryInfo.cpp
@@ -0,0 +1,238 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 CountryInfo.cpp
+** \version $Id: CountryInfo.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Provides a method to look up a localized country name given its
+** ISO 3166 2-letter country code.
+*/
+
+#include "CountryInfo.h"
+
+#include <QMap>
+
+
+CountryInfo::CountryInfo(QObject *parent)
+ : QObject(parent)
+{
+}
+
+QString
+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("ad", QT_TR_NOOP("Andorra"));
+ db.insert("ao", QT_TR_NOOP("Angola"));
+ db.insert("ag", QT_TR_NOOP("Antigua & Barbuda"));
+ db.insert("ar", QT_TR_NOOP("Argentina"));
+ db.insert("am", QT_TR_NOOP("Armenia"));
+ db.insert("au", QT_TR_NOOP("Australia"));
+ db.insert("at", QT_TR_NOOP("Austria "));
+ 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("bb", QT_TR_NOOP("Barbados"));
+ db.insert("by", QT_TR_NOOP("Belarus"));
+ 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("bi", QT_TR_NOOP("Burundi"));
+ db.insert("kh", QT_TR_NOOP("Cambodia"));
+ db.insert("cm", QT_TR_NOOP("Cameroon"));
+ db.insert("ca", QT_TR_NOOP("Canada"));
+ db.insert("cv", QT_TR_NOOP("Cape Verde"));
+ db.insert("cf", QT_TR_NOOP("Central African Republic"));
+ db.insert("td", QT_TR_NOOP("Chad"));
+ db.insert("cl", QT_TR_NOOP("Chile"));
+ 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("cy", QT_TR_NOOP("Cyprus"));
+ db.insert("cz", QT_TR_NOOP("Czech Republic"));
+ db.insert("dk", QT_TR_NOOP("Denmark"));
+ db.insert("dj", QT_TR_NOOP("Djibouti"));
+ db.insert("dm", QT_TR_NOOP("Dominica"));
+ db.insert("do", QT_TR_NOOP("Dominican Republic"));
+ db.insert("ec", QT_TR_NOOP("Ecuador"));
+ 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("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("fr", QT_TR_NOOP("France"));
+ db.insert("ga", QT_TR_NOOP("Gabon"));
+ db.insert("gm", QT_TR_NOOP("Gambia"));
+ db.insert("ge", QT_TR_NOOP("Georgia"));
+ db.insert("de", QT_TR_NOOP("Germany"));
+ 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("gn", QT_TR_NOOP("Guinea"));
+ 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("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("il", QT_TR_NOOP("Israel"));
+ db.insert("it", QT_TR_NOOP("Italy"));
+ 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("ke", QT_TR_NOOP("Kenya"));
+ 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("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("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("li", QT_TR_NOOP("Liechtenstein"));
+ db.insert("lt", QT_TR_NOOP("Lithuania"));
+ db.insert("lu", QT_TR_NOOP("Luxembourg"));
+ db.insert("mk", QT_TR_NOOP("Macedonia"));
+ 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("mr", QT_TR_NOOP("Mauritania"));
+ 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("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("ne", QT_TR_NOOP("Niger"));
+ db.insert("ng", QT_TR_NOOP("Nigeria"));
+ db.insert("no", QT_TR_NOOP("Norway"));
+ 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("ph", QT_TR_NOOP("Philippines"));
+ db.insert("pl", QT_TR_NOOP("Poland"));
+ db.insert("pt", QT_TR_NOOP("Portugal"));
+ db.insert("qa", QT_TR_NOOP("Qatar"));
+ db.insert("ro", QT_TR_NOOP("Romania"));
+ db.insert("ru", QT_TR_NOOP("Russia"));
+ 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("sc", QT_TR_NOOP("Seychelles"));
+ db.insert("sl", QT_TR_NOOP("Sierra Leone"));
+ db.insert("sg", QT_TR_NOOP("Singapore"));
+ db.insert("sk", QT_TR_NOOP("Slovakia"));
+ db.insert("si", QT_TR_NOOP("Slovenia"));
+ db.insert("sb", QT_TR_NOOP("Solomon Islands"));
+ 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("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("tg", QT_TR_NOOP("Togo"));
+ db.insert("to", QT_TR_NOOP("Tonga"));
+ db.insert("tt", QT_TR_NOOP("Trinidad & Tobago"));
+ db.insert("tn", QT_TR_NOOP("Tunisia"));
+ db.insert("tr", QT_TR_NOOP("Turkey"));
+ db.insert("tm", QT_TR_NOOP("Turkmenistan"));
+ db.insert("tv", QT_TR_NOOP("Tuvalu"));
+ db.insert("ug", QT_TR_NOOP("Uganda"));
+ 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("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("ve", QT_TR_NOOP("Venezuela"));
+ db.insert("vn", QT_TR_NOOP("Vietnam"));
+ db.insert("eh", QT_TR_NOOP("Western Sahara"));
+ db.insert("ye", QT_TR_NOOP("Yemen"));
+ db.insert("zm", QT_TR_NOOP("Zambia"));
+ db.insert("zw", QT_TR_NOOP("Zimbabwe"));
+ }
+
+ QString cc = countryCode.toLower();
+ if (db.contains(cc))
+ return tr(db.value(cc).toLocal8Bit().data());
+ return QString();
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/CountryInfo.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/CountryInfo.h
new file mode 100644
index 0000000..9c9b0aa
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/CountryInfo.h
@@ -0,0 +1,43 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 CountryInfo.h
+** \version $Id: CountryInfo.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Provides a method to look up a localized country name given its
+** ISO 3166-1 2-letter country code.
+*/
+
+#ifndef _COUNTRYINFO_H
+#define _COUNTRYINFO_H
+
+#include <QObject>
+#include <QString>
+
+
+class CountryInfo : public QObject
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor.
+ */
+ CountryInfo(QObject *parent);
+
+ /** Returns the name of the country represented by <b>countryCode</b>, where
+ * <b>countryCode</b> is a 2-letter ISO 3166-1 alpha-2 two-letter country
+ * code. The name will be returned translated to the current locale if an
+ * appropriate QTranslator is currently installed.
+ */
+ static QString countryName(const QString &countryCode);
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/Log.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/Log.cpp
new file mode 100644
index 0000000..9e81f67
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/Log.cpp
@@ -0,0 +1,175 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 Log.cpp
+** \version $Id: Log.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Debug message logging
+*/
+
+#include "Log.h"
+
+#include <QDateTime>
+#include <QTextStream>
+
+/** Open log files for appending as write-only text. */
+#define LOGFILE_MODE \
+ (QIODevice::WriteOnly|QIODevice::Append|QIODevice::Text)
+/** Format for log message timestamps. */
+#define TIMESTAMP_FMT "MMM dd HH:mm:ss.zzz"
+
+
+/** Default constructor. Logs at level Notice by default. */
+Log::Log()
+{
+ _logLevel = Notice;
+}
+
+/** Destructor. Closes the log file. */
+Log::~Log()
+{
+ close();
+}
+
+/** Returns a list of strings representing available log levels. */
+QStringList
+Log::logLevels()
+{
+ return (QStringList() << "debug" << "info" << "notice"
+ << "warn" << "error");
+}
+
+/** Sets the current log level to <b>level</b>. If <b>level</b> is Off, then
+ * the log file will be closed as well. If <b>level</b> is Unknown, no change
+ * to the current log level is made. */
+void
+Log::setLogLevel(LogLevel level)
+{
+ if (level >= Debug && level < Unknown)
+ _logLevel = level;
+ if (level == Off)
+ _logFile.close();
+}
+
+/** Opens <b>file</b> for appending, to which log messages will be written. */
+bool
+Log::open(FILE *file)
+{
+ if (_logFile.isOpen())
+ close();
+
+ _logFile.open(file, LOGFILE_MODE);
+ return isOpen();
+}
+
+/** Opens <b>file</b> for appending, to which log messages will be written. */
+bool
+Log::open(QString file)
+{
+ if (_logFile.isOpen())
+ close();
+
+ _logFile.setFileName(file);
+ _logFile.open(LOGFILE_MODE);
+ return isOpen();
+}
+
+/** Flushes any outstanding log messages and closes the log file. */
+void
+Log::close()
+{
+ if (_logFile.isOpen()) {
+ _logFile.flush();
+ _logFile.close();
+ }
+}
+
+/** Creates a log message with severity <b>level</b> and initial message
+ * contents <b>message</b>. The log message can be appended to until the
+ * returned LogMessage's destructor is called, at which point the complete
+ * message is written to the log file. */
+inline Log::LogMessage
+Log::log(LogLevel level)
+{
+ if (level < _logLevel)
+ return LogMessage(level, 0);
+ return LogMessage(level, &_logFile);
+}
+
+/** Creates a log message with severity <b>level</b>. The log message can be
+ * appended to until the returned LogMessage's destructor is called, at
+ * which point the complete message is written to the log file. */
+Log::LogMessage
+Log::log(LogLevel level, QString msg)
+{
+ return log(level) << msg;
+}
+
+/** Returns a string description of the given LogLevel <b>level</b>. */
+inline QString
+Log::logLevelToString(LogLevel level)
+{
+ switch (level) {
+ case Debug: return "debug";
+ case Info: return "info";
+ case Notice: return "notice";
+ case Warn: return "warn";
+ case Error: return "error";
+ case Off: return "off";
+ default: return "unknown";
+ }
+}
+
+/** Returns a LogLevel for the level given by <b>str</b>, or Unknown if the
+ * given string does not represent a valid LogLevel value. */
+Log::LogLevel
+Log::stringToLogLevel(QString str)
+{
+ str = str.toLower();
+ if (str == "debug")
+ return Debug;
+ else if (str == "info")
+ return Info;
+ else if (str == "notice")
+ return Notice;
+ else if (str == "warn")
+ return Warn;
+ else if (str == "error")
+ return Error;
+ else if (str == "off")
+ return Off;
+ return Unknown;
+}
+
+/** Returns a formatted log message, prefixed with a timestamp and the log
+ * message severity level. */
+inline QString
+Log::LogMessage::toString() const
+{
+ QString msg = QDateTime::currentDateTime().toString(TIMESTAMP_FMT);
+ msg.append(" [" + Log::logLevelToString(stream->type) + "] ");
+ msg.append(stream->buf);
+ return msg;
+}
+
+/** Destructor. Writes the buffered log message out to the log file specified
+ * in the constructor. */
+Log::LogMessage::~LogMessage()
+{
+ if (!--stream->ref) {
+ if (stream->out && !stream->buf.isEmpty()) {
+ QTextStream log(stream->out);
+ log << toString() << endl;
+ log.flush();
+ }
+ delete stream;
+ }
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/Log.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/Log.h
new file mode 100644
index 0000000..44cd829
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/Log.h
@@ -0,0 +1,157 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 Log.h
+** \version $Id: Log.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Debug message logging
+*/
+
+#ifndef _LOG_H
+#define _LOG_H
+
+#include <QObject>
+#include <QFile>
+#include <QStringList>
+#include <QIODevice>
+#include <QHostAddress>
+
+
+/** The Log class is similar to the QDebug class provided with Qt, but with
+ * finer-grained logging levels, slightly different output (for example, not
+ * everything is wrapped in double quotes), supports using .arg(), and can
+ * still be used even if Qt was compiled with QT_NO_DEBUG_STREAM. */
+class Log
+{
+public:
+ /** Logging severity levels. */
+ enum LogLevel {
+ Debug = 0, /**< Verbose debugging output. */
+ Info, /**< Primarily program flow output. */
+ Notice, /**< Non-failure (but important) events. */
+ Warn, /**< Recoverable failure conditions. */
+ Error, /**< Critical, non-recoverable errors. */
+ Off, /**< No logging output. */
+ Unknown /**< Unknown/invalid log level. */
+ };
+ class LogMessage;
+
+ /** Default constructor. */
+ Log();
+ /** Destructor. */
+ ~Log();
+
+ /** Opens a file on disk (or stdout or stderr) to which log messages will be
+ * written. */
+ bool open(FILE *file);
+ /** Opens a file on disk to which log messages will be written. */
+ bool open(QString file);
+ /** Closes the log file. */
+ void close();
+ /** Returns true if the log file is open and ready for writing. */
+ bool isOpen() { return _logFile.isOpen() && _logFile.isWritable(); }
+ /** Returns a string description of the last file error encountered. */
+ QString errorString() { return _logFile.errorString(); }
+
+ /** Sets the current log level to <b>level</b>. */
+ void setLogLevel(LogLevel level);
+ /** Returns a list of strings representing valid log levels. */
+ static QStringList logLevels();
+ /** Returns a string description of the given LogLevel <b>level</b>. */
+ static inline QString logLevelToString(LogLevel level);
+ /** Returns a LogLevel for the level given by <b>str</b>. */
+ static LogLevel stringToLogLevel(QString str);
+
+ /** Creates a log message with severity <b>level</b> and initial message
+ * contents <b>message</b>. The log message can be appended to until the
+ * returned LogMessage's destructor is called, at which point the complete
+ * message is written to the log file. */
+ LogMessage log(LogLevel level, QString message);
+ /** Creates a log message with severity <b>level</b>. The log message can be
+ * appended to until the returned LogMessage's destructor is called, at
+ * which point the complete message is written to the log file. */
+ inline LogMessage log(LogLevel level);
+
+private:
+ LogLevel _logLevel; /**< Minimum log severity level. */
+ QFile _logFile; /**< Log output destination. */
+};
+
+/** This internal class represents a single message that is to be written to
+ * the log destination. The message is buffered until it is written to the
+ * log in this class's destructor. */
+class Log::LogMessage
+{
+public:
+ struct Stream {
+ Stream(Log::LogLevel t, QIODevice *o)
+ : type(t), out(o), ref(1) {}
+ Log::LogLevel type;
+ QIODevice *out;
+ int ref;
+ QString buf;
+ } *stream;
+
+ inline LogMessage(Log::LogLevel t, QIODevice *o)
+ : stream(new Stream(t,o)) {}
+ inline LogMessage(const LogMessage &o)
+ : stream(o.stream) { ++stream->ref; }
+ inline QString toString() const;
+ ~LogMessage();
+
+ /* Support both the << and .arg() methods */
+ inline LogMessage &operator<<(const QString &t)
+ { stream->buf += t; return *this; }
+ inline LogMessage arg(const QString &a)
+ { stream->buf = stream->buf.arg(a); return *this; }
+ inline LogMessage &operator<<(const QStringList &a)
+ { stream->buf += a.join(","); return *this; }
+ inline LogMessage arg(const QStringList &a)
+ { stream->buf = stream->buf.arg(a.join(",")); return *this; }
+ inline LogMessage &operator<<(const QHostAddress &a)
+ { stream->buf += a.toString(); return *this; }
+ inline LogMessage arg(const QHostAddress &a)
+ { stream->buf = stream->buf.arg(a.toString()); return *this; }
+ inline LogMessage &operator<<(short a)
+ { stream->buf += QString::number(a); return *this; }
+ inline LogMessage arg(short a)
+ { stream->buf = stream->buf.arg(a); return *this; }
+ inline LogMessage &operator<<(ushort a)
+ { stream->buf += QString::number(a); return *this; }
+ inline LogMessage arg(ushort a)
+ { stream->buf = stream->buf.arg(a); return *this; }
+ inline LogMessage &operator<<(int a)
+ { stream->buf += QString::number(a); return *this; }
+ inline LogMessage arg(int a)
+ { stream->buf = stream->buf.arg(a); return *this; }
+ inline LogMessage &operator<<(uint a)
+ { stream->buf += QString::number(a); return *this; }
+ inline LogMessage arg(uint a)
+ { stream->buf = stream->buf.arg(a); return *this; }
+ inline LogMessage &operator<<(long a)
+ { stream->buf += QString::number(a); return *this; }
+ inline LogMessage arg(long a)
+ { stream->buf = stream->buf.arg(a); return *this; }
+ inline LogMessage &operator<<(ulong a)
+ { stream->buf += QString::number(a); return *this; }
+ inline LogMessage arg(ulong a)
+ { stream->buf = stream->buf.arg(a); return *this; }
+ inline LogMessage &operator<<(qlonglong a)
+ { stream->buf += QString::number(a); return *this; }
+ inline LogMessage arg(qlonglong a)
+ { stream->buf = stream->buf.arg(a); return *this; }
+ inline LogMessage &operator<<(qulonglong a)
+ { stream->buf += QString::number(a); return *this; }
+ inline LogMessage arg(qulonglong a)
+ { stream->buf = stream->buf.arg(a); return *this; }
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/TorSocket.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/TorSocket.cpp
new file mode 100644
index 0000000..b2425e5
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/TorSocket.cpp
@@ -0,0 +1,125 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 TorSocket.cpp
+** \version $Id: TorSocket.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief A QTcpSocket that makes requests over Tor
+*/
+
+#include "TorSocket.h"
+
+#include <QDataStream>
+
+#define SOCKS_VERSION 0x04 /**< SOCKS version. */
+#define SOCKS_CONNECT 0x01 /**< SOCKS connect command ID. */
+#define SOCKS_FAKE_IP 0x00000001 /**< Bogus IP. */
+#define SOCKS_RESPONSE_LEN 0x08 /**< SOCKS server response length. */
+#define SOCKS_RESPONSE_VERSION 0x00 /**< SOCKS server response version. */
+#define SOCKS_CONNECT_STATUS_OK 0x5A /**< SOCKS server response status. */
+
+
+/** Constructor. */
+TorSocket::TorSocket(const QHostAddress &socksAddr,
+ quint16 socksPort, QObject *parent)
+: QTcpSocket(parent),
+ _socksAddr(socksAddr),
+ _socksPort(socksPort)
+{
+ QObject::connect(this, SIGNAL(error(QAbstractSocket::SocketError)),
+ this, SLOT(onError(QAbstractSocket::SocketError)));
+ QObject::connect(this, SIGNAL(readyRead()),
+ this, SLOT(onHandshakeResponse()));
+ QObject::connect(this, SIGNAL(connected()),
+ this, SLOT(connectedToProxy()));
+}
+
+/** Connects to the specified hostname and port via Tor. */
+void
+TorSocket::connectToRemoteHost(const QString &remoteHost, quint16 remotePort)
+{
+ _remoteHost = remoteHost;
+ _remotePort = remotePort;
+ QTcpSocket::connectToHost(_socksAddr, _socksPort);
+}
+
+/** Called when a connection error has occurred. */
+void
+TorSocket::onError(QAbstractSocket::SocketError error)
+{
+ Q_UNUSED(error);
+ emit socketError(errorString());
+}
+
+/** Called when the socket is connected to the proxy and sends our
+ * half of a Socks4a handshake. */
+void
+TorSocket::connectedToProxy()
+{
+ sendSocksHandshake(_remoteHost, _remotePort);
+}
+
+/** Sends the first part of a Socks4a handshake, using the remote hostname and
+ * port specified in the previous call to connectToHost(). The message should
+ * be formatted as follows:
+ *
+ * 0x04 (socks version)
+ * 0x01 (connect)
+ * PORT (two bytes, most significant byte first)
+ * 0x00 0x00 0x00 0x01 (fake IP address: tells proxy to use SOCKS4a)
+ * 0x00 (empty username field)
+ * HOSTNAME (target hostname)
+ * 0x00 (marks the end of the hostname field)
+ */
+void
+TorSocket::sendSocksHandshake(const QString &remoteHost, quint16 remotePort)
+{
+ QDataStream sock(this);
+ sock << (quint8)SOCKS_VERSION;
+ sock << (quint8)SOCKS_CONNECT;
+ sock << (quint16)remotePort;
+ sock << (quint32)SOCKS_FAKE_IP;
+ sock << (quint8)0;
+ sock.writeRawData(qPrintable(remoteHost), remoteHost.length());
+ sock << (quint8)0;
+}
+
+/** Handles the second half of the handshake, received from the SOCKS
+ * proxy server. The response should be formatted as follows:
+ *
+ * 0x00 (response version)
+ * STATUS (0x5A means success; other values mean failure)
+ * PORT (not set)
+ * ADDRESS (not set)
+ */
+void
+TorSocket::onHandshakeResponse()
+{
+ QByteArray response;
+ if (bytesAvailable() >= SOCKS_RESPONSE_LEN) {
+ /* We've received our response, so stop waiting for it. */
+ QObject::disconnect(this, SIGNAL(readyRead()),
+ this, SLOT(onHandshakeResponse()));
+
+ /* Read the 8-byte response off the socket. */
+ response = read(SOCKS_RESPONSE_LEN);
+
+ /* Check to make sure we got a good response from the proxy. */
+ if ((uchar)response[0] == (uchar)SOCKS_RESPONSE_VERSION &&
+ (uchar)response[1] == (uchar)SOCKS_CONNECT_STATUS_OK) {
+ /* Connection status was okay. */
+ emit connectedToRemoteHost();
+ } else {
+ /* Remote connection failed, so close the connection to the proxy. */
+ disconnectFromHost();
+ }
+ }
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/TorSocket.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/TorSocket.h
new file mode 100644
index 0000000..e175fa0
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/TorSocket.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.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 TorSocket.h
+** \version $Id: TorSocket.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief A QTcpSocket that makes requests over Tor
+*/
+
+#ifndef _TORSOCKET_H
+#define _TORSOCKET_H
+
+#include <QTcpSocket>
+#include <QHostAddress>
+
+
+class TorSocket : public QTcpSocket
+{
+ Q_OBJECT
+
+public:
+ /** Constructor. */
+ TorSocket(const QHostAddress &socksAddr,
+ quint16 socksPort, QObject *parent = 0);
+
+ /** Connects to the specified hostname and port via Tor. */
+ void connectToRemoteHost(const QString &remoteHost, quint16 remotePort);
+
+signals:
+ /** Emitted when a connection has been established through Tor to the remote
+ * host specified in a prior call to connectToHost(). */
+ void connectedToRemoteHost();
+ /** Emitted when a connection error has occurred. */
+ void socketError(QString errmsg);
+
+private slots:
+ /** Called when the socket is connected to the proxy and sends our
+ * half of a Socks4a handshake. */
+ void connectedToProxy();
+ /** Handles the server's response part of a Socks4a handshake. */
+ void onHandshakeResponse();
+ /** Called when a connection error has occurred. */
+ void onError(QAbstractSocket::SocketError error);
+
+private:
+ /** Sends the client part of a Socks4a handshake with a proxy server. */
+ void sendSocksHandshake(const QString &remoteHost, quint16 remotePort);
+
+ QHostAddress _socksAddr; /**< Address of Tor's SOCKS listener. */
+ QString _remoteHost; /**< Remote hostname. */
+ quint16 _socksPort; /**< Port of Tor's SOCKS listener. */
+ quint16 _remotePort; /**< Remote host port. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/TorSslSocket.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/TorSslSocket.cpp
new file mode 100644
index 0000000..49bbe12
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/TorSslSocket.cpp
@@ -0,0 +1,160 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 TorSslSocket.cpp
+** \version $Id: /local/vidalia/trunk/src/util/torsocket.cpp 1564 2006-12-26T06:06:04.965088Z edmanm $
+** \brief A QSslSocket that makes encrypted requests over Tor
+*/
+
+#include "TorSslSocket.h"
+
+#include <QDataStream>
+#include <QStringList>
+
+#define SOCKS_VERSION 0x04 /**< SOCKS version. */
+#define SOCKS_CONNECT 0x01 /**< SOCKS connect command ID. */
+#define SOCKS_FAKE_IP 0x00000001 /**< Bogus IP. */
+#define SOCKS_RESPONSE_LEN 0x08 /**< SOCKS server response length. */
+#define SOCKS_RESPONSE_VERSION 0x00 /**< SOCKS server response version. */
+#define SOCKS_CONNECT_STATUS_OK 0x5A /**< SOCKS server response status. */
+
+
+/** Constructor. */
+TorSslSocket::TorSslSocket(const QHostAddress &socksAddr,
+ quint16 socksPort, QObject *parent)
+: QSslSocket(parent),
+ _socksAddr(socksAddr),
+ _socksPort(socksPort)
+{
+ QObject::connect(this, SIGNAL(sslErrors(QList<QSslError>)),
+ this, SLOT(onSslErrors(QList<QSslError>)));
+ QObject::connect(this, SIGNAL(error(QAbstractSocket::SocketError)),
+ this, SLOT(onError(QAbstractSocket::SocketError)));
+ QObject::connect(this, SIGNAL(readyRead()),
+ this, SLOT(onHandshakeResponse()));
+ QObject::connect(this, SIGNAL(connected()),
+ this, SLOT(connectedToProxy()));
+ QObject::connect(this, SIGNAL(encrypted()),
+ this, SLOT(onEncrypted()));
+}
+
+/** Connects to the specified hostname and port via Tor. */
+void
+TorSslSocket::connectToRemoteHost(const QString &remoteHost, quint16 remotePort,
+ bool encrypted)
+{
+ _remoteHost = remoteHost;
+ _remotePort = remotePort;
+ _encrypted = encrypted;
+ QTcpSocket::connectToHost(_socksAddr, _socksPort);
+}
+
+/** Called when a connection error has occurred. */
+void
+TorSslSocket::onError(QAbstractSocket::SocketError error)
+{
+ Q_UNUSED(error);
+ emit socketError(errorString());
+}
+
+/** Called when one or more SSL errors occur on the socket. */
+void
+TorSslSocket::onSslErrors(const QList<QSslError> &errors)
+{
+ QStringList errorStrings;
+ foreach (QSslError error, errors) {
+ errorStrings << "\"" + error.errorString() + "\"";
+ }
+ emit socketError(errorStrings.join(","));
+}
+
+/** Called when a connection has been established to the proxy host and starts
+ * a Socks4a handshake. */
+void
+TorSslSocket::connectedToProxy()
+{
+ sendSocksHandshake(_remoteHost, _remotePort);
+}
+
+/** Called when an encrypted connection has been established to the remote
+ * host. */
+void
+TorSslSocket::onEncrypted()
+{
+ emit connectedToRemoteHost();
+}
+
+/** Sends the first part of a Socks4a handshake, using the remote hostname and
+ * port specified in the previous call to connectToHost(). The message should
+ * be formatted as follows:
+ *
+ * 0x04 (socks version)
+ * 0x01 (connect)
+ * PORT (two bytes, most significant byte first)
+ * 0x00 0x00 0x00 0x01 (fake IP address: tells proxy to use SOCKS4a)
+ * 0x00 (empty username field)
+ * HOSTNAME (target hostname)
+ * 0x00 (marks the end of the hostname field)
+ */
+void
+TorSslSocket::sendSocksHandshake(const QString &remoteHost, quint16 remotePort)
+{
+ QDataStream sock(this);
+ sock << (quint8)SOCKS_VERSION;
+ sock << (quint8)SOCKS_CONNECT;
+ sock << (quint16)remotePort;
+ sock << (quint32)SOCKS_FAKE_IP;
+ sock << (quint8)0;
+ sock.writeRawData(qPrintable(remoteHost), remoteHost.length());
+ sock << (quint8)0;
+}
+
+/** Handles the second half of the handshake, received from the SOCKS
+ * proxy server. The response should be formatted as follows:
+ *
+ * 0x00 (response version)
+ * STATUS (0x5A means success; other values mean failure)
+ * PORT (not set)
+ * ADDRESS (not set)
+ */
+void
+TorSslSocket::onHandshakeResponse()
+{
+ QByteArray response;
+ if (bytesAvailable() >= SOCKS_RESPONSE_LEN) {
+ /* We've received our response, so stop waiting for it. */
+ QObject::disconnect(this, SIGNAL(readyRead()),
+ this, SLOT(onHandshakeResponse()));
+
+ /* Read the 8-byte response off the socket. */
+ response = read(SOCKS_RESPONSE_LEN);
+
+ /* Check to make sure we got a good response from the proxy. */
+ if ((uchar)response[0] == (uchar)SOCKS_RESPONSE_VERSION &&
+ (uchar)response[1] == (uchar)SOCKS_CONNECT_STATUS_OK) {
+ if (_encrypted) {
+ /* Connection status was okay, so start client encryption. */
+ /* We first need to set the peer name to the intended remote host,
+ * otherwise Qt will use the proxy (e.g., 127.0.0.1) as the peer name
+ * when validating the server certificate. */
+ setPeerName(_remoteHost);
+ startClientEncryption();
+ } else {
+ /* Caller wanted an unencrypted, unauthenticated, uncool conn. */
+ emit connectedToRemoteHost();
+ }
+ } else {
+ /* Remote connection failed, so close the connection to the proxy. */
+ disconnectFromHost();
+ }
+ }
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/TorSslSocket.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/TorSslSocket.h
new file mode 100644
index 0000000..73a87cc
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/TorSslSocket.h
@@ -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.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 TorSslSocket.h
+** \version $Id: /local/vidalia/trunk/src/util/torsocket.h 1564 2006-12-26T06:06:04.965088Z edmanm $
+** \brief A QSslSocket that makes encrypted requests over Tor
+*/
+
+#ifndef _TORSSLSOCKET_H
+#define _TORSSLSOCKET_H
+
+#include <QSslSocket>
+#include <QHostAddress>
+
+
+class TorSslSocket : public QSslSocket
+{
+ Q_OBJECT
+
+public:
+ /** Constructor. */
+ TorSslSocket(const QHostAddress &socksAddr,
+ quint16 socksPort, QObject *parent = 0);
+
+ /** Connects to the specified hostname and port via Tor. */
+ void connectToRemoteHost(const QString &remoteHost, quint16 remotePort,
+ bool encrypted);
+
+signals:
+ /** Emitted when a connection has been established through Tor to the remote
+ * host specified in a prior call to connectToHost(). */
+ void connectedToRemoteHost();
+ /** Emitted when a connection error has occurred. */
+ void socketError(QString errmsg);
+
+private slots:
+ /** Called when the socket is connected to the proxy and sends our
+ * half of a Socks4a handshake. */
+ void connectedToProxy();
+ /** Called when an encrypted connection has been established to the remote
+ * host. */
+ void onEncrypted();
+ /** Handles the server's response part of a Socks4a handshake. */
+ void onHandshakeResponse();
+ /** Called when a connection error has occurred. */
+ void onError(QAbstractSocket::SocketError error);
+ /** Called when one or more SSL errors occur on the socket. */
+ void onSslErrors(const QList<QSslError> &errors);
+
+private:
+ /** Sends the client part of a Socks4a handshake with a proxy server. */
+ void sendSocksHandshake(const QString &remoteHost, quint16 remotePort);
+
+ QHostAddress _socksAddr; /**< Address of Tor's SOCKS listener. */
+ QString _remoteHost; /**< Remote hostname. */
+ quint16 _socksPort; /**< Port of Tor's SOCKS listener. */
+ quint16 _remotePort; /**< Remote host port. */
+ bool _encrypted; /**< Set to true if the connection to the remote
+ host should be encrypted. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/ZlibByteArray.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/ZlibByteArray.cpp
new file mode 100644
index 0000000..6e180ac
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/ZlibByteArray.cpp
@@ -0,0 +1,383 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+**
+** * * *
+**
+** Zlib support in this class is derived from Tor's torgzip.[ch].
+** Tor is distributed under this license:
+**
+** Copyright (c) 2001-2004, Roger Dingledine
+** Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+**
+** * Redistributions in binary form must reproduce the above
+** copyright notice, this list of conditions and the following disclaimer
+** in the documentation and/or other materials provided with the
+** distribution.
+**
+** * Neither the names of the copyright owners nor the names of its
+** contributors may be used to endorse or promote products derived from
+** this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+** \file ZlibByteArray.cpp
+** \version $Id: ZlibByteArray.cpp 4203 2010-01-22 18:49:00Z edmanm $
+** \brief Wrapper around QByteArray that adds compression capabilities
+*/
+
+#include "config.h"
+
+#include <QString>
+
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#elif defined(HAVE_SYS_LIMITS_H)
+#include <sys/limits.h>
+#endif
+
+/* The following check for UINT_MAX is derived from Tor's torint.h. See
+ * the top of this file for details on Tor's license. */
+#ifndef UINT_MAX
+#if (SIZEOF_INT == 2)
+#define UINT_MAX 0xffffu
+#elif (SIZEOF_INT == 4)
+#define UINT_MAX 0xffffffffu
+#elif (SIZEOF_INT == 8)
+#define UINT_MAX 0xffffffffffffffffu
+#else
+#error "Your platform uses a sizeof(int) that we don't understand."
+#endif
+#endif
+
+#include "zlib.h"
+#include <ZlibByteArray.h>
+
+
+/** Constructor */
+ZlibByteArray::ZlibByteArray(QByteArray data)
+: QByteArray(data)
+{
+}
+
+/** Return the 'bits' value to tell zlib to use <b>method</b>.*/
+int
+ZlibByteArray::methodBits(CompressionMethod method)
+{
+ /* Bits+16 means "use gzip" in zlib >= 1.2 */
+ return (method == Gzip ? 15+16 : 15);
+}
+
+/** Returns a string description of <b>method</b>. */
+QString
+ZlibByteArray::methodString(CompressionMethod method)
+{
+ switch (method) {
+ case None: return "None";
+ case Zlib: return "Zlib";
+ case Gzip: return "Gzip";
+ default: return "Unknown";
+ }
+}
+
+/** Returns true if the Zlib compression library is available and usable. */
+bool
+ZlibByteArray::isZlibAvailable()
+{
+ static int isZlibAvailable = -1;
+ if (isZlibAvailable >= 0)
+ return isZlibAvailable;
+
+ /* From zlib.h:
+ * "The application can compare zlibVersion and ZLIB_VERSION for consistency.
+ * If the first character differs, the library code actually used is
+ * not compatible with the zlib.h header file used by the application." */
+ QString libVersion(zlibVersion());
+ QString headerVersion(ZLIB_VERSION);
+ if (libVersion.isEmpty() || headerVersion.isEmpty() ||
+ libVersion.at(0) != headerVersion.at(0))
+ isZlibAvailable = 0;
+ else
+ isZlibAvailable = 1;
+
+ return isZlibAvailable;
+}
+
+/** Returns true iff we support gzip-based compression. Otherwise, we need to
+ * use zlib. */
+bool
+ZlibByteArray::isGzipSupported()
+{
+ static int isGzipSupported = -1;
+ if (isGzipSupported >= 0)
+ return isGzipSupported;
+
+ QString version(zlibVersion());
+ if (version.startsWith("0.") ||
+ version.startsWith("1.0") ||
+ version.startsWith("1.1"))
+ isGzipSupported = 0;
+ else
+ isGzipSupported = 1;
+
+ return isGzipSupported;
+}
+
+/** Compresses the current contents of this object using <b>method</b>.
+ * Returns the compressed data if successful. If an error occurs, this will
+ * return an empty QByteArray and set the optional <b>errmsg</b> to a string
+ * describing the failure. */
+QByteArray
+ZlibByteArray::compress(const CompressionMethod method,
+ QString *errmsg) const
+{
+ return compress(QByteArray(data()), method, errmsg);
+}
+
+/** Compresses <b>in</b> using <b>method</b>. Returns the compressed data
+ * if successful. If an error occurs, this will return an empty QByteArray and
+ * set the optional <b>errmsg</b> to a string describing the failure. */
+QByteArray
+ZlibByteArray::compress(const QByteArray in,
+ const CompressionMethod method,
+ QString *errmsg)
+{
+ QByteArray out;
+ QString errorstr;
+ struct z_stream_s *stream = NULL;
+ size_t out_size;
+ size_t out_len;
+ size_t in_len = in.length();
+ off_t offset;
+
+ if (method == None)
+ return in;
+ if (method == Gzip && !isGzipSupported()) {
+ /* Old zlib versions don't support gzip in deflateInit2 */
+ if (errmsg)
+ *errmsg = QString("Gzip not supported with zlib %1")
+ .arg(ZLIB_VERSION);
+ return QByteArray();
+ }
+
+ stream = new struct z_stream_s;
+ stream->zalloc = Z_NULL;
+ stream->zfree = Z_NULL;
+ stream->opaque = NULL;
+ stream->next_in = (unsigned char*)in.data();
+ stream->avail_in = in_len;
+
+ if (deflateInit2(stream, Z_BEST_COMPRESSION, Z_DEFLATED,
+ methodBits(method),
+ 8, Z_DEFAULT_STRATEGY) != Z_OK) {
+ errorstr = QString("Error from deflateInit2: %1")
+ .arg(stream->msg ? stream->msg : "<no message>");
+ goto err;
+ }
+
+ /* Guess 50% compression. */
+ out_size = in_len / 2;
+ if (out_size < 1024) out_size = 1024;
+
+ out.resize(out_size);
+ stream->next_out = (unsigned char*)out.data();
+ stream->avail_out = out_size;
+
+ while (1) {
+ switch (deflate(stream, Z_FINISH))
+ {
+ case Z_STREAM_END:
+ goto done;
+ case Z_OK:
+ /* In case zlib doesn't work as I think .... */
+ if (stream->avail_out >= stream->avail_in+16)
+ break;
+ case Z_BUF_ERROR:
+ offset = stream->next_out - ((unsigned char*)out.data());
+ out_size *= 2;
+ out.resize(out_size);
+ stream->next_out = (unsigned char*)(out.data() + offset);
+ if (out_size - offset > UINT_MAX) {
+ errorstr =
+ "Ran over unsigned int limit of zlib while uncompressing";
+ goto err;
+ }
+ stream->avail_out = (unsigned int)(out_size - offset);
+ break;
+ default:
+ errorstr = QString("%1 compression didn't finish: %2")
+ .arg(methodString(method))
+ .arg(stream->msg ? stream->msg : "<no message>");
+ goto err;
+ }
+ }
+done:
+ out_len = stream->total_out;
+ if (deflateEnd(stream)!=Z_OK) {
+ errorstr = "Error freeing zlib structures";
+ goto err;
+ }
+ out.resize(out_len);
+ delete stream;
+ return out;
+err:
+ if (stream) {
+ deflateEnd(stream);
+ delete stream;
+ }
+ if (errmsg)
+ *errmsg = errorstr;
+ return QByteArray();
+}
+
+/** Uncompresses the current contents of this object using <b>method</b>.
+ * Returns the uncompressed data if successful. If an error occurs, this will
+ * return an empty QByteArray and set the optional <b>errmsg</b> to a string
+ * describing the failure. */
+QByteArray
+ZlibByteArray::uncompress(const CompressionMethod method,
+ QString *errmsg) const
+{
+ return uncompress(QByteArray(data()), method, errmsg);
+}
+
+/** Uncompresses <b>in</b> using <b>method</b>. Returns the uncompressed data
+ * if successful. If an error occurs, this will return an empty QByteArray and
+ * set the optional <b>errmsg</b> to a string describing the failure. */
+QByteArray
+ZlibByteArray::uncompress(const QByteArray in,
+ const CompressionMethod method,
+ QString *errmsg)
+{
+ QByteArray out;
+ QString errorstr;
+ struct z_stream_s *stream = NULL;
+ size_t out_size;
+ size_t out_len;
+ size_t in_len = in.length();
+ off_t offset;
+ int r;
+
+ if (method == None)
+ return in;
+ if (method == Gzip && !isGzipSupported()) {
+ /* Old zlib versions don't support gzip in inflateInit2 */
+ if (errmsg)
+ *errmsg = QString("Gzip not supported with zlib %1")
+ .arg(ZLIB_VERSION);
+ return QByteArray();
+ }
+
+ stream = new struct z_stream_s;
+ stream->zalloc = Z_NULL;
+ stream->zfree = Z_NULL;
+ stream->opaque = NULL;
+ stream->msg = NULL;
+ stream->next_in = (unsigned char*) in.data();
+ stream->avail_in = in_len;
+
+ if (inflateInit2(stream,
+ methodBits(method)) != Z_OK) {
+ errorstr = QString("Error from inflateInit2: %1")
+ .arg(stream->msg ? stream->msg : "<no message>");
+ goto err;
+ }
+
+ out_size = in_len * 2; /* guess 50% compression. */
+ if (out_size < 1024) out_size = 1024;
+
+ out.resize(out_size);
+ stream->next_out = (unsigned char*)out.data();
+ stream->avail_out = out_size;
+
+ while (1) {
+ switch (inflate(stream, Z_FINISH))
+ {
+ case Z_STREAM_END:
+ if (stream->avail_in == 0)
+ goto done;
+ /* There may be more compressed data here. */
+ if ((r = inflateEnd(stream)) != Z_OK) {
+ errorstr = "Error freeing zlib structures";
+ goto err;
+ }
+ if (inflateInit2(stream, methodBits(method)) != Z_OK) {
+ errorstr = QString("Error from second inflateInit2: %1")
+ .arg(stream->msg ? stream->msg : "<no message>");
+ goto err;
+ }
+ break;
+ case Z_OK:
+ if (stream->avail_in == 0)
+ goto done;
+ /* In case zlib doesn't work as I think.... */
+ if (stream->avail_out >= stream->avail_in+16)
+ break;
+ case Z_BUF_ERROR:
+ if (stream->avail_out > 0) {
+ errorstr = QString("Possible truncated or corrupt %1 data")
+ .arg(methodString(method));
+ goto err;
+ }
+ offset = stream->next_out - (unsigned char*)out.data();
+ out_size *= 2;
+ out.resize(out_size);
+ stream->next_out = (unsigned char*)(out.data() + offset);
+ if (out_size - offset > UINT_MAX) {
+ errorstr =
+ "Ran over unsigned int limit of zlib while uncompressing";
+ goto err;
+ }
+ stream->avail_out = (unsigned int)(out_size - offset);
+ break;
+ default:
+ errorstr = QString("%1 decompression returned an error: %2")
+ .arg(methodString(method))
+ .arg(stream->msg ? stream->msg : "<no message>");
+ goto err;
+ }
+ }
+done:
+ out_len = stream->next_out - (unsigned char*)out.data();
+ r = inflateEnd(stream);
+ delete stream;
+ if (r != Z_OK) {
+ errorstr = "Error freeing zlib structure";
+ goto err;
+ }
+ out.resize(out_len);
+ return out;
+err:
+ if (stream) {
+ inflateEnd(stream);
+ delete stream;
+ }
+ if (errmsg)
+ *errmsg = errorstr;
+ return QByteArray();
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/ZlibByteArray.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/ZlibByteArray.h
new file mode 100644
index 0000000..3414cba
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/ZlibByteArray.h
@@ -0,0 +1,102 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+**
+** * * *
+**
+** Zlib support in this class is derived from Tor's torgzip.[ch].
+** Tor is distributed under this license:
+**
+** Copyright (c) 2001-2004, Roger Dingledine
+** Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+**
+** * Redistributions in binary form must reproduce the above
+** copyright notice, this list of conditions and the following disclaimer
+** in the documentation and/or other materials provided with the
+** distribution.
+**
+** * Neither the names of the copyright owners nor the names of its
+** contributors may be used to endorse or promote products derived from
+** this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+** \file ZlibByteArray.h
+** \version $Id: ZlibByteArray.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Wrapper around QByteArray that adds compression capabilities
+*/
+
+#ifndef _ZLIBBYTEARRAY_H
+#define _ZLIBBYTEARRAY_H
+
+#include <QByteArray>
+#include <QString>
+
+
+class ZlibByteArray : public QByteArray
+{
+public:
+ /** Available compression methods. */
+ enum CompressionMethod {
+ None, /**< No compression method. */
+ Gzip, /**< Gzip compression method. */
+ Zlib /**< Zlib compression method. */
+ };
+
+ /** Constructor. */
+ ZlibByteArray(QByteArray data);
+
+ /** Compresses the current contents of this object using <b>method</b>. */
+ QByteArray compress(const CompressionMethod method = Zlib,
+ QString *errmsg = 0) const;
+ /** Compreses the contents of <b>in</b> using <b>method</b>. */
+ static QByteArray compress(const QByteArray in,
+ const CompressionMethod method = Zlib,
+ QString *errmsg = 0);
+ /** Uncompresses the current contents of this object using <b>method</b>. */
+ QByteArray uncompress(CompressionMethod method = Zlib,
+ QString *errmsg = 0) const;
+ /** Uncompresses the contents of <b>in</b> using <b>method</b>. */
+ static QByteArray uncompress(const QByteArray in,
+ const CompressionMethod method = Zlib,
+ QString *errmsg = 0);
+
+ /** Returns true if the Zlib compression library is available and usable. */
+ static bool isZlibAvailable();
+ /** Returns true iff we support gzip-based compression. Otherwise, we need to
+ * use zlib. */
+ static bool isGzipSupported();
+
+private:
+ /** Return the 'bits' value to tell zlib to use <b>method</b>.*/
+ static int methodBits(CompressionMethod method);
+ /** Returns a string description of <b>method</b>. */
+ static QString methodString(CompressionMethod method);
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/crypto.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/crypto.cpp
new file mode 100644
index 0000000..f27edf3
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/crypto.cpp
@@ -0,0 +1,190 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+**
+** * * *
+**
+** Pseudorandom number generation support in this file is derived from
+** Tor's crypto.[ch]. Tor is distributed under this license.
+**
+** Copyright (c) 2001-2004, Roger Dingledine
+** Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+**
+** * Redistributions in binary form must reproduce the above
+** copyright notice, this list of conditions and the following disclaimer
+** in the documentation and/or other materials provided with the
+** distribution.
+**
+** * Neither the names of the copyright owners nor the names of its
+** contributors may be used to endorse or promote products derived from
+** this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+** \file crypto.cpp
+** \version $Id: crypto.cpp 3818 2009-06-06 17:46:49Z edmanm $
+** \brief Provides support for pseuodrandom number generation.
+*/
+
+#include "crypto.h"
+
+#include <QFile>
+#include <QStringList>
+#include <QCryptographicHash>
+#include <QtDebug>
+
+#if defined(Q_OS_WIN32)
+#include <windows.h>
+#include <wincrypt.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
+ * QByteArray contains the requested number of bytes. This function is based on
+ * crypto_seed_rng() from Tor's crypto.c. See LICENSE for details on Tor's
+ * license. */
+QByteArray
+crypto_rand_bytes(int len)
+{
+ QByteArray buf(len, 0);
+#if defined(Q_OS_WIN32)
+ static int provider_set = 0;
+ static HCRYPTPROV provider;
+#else
+ static QStringList filenames =
+ QStringList() << "/dev/srandom" << "/dev/urandom" << "/dev/random";
+#endif
+ Q_ASSERT(len > 0);
+
+#if defined(Q_OS_WIN32)
+ if (!provider_set) {
+ if (!CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL,
+ CRYPT_VERIFYCONTEXT)) {
+ if ((unsigned long)GetLastError() != (unsigned long)NTE_BAD_KEYSET) {
+ qWarning("Can't get CryptoAPI provider.");
+ return QByteArray();
+ }
+ }
+ provider_set = 1;
+ }
+ if (!CryptGenRandom(provider, buf.size(), (BYTE *)buf.data())) {
+ qWarning("Can't get entropy from CryptoAPI.");
+ return QByteArray();
+ }
+ return buf;
+#else
+ foreach (QString fname, filenames) {
+ QFile file(fname);
+ if (!file.open(QIODevice::ReadOnly))
+ continue;
+
+ qint64 bytes_read;
+ qint64 total = 0;
+ while (total < buf.size()) {
+ bytes_read = file.read(buf.data()+total, buf.size()-total);
+ if (bytes_read < 0)
+ return QByteArray();
+ else if (bytes_read == 0) {
+ buf.resize(total);
+ return buf;
+ }
+ total += bytes_read;
+ }
+ return buf;
+ }
+ qWarning("Can't read from /dev/*random.");
+ return QByteArray();
+#endif
+}
+
+/** Returns a pseudorandom integer, chosen uniformly from the the values in
+ * the range [0, max). This function is based on crypto_rand_int() from Tor's
+ * crypto.c. See LICENSE for details on Tor's license. */
+quint32
+crypto_rand_quint32(quint32 max)
+{
+ QByteArray buf;
+ quint32 val;
+ quint32 cutoff;
+ Q_ASSERT(max > 0);
+
+ cutoff = 0xffffffffu - (0xffffffffu % max);
+ forever {
+ buf = crypto_rand_bytes(sizeof(quint32));
+ Q_ASSERT(buf.size() == sizeof(quint32));
+
+ val = *((quint32 *)buf.constData());
+ if (val < cutoff)
+ break;
+ }
+ return (val % max);
+}
+
+/** Generates a pseudorandom string of length <b>len</b> containing printable
+ * ASCII characters from the range '!' (0x21) to '~' (0x7e). */
+QString
+crypto_rand_string(int len)
+{
+ QString str;
+ Q_ASSERT(len >= 0);
+
+ for (int i = 0; i < len; i++)
+ str += QChar('!' + crypto_rand_quint32('~'-'!'+1));
+ return str;
+}
+
+/** Generates a salted hash of <b>secret</b> using the random <b>salt</b>
+ * according to the iterated and salted S2K algorithm in RFC 2440. <b>c</b>
+ * is the one-octet coded count value that specifies how much data to hash.
+ * <b>salt</b> must contain at least 8 bytes, otherwise this method will
+ * return a default-constructed QByteArray. */
+QByteArray
+crypto_secret_to_key(const QString &secret, const QByteArray &salt, quint8 c)
+{
+ if (salt.size() < 8)
+ return QByteArray();
+
+#define EXPBIAS 6
+ int count = ((quint32)16 + (c & 15)) << ((c >> 4) + EXPBIAS);
+#undef EXPBIAS
+
+ QCryptographicHash hash(QCryptographicHash::Sha1);
+ QByteArray tmp = salt.left(8).append(secret.toAscii());
+ while (count) {
+ if (count > tmp.length()) {
+ hash.addData(tmp);
+ count -= tmp.length();
+ } else {
+ hash.addData(tmp.left(count));
+ count = 0;
+ }
+ }
+
+ return hash.result();
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/crypto.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/crypto.h
new file mode 100644
index 0000000..b6b9c24
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/crypto.h
@@ -0,0 +1,79 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+**
+** * * *
+**
+** Pseudorandom number generation support in this file is derived from
+** Tor's crypto.[ch]. Tor is distributed under this license.
+**
+** Copyright (c) 2001-2004, Roger Dingledine
+** Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+**
+** * Redistributions in binary form must reproduce the above
+** copyright notice, this list of conditions and the following disclaimer
+** in the documentation and/or other materials provided with the
+** distribution.
+**
+** * Neither the names of the copyright owners nor the names of its
+** contributors may be used to endorse or promote products derived from
+** this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+** \file crypto.h
+** \version $Id: crypto.h 3818 2009-06-06 17:46:49Z edmanm $
+** \brief Provides support for pseuodrandom number generation.
+*/
+
+#ifndef _CRYPTO_H
+#define _CRYPTO_H
+
+#include <QByteArray>
+#include <QString>
+
+/** Returns <b>len</b> bytes of pseudorandom data on success, or an empty
+ * QByteArray on failure. This function is based on crypto_seed_rng() from
+ * Tor's crypto.c. See LICENSE for details on Tor's license. */
+QByteArray crypto_rand_bytes(int len);
+/** Returns a pseudorandom integer, chosen uniformly from the the values in
+ * the range [0, max). This function is based on crypto_rand_int() from Tor's
+ * crypto.c. See LICENSE for details on Tor's license. */
+quint32 crypto_rand_quint32(quint32 max);
+/** Generates a pseudorandom string of length <b>len</b> containing printable
+ * ASCII characters from the range '!' (0x21) to '~' (0x7e). */
+QString crypto_rand_string(int len);
+/** Generates a salted hash of <b>secret</b> using the random <b>salt</b>
+ * according to the iterated and salted S2K algorithm in RFC 2440. <b>c</b>
+ * is the one-octet coded count value that specifies how much data to hash.
+ * <b>salt</b> must contain at least 8 bytes, otherwise this method will
+ * return a default-constructed QByteArray. */
+QByteArray
+crypto_secret_to_key(const QString &secret, const QByteArray &salt, quint8 c);
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/file.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/file.cpp
new file mode 100644
index 0000000..bdf1097
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/file.cpp
@@ -0,0 +1,126 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 file.cpp
+** \version $Id: file.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Functions and definitions for common file I/O operations
+*/
+
+#include "file.h"
+#include "stringutil.h"
+
+#if defined(Q_OS_WIN32)
+#include "win32.h"
+#endif
+
+#include <QDir>
+#include <QFile>
+
+
+/** Create an empty file named <b>filename</b>. if <b>createdir</b> is true,
+ * then the full path to <b>filename</b> will be created. Returns true on
+ * success, or false on error and <b>errmsg</b> will be set. */
+bool
+touch_file(const QString &filename, bool createdir, QString *errmsg)
+{
+ /* Expand the file's path if it starts with a shortcut, like "~/" or
+ * "%APPDATA%" */
+ QString expanded = expand_filename(filename);
+
+ /* If the file's path doesn't exist and we're supposed to create it, do that
+ * now. */
+ if (createdir && !create_path(QFileInfo(expanded).absolutePath())) {
+ return false;
+ }
+
+ /* Touch the file */
+ QFile file(expanded);
+ if (!QFileInfo(expanded).exists()) {
+ if (!file.open(QIODevice::WriteOnly)) {
+ return err(errmsg, file.errorString());
+ }
+ }
+ return true;
+}
+
+/** Creates all directories in <b>path</b>, if they do not exist. */
+bool
+create_path(const QString &path)
+{
+ QDir dir(path);
+ if (!dir.exists()) {
+ if (!dir.mkpath(dir.absolutePath())) {
+ return false;
+ }
+ }
+ return true;
+}
+
+/** Recursively copy the contents of one directory to another. The
+ * destination must already exist. Returns true on success, and false
+ * otherwise. */
+bool
+copy_dir(const QString &source, const QString &dest)
+{
+ /* Source and destination as QDir's */
+ QDir src(source);
+ QDir dst(dest);
+
+ /* Get contents of the directory */
+ QFileInfoList contents = src.entryInfoList(QDir::Files | QDir::Dirs
+ | QDir::NoDotAndDotDot);
+
+ /* Copy each entry in src to dst */
+ foreach (QFileInfo fileInfo, contents) {
+ /* Get absolute path of source and destination */
+ QString fileName = fileInfo.fileName();
+ QString srcFilePath = src.absoluteFilePath(fileName);
+ QString dstFilePath = dst.absoluteFilePath(fileName);
+
+ if (fileInfo.isDir()) {
+ /* This is a directory, make it and recurse */
+ if (!dst.mkdir(fileName))
+ return false;
+ if (!copy_dir(srcFilePath, dstFilePath))
+ return false;
+ } else if (fileInfo.isFile()) {
+ /* This is a file, copy it */
+ if (!QFile::copy(srcFilePath, dstFilePath))
+ return false;
+ }
+ /* Ignore special files (e.g. symlinks, devices) */
+
+ }
+ return true;
+}
+
+/** Expands <b>filename</b> if it starts with "~/". On Windows, this will
+ * expand "%APPDATA%" and "%PROGRAMFILES%". If <b>filename</b> does not
+ * start with a shortcut, <b>filename</b> will be returned unmodified. */
+QString
+expand_filename(const QString &filename)
+{
+ QString fname = filename;
+#if defined(Q_OS_WIN32)
+ if (fname.startsWith("%APPDATA%\\") ||
+ fname.startsWith("%APPDATA%/"))
+ return fname.replace(0, 9, win32_app_data_folder());
+
+ if (fname.startsWith("%PROGRAMFILES%\\") ||
+ fname.startsWith("%PROGRAMFILES%/"))
+ return fname.replace(0, 14, win32_program_files_folder());
+#else
+ if (fname.startsWith("~/"))
+ return fname.replace(0, 1, QDir::homePath());
+#endif
+ return fname;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/file.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/file.h
new file mode 100644
index 0000000..84aaf95
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/file.h
@@ -0,0 +1,43 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 file.h
+** \version $Id: file.h 3505 2009-02-03 02:21:55Z edmanm $
+** \brief Functions and definitions for common file I/O operations
+*/
+
+#ifndef _FILE_H
+#define _FILE_H
+
+#include <QString>
+
+
+/** Create an empty file named <b>filename</b>. if <b>createdir</b> is true,
+ * then the full path to <b>filename</b> will be created. Returns true on
+ * success, or false on error and <b>errmsg</b> will be set. */
+bool touch_file(const QString &filename, bool createdir = false,
+ QString *errmsg = 0);
+
+/** Creates all directories in <b>path</b>, if they do not exist. */
+bool create_path(const QString &path);
+
+/** Expands <b>filename</b> if it starts with "~/". On Windows, this will
+ * expand "%APPDATA%" and "%PROGRAMFILES%". If <b>filename</b> does not
+ * start with a shortcut, <b>filename</b> will be returned unmodified. */
+QString expand_filename(const QString &filename);
+
+/** Recursively copy the contents of one directory to another. The
+ * destination must already exist. Returns true on success, and false
+ * otherwise. */
+bool copy_dir(const QString &source, const QString &dest);
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/html.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/html.cpp
new file mode 100644
index 0000000..1999e54
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/html.cpp
@@ -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 html.cpp
+** \version $Id: html.cpp 2362 2008-02-29 04:30:11Z edmanm $
+** \brief HTML formatting functions
+*/
+
+#include "html.h"
+
+
+/** Wraps a string in "<p>" tags, converts "\n" to "<br/>" and converts "\n\n"
+ * to a new paragraph. */
+QString
+p(QString str)
+{
+ str = "<p>" + str + "</p>";
+ str.replace("\n\n", "</p><p>");
+ str.replace("\n", "<br/>");
+ return str;
+}
+
+/** Wraps a string in "<i>" tags. */
+QString
+i(QString str)
+{
+ return QString("<i>%1</i>").arg(str);
+}
+
+/** Wraps a string in "<b>" tags. */
+QString
+b(QString str)
+{
+ return QString("<b>%1</b>").arg(str);
+}
+
+/** Wraps a string in "<tr>" tags. */
+QString
+trow(QString str)
+{
+ return QString("<tr>%1</tr>").arg(str);
+}
+
+/** Wraps a string in "<td>" tags. */
+QString
+tcol(QString str)
+{
+ return QString("<td>%1</td>").arg(str);
+}
+
+/** Wraps a string in "<th>" tags. */
+QString
+thead(QString str)
+{
+ return QString("<th>%1</th>").arg(str);
+}
+
+/** Escapes "<" and ">" characters in the given string. */
+QString
+escape(QString str)
+{
+ str.replace("<", "<");
+ str.replace(">", ">");
+ return str;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/html.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/html.h
new file mode 100644
index 0000000..3536950
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/html.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 html.h
+** \version $Id: html.h 2362 2008-02-29 04:30:11Z edmanm $
+** \brief HTML formatting functions
+*/
+
+#ifndef _HTML_H
+#define _HTML_H
+
+#include <QString>
+
+
+/** Wraps a string in "<p>" tags, converts "\n" to "<br/>" and converts "\n\n"
+ * to a new paragraph. */
+QString p(QString str);
+
+/** Wraps a string in "<i>" tags. */
+QString i(QString str);
+
+/** Wraps a string in "<b>" tags. */
+QString b(QString str);
+
+/** Wraps a string in "<tr>" tags. */
+QString trow(QString str);
+
+/** Wraps a string in "<td>" tags. */
+QString tcol(QString str);
+
+/** Wraps a string in "<th>" tags. */
+QString thead(QString str);
+
+/** Escapes "<" and ">" characters in a string, for html. */
+QString escape(QString str);
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/net.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/net.cpp
new file mode 100644
index 0000000..8dbc3f9
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/net.cpp
@@ -0,0 +1,35 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 net.cpp
+** \version $Id: net.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Common network I/O and utility functions
+*/
+
+#include "net.h"
+
+#include <QTcpSocket>
+
+
+/** Attempts a connection to <b>host</b> on <b>port</b>. Returns true if the
+ * connection was successful, or false if the connection attempt failed. */
+bool
+net_test_connect(QHostAddress host, quint16 port, int timeout)
+{
+ QTcpSocket sock;
+ sock.connectToHost(host, port);
+ if (!sock.waitForConnected(timeout)) {
+ return false;
+ }
+ sock.disconnectFromHost();
+ return true;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/net.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/net.h
new file mode 100644
index 0000000..7e39675
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/net.h
@@ -0,0 +1,27 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 net.h
+** \version $Id: net.h 2362 2008-02-29 04:30:11Z edmanm $
+** \brief Common network I/O and utility functions
+*/
+
+#ifndef _NET_H
+#define _NET_H
+
+#include <QHostAddress>
+
+/** Attempts a connection to <b>host</b> on <b>port</b>. Returns true if the
+ * connection was successful, or false if the connection attempt failed. */
+bool net_test_connect(QHostAddress host, quint16 port, int timeout = 250);
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/procutil.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/procutil.cpp
new file mode 100644
index 0000000..9cfc7e7
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/procutil.cpp
@@ -0,0 +1,134 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 procutil.cpp
+** \version $Id: procutil.cpp 3751 2009-05-01 03:26:38Z edmanm $
+** \brief Process information and pidfile functions
+*/
+
+#include "procutil.h"
+#include "stringutil.h"
+
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QTextStream>
+#include <QApplication>
+
+
+/** Returns the PID of the current process. */
+qint64
+get_pid()
+{
+#if defined(Q_OS_WIN)
+ return (qint64)GetCurrentProcessId();
+#else
+ return (qint64)getpid();
+#endif
+}
+
+/** Returns true if a process with the given PID is running. */
+bool
+is_process_running(qint64 pid)
+{
+#if defined(Q_OS_WIN)
+ QHash<qint64, QString> procList = win32_process_list();
+ if (procList.contains(pid)) {
+ /* A process with this ID exists. Check if it's the same as this process. */
+ QString exeFile = procList.value(pid);
+ QString thisExe = QFileInfo(QApplication::applicationFilePath()).fileName();
+ return (exeFile.toLower() == thisExe.toLower());
+ }
+ return false;
+#else
+ /* Send the "null" signal to check if a process exists */
+ if (kill((pid_t)pid, 0) < 0) {
+ return (errno != ESRCH);
+ }
+ return true;
+#endif
+}
+
+/** Writes the given file to disk containing the current process's PID. */
+bool
+write_pidfile(const QString &pidFileName, QString *errmsg)
+{
+ /* Make sure the directory exists */
+ QDir pidFileDir = QFileInfo(pidFileName).absoluteDir();
+ if (!pidFileDir.exists()) {
+ pidFileDir.mkpath(QDir::convertSeparators(pidFileDir.absolutePath()));
+ }
+
+ /* Try to open (and create if it doesn't exist) the pidfile */
+ QFile pidfile(pidFileName);
+ if (!pidfile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+ return err(errmsg, pidfile.errorString());
+ }
+
+ /* Write our current PID to it */
+ QTextStream pidstream(&pidfile);
+ pidstream << get_pid();
+ return true;
+}
+
+/** Reads the given pidfile and returns the value contained in it. If the file
+ * does not exist 0 is returned. Returns -1 if an error occurs. */
+qint64
+read_pidfile(const QString &pidFileName, QString *errmsg)
+{
+ qint64 pid;
+
+ /* Open the pidfile, if it exists */
+ QFile pidfile(pidFileName);
+ if (!pidfile.exists()) {
+ return 0;
+ }
+ if (!pidfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ if (errmsg) {
+ *errmsg = pidfile.errorString();
+ }
+ return -1;
+ }
+
+ /* Read the PID in from the file */
+ QTextStream pidstream(&pidfile);
+ pidstream >> pid;
+ return pid;
+}
+
+QHash<qint64, QString>
+process_list()
+{
+#if defined(Q_OS_WIN32)
+ return win32_process_list();
+#else
+ return QHash<qint64, QString>();
+#endif
+}
+
+bool
+process_kill(qint64 pid)
+{
+#if defined(Q_OS_WIN32)
+ HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE,
+ static_cast<DWORD>(pid));
+ if (hProcess == NULL)
+ return false;
+
+ BOOL ret = TerminateProcess(hProcess, 0);
+ CloseHandle(hProcess);
+
+ return (ret != FALSE);
+#else
+ return false;
+#endif
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/procutil.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/procutil.h
new file mode 100644
index 0000000..a82baf8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/procutil.h
@@ -0,0 +1,56 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 procutil.h
+** \version $Id: procutil.h 3751 2009-05-01 03:26:38Z edmanm $
+** \brief Process information and pidfile functions
+*/
+
+#ifndef _PROCUTIL_H
+#define _PROCUTIL_H
+
+#include <QtGlobal>
+#if defined(Q_OS_WIN)
+#include "win32.h"
+#else
+#include <sys/types.h>
+#include <unistd.h>
+#include <signal.h>
+#include <errno.h>
+#endif
+
+#include <QHash>
+
+class QString;
+
+/** Returns the PID of the current process. */
+qint64 get_pid();
+
+/** Returns true if a process with the given PID is running. */
+bool is_process_running(qint64 pid);
+
+/** Writes the given file to disk containing the current process's PID. */
+bool write_pidfile(const QString &pidfile, QString *errmsg = 0);
+
+/** Reads the giiven pidfile and returns the value in it. If the file does not
+ * exist, -1 is returned. */
+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();
+
+/** Attempt to kill process <b>pid</b>. Return true if the specified process
+ * was successfully terminated. Otherwise, return false. */
+bool process_kill(qint64 pid);
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/stringutil.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/stringutil.cpp
new file mode 100644
index 0000000..c685ff2
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/stringutil.cpp
@@ -0,0 +1,356 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 stringutil.cpp
+** \version $Id: stringutil.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Common string manipulation functions
+*/
+
+#include "stringutil.h"
+
+#include <QCoreApplication>
+#include <QApplication>
+
+
+/** Create a QStringList from the array of C-style strings. */
+QStringList
+char_array_to_stringlist(char **arr, int len)
+{
+ QStringList list;
+ for (int i = 0; i < len; i++) {
+ list << QString(arr[i]);
+ }
+ return list;
+}
+
+/** Conditionally assigns errmsg to str if str is not null and returns false.
+ * This is a seemingly pointless function, but it saves some messiness in
+ * methods whose QString *errmsg parameter is optional. */
+bool
+err(QString *str, const QString &errmsg)
+{
+ if (str) {
+ *str = errmsg;
+ }
+ return false;
+}
+
+/** Ensures all characters in str are in validChars. If a character appears
+ * in str but not in validChars, it will be removed and the resulting
+ * string returned. */
+QString
+ensure_valid_chars(const QString &str, const QString &validChars)
+{
+ QString out = str;
+ for (int i = 0; i < str.length(); i++) {
+ QChar c = str.at(i);
+ if (validChars.indexOf(c) < 0) {
+ out.remove(c);
+ }
+ }
+ return out;
+}
+
+/** Scrubs an email address by replacing "@" with " at " and "." with " dot ". */
+QString
+scrub_email_addr(const QString &email)
+{
+ QString scrubbed = email;
+ scrubbed = scrubbed.replace("@", " at ");
+ scrubbed = scrubbed.replace(".", " dot ");
+ return scrubbed;
+}
+
+/** Wraps <b>str</b> at <b>width</b> characters wide, using <b>sep</b> as the
+ * word separator (" ", for example), and placing the line ending <b>le</b> at
+ * the end of each line, except the last. */
+QString
+string_wrap(const QString &str, int width,
+ const QString &sep, const QString &le)
+{
+ QString wrapped;
+ int pos, nextsep, wordlen, n;
+ int seplen = sep.length();
+
+ if (str.length() < width) {
+ return str;
+ }
+
+ pos = 0;
+ n = width;
+ while (pos < str.length()) {
+ /* Get the length of a "word" */
+ nextsep = str.indexOf(sep, pos);
+ if (nextsep < 0) {
+ nextsep = str.length();
+ }
+ wordlen = nextsep-pos;
+
+ /* Check if there is room for the word on this line */
+ if (wordlen > n) {
+ /* Create a new line */
+ wrapped.append(le);
+ n = width;
+ }
+
+ /* Add the word to the current line */
+ wrapped.append(str.mid(pos, wordlen+seplen));
+ n = n - wordlen - seplen;
+ pos += wordlen + seplen;
+ }
+ return wrapped.trimmed();
+}
+
+/** Encodes the bytes in <b>buf</b> as an uppercase hexadecimal string and
+ * 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 hex;
+ for (int i = 0; i < buf.size(); i++) {
+ hex += "0123456789ABCDEF"[((quint8)buf[i]) >> 4];
+ hex += "0123456789ABCDEF"[((quint8)buf[i]) & 0xf];
+ }
+ return hex;
+}
+
+/** Given a string <b>str</b>, this function returns a quoted string with all
+ * '"' and '\' characters escaped with a single '\'. */
+QString
+string_escape(const QString &str)
+{
+ QString out;
+ out.append("\"");
+ for (int i = 0; i < str.length(); i++) {
+ if (str[i] == '\"' || str[i] == '\\')
+ out.append('\\');
+ out.append(str[i]);
+ }
+ out.append("\"");
+ return out;
+}
+
+/** Given a quoted string <b>str</b>, this function returns an unquoted,
+ * unescaped string. <b>str</b> must start and end with an unescaped quote. */
+QString
+string_unescape(const QString &str, bool *ok)
+{
+ QString out;
+
+ /* The string must start and end with an unescaped dquote */
+ if (str.length() < 2 || !str.startsWith("\"") || !str.endsWith("\"") ||
+ (str.endsWith("\\\"") && !str.endsWith("\\\\\""))) {
+ if (ok)
+ *ok = false;
+ return QString();
+ }
+ for (int i = 1; i < str.length()-1; i++) {
+ if (str[i] == '\\')
+ i++;
+ out.append(str[i]);
+ }
+ if (ok)
+ *ok = true;
+ return out;
+}
+
+/** Parses a series of space-separated key[=value|="value"] tokens from
+ * <b>str</b> and returns the mappings in a QHash. If <b>str</b> was unable
+ * to be parsed, <b>ok</b> is set to false. */
+QHash<QString,QString>
+string_parse_keyvals(const QString &str, bool *ok)
+{
+ int i, len;
+ bool tmp_ok;
+ QHash<QString,QString> keyvals;
+
+ i = 0;
+ len = str.length();
+ while (i < len && str[i].isSpace())
+ i++; /* Skip initial whitespace */
+ while (i < len) {
+ QString key, val;
+
+ while (i < len && !str[i].isSpace() && str[i] != '=')
+ key.append(str[i++]);
+
+ if (i < len && str[i] == '=') {
+ if (++i < len && str[i] == '\"') {
+ /* The value is wrapped in quotes */
+ val.append(str[i]);
+ while (++i < len) {
+ val.append(str[i]);
+ if (str[i] == '\\') {
+ if (++i == len)
+ goto error;
+ val.append(str[i]);
+ } else if (str[i] == '\"') {
+ i++;
+ break;
+ }
+ }
+ val = string_unescape(val, &tmp_ok);
+ if (!tmp_ok)
+ goto error;
+ keyvals.insert(key, val);
+ } else {
+ /* The value was not wrapped in quotes */
+ while (i < len && !str[i].isSpace())
+ val.append(str[i++]);
+ keyvals.insert(key, val);
+ }
+ } else {
+ /* The key had no value */
+ keyvals.insert(key, QString(""));
+ }
+ while (i < len && str[i].isSpace())
+ i++;
+ }
+ if (ok)
+ *ok = true;
+ return keyvals;
+
+error:
+ if (ok)
+ *ok = false;
+ return QHash<QString,QString>();
+}
+
+/** Parses a series of command line arguments from <b>str</b>. If <b>str</b>
+ * was unable to be parsed, <b>ok</b> is set to false. */
+QStringList
+string_parse_arguments(const QString &str, bool *ok)
+{
+ QStringList args;
+ int i, len;
+ bool tmp_ok;
+
+ i = 0;
+ len = str.length();
+ while (i < len && str[i].isSpace())
+ i++; /* Skip initial whitespace */
+ while (i < len) {
+ QString arg;
+
+ if (str[i] == '\"') {
+ /* The value is wrapped in quotes */
+ arg.append(str[i]);
+ while (++i < len) {
+ arg.append(str[i]);
+ if (str[i] == '\\') {
+ if (++i == len)
+ goto error;
+ arg.append(str[i]);
+ } else if (str[i] == '\"') {
+ i++;
+ break;
+ }
+ }
+ arg = string_unescape(arg, &tmp_ok);
+ if (!tmp_ok)
+ goto error;
+ args << arg;
+ } else {
+ /* The value was not wrapped in quotes */
+ while (i < len && !str[i].isSpace())
+ arg.append(str[i++]);
+ args << arg;
+ }
+ while (i < len && str[i].isSpace())
+ i++;
+ }
+
+ if (ok)
+ *ok = true;
+ return args;
+
+error:
+ if (ok)
+ *ok = false;
+ return QStringList();
+}
+
+/** Formats the list of command line arguments in <b>args</b> as a string.
+ * Arguments that contain ' ', '\', or '"' tokens will be escaped and
+ * wrapped in double quotes. */
+QString
+string_format_arguments(const QStringList &args)
+{
+ QStringList out;
+ foreach (QString arg, args) {
+ if (arg.contains("\"") || arg.contains("\\") || arg.contains(" "))
+ out << string_escape(arg);
+ else
+ out << arg;
+ }
+ return out.join(" ");
+}
+
+/** Returns true if <b>str</b> is a valid hexademical string. Returns false
+ * otherwise. */
+bool
+string_is_hex(const QString &str)
+{
+ for (int i = 0; i < str.length(); i++) {
+ char c = str[i].toUpper().toAscii();
+ if ((c < 'A' || c > 'F') && (c < '0' || c > '9'))
+ return false;
+ }
+ return true;
+}
+
+/** Returns a human-readable description of the time elapsed given by
+ * <b>seconds</b>, broken down into days, hours, minutes and seconds. */
+QString
+string_format_uptime(quint64 seconds)
+{
+ QString uptime;
+ int secs = (seconds % 60);
+ int mins = (seconds / 60 % 60);
+ int hours = (seconds / 3600 % 24);
+ int days = (seconds / 86400);
+
+ if (days)
+ uptime += qApp->translate("stringutil.h", "%1 days ").arg(days);
+ if (hours)
+ uptime += qApp->translate("stringutil.h", "%1 hours ").arg(hours);
+ if (mins)
+ uptime += qApp->translate("stringutil.h", "%1 mins ").arg(mins);
+ if (secs)
+ uptime += qApp->translate("stringutil.h", "%1 secs").arg(secs);
+
+ return uptime;
+}
+
+/** Returns a string representation of <b>date</b> formatted according to
+ * "yyyy-MM-dd HH:mm:ss". */
+QString
+string_format_datetime(const QDateTime &date)
+{
+ return date.toString("yyyy-MM-dd HH:mm:ss");
+}
+
+/** Returns a string representation of <b>bytes</b> with the appropriate
+ * suffix of either "B/s", "KB/s", "MB/s" or "GB/s". */
+QString
+string_format_bandwidth(quint64 bytes)
+{
+ if (bytes < 1024)
+ return qApp->translate("stringutil.h", "%1 B/s").arg(bytes);
+ if (bytes < 1048576)
+ return qApp->translate("stringutil.h", "%1 KB/s").arg(bytes/1024.0, 0, 'f', 2);
+ if (bytes < 1073741824)
+ return qApp->translate("stringutil.h", "%1 MB/s").arg(bytes/1048576.0, 0, 'f', 2);
+
+ return qApp->translate("stringutil.h", "%1 GB/s").arg(bytes/1073741824.0, 0, 'f', 2);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/stringutil.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/stringutil.h
new file mode 100644
index 0000000..6bba77c
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/stringutil.h
@@ -0,0 +1,91 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 stringutil.h
+** \version $Id: stringutil.h 4085 2009-08-29 18:39:35Z edmanm $
+** \brief Common string manipulation functions
+*/
+
+#ifndef _STRINGUTIL_H
+#define _STRINGUTIL_H
+
+#include <QStringList>
+#include <QHash>
+#include <QDateTime>
+
+
+/** Creates a QStringList from the array of C strings. */
+QStringList char_array_to_stringlist(char **arr, int len);
+
+/** Ensures all characters in str are in validChars. If a character appears
+ * in str but not in validChars, it will be removed and the resulting
+ * string returned. */
+QString ensure_valid_chars(const QString &str, const QString &validChars);
+
+/** Scrubs an email address by replacing "@" with " at " and "." with " dot ". */
+QString scrub_email_addr(const QString &email);
+
+/** Conditionally assigns errmsg to string if str is not null and returns
+ * false. */
+bool err(QString *str, const QString &errmsg);
+
+/** Wraps <b>str</b> at <b>width</b> characters wide, using <b>sep</b> as the
+ * word separator (" ", for example), and placing the line ending <b>le</b> at
+ * the end of each line, except the last.*/
+QString string_wrap(const QString &str, int width,
+ const QString &sep = QString(" "),
+ const QString &le = QString("\n"));
+
+/** Encodes the bytes in <b>buf</b> as an uppercase hexadecimal string and
+ * 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);
+
+/** Given a string <b>str</b>, this function returns a quoted string with all
+ * '"' and '\' characters escaped with a single '\'. */
+QString string_escape(const QString &str);
+
+/** Given a quoted string <b>str</b>, this function returns an unquoted,
+ * unescaped string. <b>str</b> must start and end with an unescaped quote. */
+QString string_unescape(const QString &str, bool *ok = 0);
+
+/** Parses a series of space-separated key[=value|="value"] tokens from
+ * <b>str</b> and returns the mappings in a QHash. If <b>str</b> was unable
+ * to be parsed, <b>ok</b> is set to false. */
+QHash<QString,QString> string_parse_keyvals(const QString &str, bool *ok = 0);
+
+/** Parses a series of command line arguments from <b>str</b>. If <b>str</b>
+ * was unable to be parsed, <b>ok</b> is set to false. */
+QStringList string_parse_arguments(const QString &str, bool *ok = 0);
+
+/** Formats the list of command line arguments in <b>args</b> as a string.
+ * Arguments that contain ' ', '\', or '"' tokens will be escaped and wrapped
+ * in double quotes. */
+QString string_format_arguments(const QStringList &args);
+
+/** Returns true if <b>str</b> is a valid hexademical string. Returns false
+ * otherwise. */
+bool string_is_hex(const QString &str);
+
+/** Returns a human-readable description of the time elapsed given by
+ * <b>seconds</b>, broken down into days, hours, minutes and seconds. */
+QString string_format_uptime(quint64 seconds);
+
+/** Returns a string representation of <b>date</b> formatted according to
+ * "yyyy-MM-dd HH:mm:ss". */
+QString string_format_datetime(const QDateTime &date);
+
+/** Returns a string representation of <b>bytes</b> with the appropriate
+ * (localized) suffix of either "B/s", "KB/s", "MB/s" or "GB/s". */
+QString string_format_bandwidth(quint64 bytes);
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/win32.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/win32.cpp
new file mode 100644
index 0000000..54df577
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/win32.cpp
@@ -0,0 +1,272 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 win32.cpp
+** \version $Id: win32.cpp 4294 2010-05-18 03:58:45Z edmanm $
+** \brief Win32-specific functions
+*/
+
+#include "win32.h"
+
+#include <QDir>
+#include <QLibrary>
+#include <QtDebug>
+
+#include <tlhelp32.h>
+#include <shlobj.h>
+
+#if defined(UNICODE)
+/* Force the ascii verisons of these functions, so we can run on Win98. We
+ * don't pass any Unicode strings to these functions anyway. */
+#undef PROCESSENTRY32
+#undef LPPROCESSENTRY32
+#undef Process32First
+#undef Process32Next
+#endif
+
+/* Load the tool help functions dynamically, since they don't exist on
+ * Windows NT 4.0 */
+typedef HANDLE (WINAPI *CreateToolhelp32Snapshot_fn)(DWORD, DWORD);
+typedef BOOL (WINAPI *Process32First_fn)(HANDLE, LPPROCESSENTRY32);
+typedef BOOL (WINAPI *Process32Next_fn)(HANDLE, LPPROCESSENTRY32);
+
+
+/** Finds the location of the "special" Windows folder using the given CSIDL
+ * value. If the folder cannot be found, the given default path is used. */
+QString
+win32_get_folder_location(int folder, QString defaultPath)
+{
+ TCHAR path[MAX_PATH+1];
+ LPITEMIDLIST idl;
+ IMalloc *m;
+ HRESULT result;
+
+ /* XXX: It would probably be a good idea to replace this function with simple
+ * calls to QDesktopServices::storageLocation(). Note that it returns the
+ * "Local Settings" application data directory though, so our installers
+ * would need to be updated as well.
+ */
+
+ /* Find the location of %PROGRAMFILES% */
+ if (SUCCEEDED(SHGetSpecialFolderLocation(NULL, folder, &idl))) {
+ /* Get the path from the IDL */
+ result = SHGetPathFromIDList(idl, path);
+ SHGetMalloc(&m);
+ if (m) {
+ m->Release();
+ }
+ if (SUCCEEDED(result)) {
+#if defined(UNICODE)
+ return QString::fromUtf16(static_cast<const ushort *>(path));
+#else
+ return QString::fromLocal8Bit(static_cast<const char *>(path));
+#endif
+ }
+ }
+ return defaultPath;
+}
+
+/** Gets the location of the user's %PROGRAMFILES% folder. */
+QString
+win32_program_files_folder()
+{
+ return win32_get_folder_location(
+ CSIDL_PROGRAM_FILES, QDir::rootPath() + "\\Program Files");
+}
+
+/** Gets the location of the user's %APPDATA% folder. */
+QString
+win32_app_data_folder()
+{
+ return win32_get_folder_location(
+ CSIDL_APPDATA, QDir::homePath() + "\\Application Data");
+}
+
+/** Returns the value in keyName at keyLocation.
+ * Returns an empty QString if the keyName doesn't exist */
+QString
+win32_registry_get_key_value(QString keyLocation, QString keyName)
+{
+ HKEY key;
+ char data[255] = {0};
+ DWORD size = sizeof(data);
+
+ /* Open the key for reading (opens new key if it doesn't exist) */
+ if (RegOpenKeyExA(HKEY_CURRENT_USER,
+ qPrintable(keyLocation),
+ 0L, KEY_READ, &key) == ERROR_SUCCESS) {
+
+ /* Key exists, so read the value into data */
+ RegQueryValueExA(key, qPrintable(keyName),
+ NULL, NULL, (LPBYTE)data, &size);
+ }
+
+ /* Close anything that was opened */
+ RegCloseKey(key);
+
+ return QString(data);
+}
+
+/** Creates and/or sets the key to the specified value */
+void
+win32_registry_set_key_value(QString keyLocation, QString keyName, QString keyValue)
+{
+ HKEY key;
+
+ /* Open the key for writing (opens new key if it doesn't exist */
+ if (RegOpenKeyExA(HKEY_CURRENT_USER,
+ qPrintable(keyLocation),
+ 0, KEY_WRITE, &key) != ERROR_SUCCESS) {
+
+ /* Key didn't exist, so write the newly opened key */
+ RegCreateKeyExA(HKEY_CURRENT_USER,
+ qPrintable(keyLocation),
+ 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL,
+ &key, NULL);
+ }
+
+ /* Save the value in the key */
+ RegSetValueExA(key, qPrintable(keyName), 0, REG_SZ,
+ (BYTE *)qPrintable(keyValue),
+ (DWORD)keyValue.length() + 1); // include null terminator
+
+ /* Close the key */
+ RegCloseKey(key);
+}
+
+/** Removes the key from the registry if it exists */
+void
+win32_registry_remove_key(QString keyLocation, QString keyName)
+{
+ HKEY key;
+
+ /* Open the key for writing (opens new key if it doesn't exist */
+ if (RegOpenKeyExA(HKEY_CURRENT_USER,
+ qPrintable(keyLocation),
+ 0, KEY_SET_VALUE, &key) == ERROR_SUCCESS) {
+
+ /* Key exists so delete it */
+ RegDeleteValueA(key, qPrintable(keyName));
+ }
+
+ /* Close anything that was opened */
+ RegCloseKey(key);
+}
+
+/**
+ * Callback for EnumThreadWindows which sends the WM_QUIT message
+ */
+BOOL CALLBACK
+quitWindowCallback(HWND hwnd, LPARAM targetPID)
+{
+ DWORD hwndPID = 0;
+
+ /* If the process ID for hwnd matches the target PID, post
+ WM_QUIT to the window */
+ GetWindowThreadProcessId(hwnd, &hwndPID);
+ if (hwndPID == (DWORD)targetPID)
+ PostMessage(hwnd, WM_QUIT, 0, (LPARAM)NULL);
+ return TRUE;
+}
+
+/**
+ * Close process with the specified PID. Sends WM_QUIT to all
+ * top-level windows.
+ */
+void
+win32_end_process_by_pid(DWORD pid)
+{
+ /* Send WM_QUIT to all windows */
+ EnumWindows(&quitWindowCallback, (LPARAM)pid);
+ /* At this point we could kill the main thread, but how do we find
+ the ID of the main thread? We can find the ID of all threads
+ but killing them all seems to cause a problem for Firefox */
+ //PostThreadMessage(thread.th32ThreadID, WM_CLOSE, 0, (LPARAM)NULL);
+}
+
+/**
+ * Close all processes started from the specified filename. Sends
+ * WM_QUIT to all top-level windows. Filename should be given in
+ * lowercase, and comparison is case insensitive. Note: the MSDN
+ * documentation for WM_QUIT states that the message should not be
+ * sent by PostMessage(). However, sending WM_CLOSE leaves Firefox
+ * running, whereas WM_QUIT seems to work.
+ */
+void
+win32_end_process_by_filename(QString filename)
+{
+ /* Get list of running processes */
+ QHash<qint64, QString> procList = win32_process_list();
+
+ /* On old versions of Windows win32_process_list() will return
+ an empty list. In this case, just keep Vidalia open */
+ if (procList.isEmpty()) {
+ return;
+ }
+
+ /* Loop over all processes */
+ QHashIterator<qint64, QString> i(procList);
+ while (i.hasNext()) {
+ i.next();
+ if (i.value().toLower() == filename) {
+ /* Kill this process */
+ win32_end_process_by_pid((DWORD)i.key());
+ }
+ }
+}
+
+/** Returns a list of all currently active processes, including their pid
+ * and exe filename. */
+QHash<qint64, QString>
+win32_process_list()
+{
+ QHash<qint64, QString> procList;
+ CreateToolhelp32Snapshot_fn pCreateToolhelp32Snapshot;
+ Process32First_fn pProcess32First;
+ Process32Next_fn pProcess32Next;
+ HANDLE hSnapshot;
+ PROCESSENTRY32 proc;
+ QString exeFile;
+ qint64 pid;
+
+ /* Load the tool help functions */
+ pCreateToolhelp32Snapshot =
+ (CreateToolhelp32Snapshot_fn)QLibrary::resolve("kernel32", "CreateToolhelp32Snapshot");
+ pProcess32First = (Process32First_fn)QLibrary::resolve("kernel32", "Process32First");
+ pProcess32Next = (Process32Next_fn)QLibrary::resolve("kernel32", "Process32Next");
+
+ if (!pCreateToolhelp32Snapshot || !pProcess32First || !pProcess32Next) {
+ qWarning("Unable to load tool help functions. Running process information "
+ "will be unavailable.");
+ return QHash<qint64, QString>();
+ }
+
+ /* Create a snapshot of all active processes */
+ hSnapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+ if (hSnapshot != INVALID_HANDLE_VALUE) {
+ proc.dwSize = sizeof(PROCESSENTRY32);
+
+ /* Iterate through all the processes in the snapshot */
+ if (pProcess32First(hSnapshot, &proc)) {
+ do {
+ /* Extract the PID and exe filename from the process record */
+ pid = (qint64)proc.th32ProcessID;
+ exeFile = QString::fromAscii((const char *)proc.szExeFile);
+
+ /* Add this process to our list */
+ procList.insert(pid, exeFile);
+ } while (pProcess32Next(hSnapshot, &proc));
+ }
+ CloseHandle(hSnapshot);
+ }
+ return procList;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/win32.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/win32.h
new file mode 100644
index 0000000..5d740c1
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/win32.h
@@ -0,0 +1,56 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 win32.h
+** \version $Id: win32.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Win32-specific functions
+*/
+
+#ifndef _WIN32_H
+#define _WIN32_H
+
+#include <QHash>
+#include <QString>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+/** Retrieves the location of the user's %PROGRAMFILES% folder. */
+QString win32_program_files_folder();
+
+/** Retrieves the location of the user's %APPDATA% folder. */
+QString win32_app_data_folder();
+
+/** Returns value of keyName or empty QString if keyName doesn't exist */
+QString win32_registry_get_key_value(QString keyLocation, QString keyName);
+
+/** Creates and/or sets the key to the specified value */
+void win32_registry_set_key_value(QString keyLocation, QString keyName, QString keyValue);
+
+/** Removes the key from the registry if it exists */
+void win32_registry_remove_key(QString keyLocation, QString keyName);
+
+/** Returns a list of all currently active processes, including their pid
+ * and exe filename. */
+QHash<qint64, QString> win32_process_list();
+
+/**
+ * Close all processes started from the specified filename. Sends
+ * WM_QUIT to all top-level windows. Filename should be given in
+ * lowercase, and comparison is case insensitive. Note: the MSDN
+ * documentation for WM_QUIT states that the message should not be
+ * sent by PostMessage(). However, sending WM_CLOSE leaves Firefox
+ * running, whereas WM_QUIT seems to work.
+ */
+void win32_end_process_by_filename(QString filename);
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/zconf.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/zconf.h
new file mode 100644
index 0000000..b19bfcf
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/zconf.h
@@ -0,0 +1,332 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id: zconf.h 1591 2007-01-15 23:25:55Z edmanm $ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ */
+#ifdef Z_PREFIX
+# define deflateInit_ z_deflateInit_
+# define deflate z_deflate
+# define deflateEnd z_deflateEnd
+# define inflateInit_ z_inflateInit_
+# define inflate z_inflate
+# define inflateEnd z_inflateEnd
+# define deflateInit2_ z_deflateInit2_
+# define deflateSetDictionary z_deflateSetDictionary
+# define deflateCopy z_deflateCopy
+# define deflateReset z_deflateReset
+# define deflateParams z_deflateParams
+# define deflateBound z_deflateBound
+# define deflatePrime z_deflatePrime
+# define inflateInit2_ z_inflateInit2_
+# define inflateSetDictionary z_inflateSetDictionary
+# define inflateSync z_inflateSync
+# define inflateSyncPoint z_inflateSyncPoint
+# define inflateCopy z_inflateCopy
+# define inflateReset z_inflateReset
+# define inflateBack z_inflateBack
+# define inflateBackEnd z_inflateBackEnd
+# define compress z_compress
+# define compress2 z_compress2
+# define compressBound z_compressBound
+# define uncompress z_uncompress
+# define adler32 z_adler32
+# define crc32 z_crc32
+# define get_crc_table z_get_crc_table
+# define zError z_zError
+
+# define alloc_func z_alloc_func
+# define free_func z_free_func
+# define in_func z_in_func
+# define out_func z_out_func
+# define Byte z_Byte
+# define uInt z_uInt
+# define uLong z_uLong
+# define Bytef z_Bytef
+# define charf z_charf
+# define intf z_intf
+# define uIntf z_uIntf
+# define uLongf z_uLongf
+# define voidpf z_voidpf
+# define voidp z_voidp
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+# define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+# define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+# define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+# ifndef WIN32
+# define WIN32
+# endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+# ifndef SYS16BIT
+# define SYS16BIT
+# endif
+# endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+# define MAXSEG_64K
+#endif
+#ifdef MSDOS
+# define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+# ifndef STDC
+# define STDC
+# endif
+# if __STDC_VERSION__ >= 199901L
+# ifndef STDC99
+# define STDC99
+# endif
+# endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+# define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+# define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+# define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+# define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
+# define STDC
+#endif
+
+#ifndef STDC
+# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+# define const /* note: need a more gentle solution here */
+# endif
+#endif
+
+/* Some Mac compilers merge all .h files incorrectly: */
+#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
+# define NO_DUMMY_DECL
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+# ifdef MAXSEG_64K
+# define MAX_MEM_LEVEL 8
+# else
+# define MAX_MEM_LEVEL 9
+# endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+# define MAX_WBITS 15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+ (1 << (windowBits+2)) + (1 << (memLevel+9))
+ that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+ make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+ The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*/
+
+ /* Type declarations */
+
+#ifndef OF /* function prototypes */
+# ifdef STDC
+# define OF(args) args
+# else
+# define OF(args) ()
+# endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+# if defined(M_I86SM) || defined(M_I86MM)
+ /* MSC small or medium model */
+# define SMALL_MEDIUM
+# ifdef _MSC_VER
+# define FAR _far
+# else
+# define FAR far
+# endif
+# endif
+# if (defined(__SMALL__) || defined(__MEDIUM__))
+ /* Turbo C small or medium model */
+# define SMALL_MEDIUM
+# ifdef __BORLANDC__
+# define FAR _far
+# else
+# define FAR far
+# endif
+# endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+ /* If building or using zlib as a DLL, define ZLIB_DLL.
+ * This is not mandatory, but it offers a little performance increase.
+ */
+# ifdef ZLIB_DLL
+# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+# ifdef ZLIB_INTERNAL
+# define ZEXTERN extern __declspec(dllexport)
+# else
+# define ZEXTERN extern __declspec(dllimport)
+# endif
+# endif
+# endif /* ZLIB_DLL */
+ /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+ * define ZLIB_WINAPI.
+ * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+ */
+# ifdef ZLIB_WINAPI
+# ifdef FAR
+# undef FAR
+# endif
+# include <windows.h>
+ /* No need for _export, use ZLIB.DEF instead. */
+ /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+# define ZEXPORT WINAPI
+# ifdef WIN32
+# define ZEXPORTVA WINAPIV
+# else
+# define ZEXPORTVA FAR CDECL
+# endif
+# endif
+#endif
+
+#if defined (__BEOS__)
+# ifdef ZLIB_DLL
+# ifdef ZLIB_INTERNAL
+# define ZEXPORT __declspec(dllexport)
+# define ZEXPORTVA __declspec(dllexport)
+# else
+# define ZEXPORT __declspec(dllimport)
+# define ZEXPORTVA __declspec(dllimport)
+# endif
+# endif
+#endif
+
+#ifndef ZEXTERN
+# define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+# define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+# define ZEXPORTVA
+#endif
+
+#ifndef FAR
+# define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char Byte; /* 8 bits */
+#endif
+typedef unsigned int uInt; /* 16 bits or more */
+typedef unsigned long uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+ /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+# define Bytef Byte FAR
+#else
+ typedef Byte FAR Bytef;
+#endif
+typedef char FAR charf;
+typedef int FAR intf;
+typedef uInt FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+ typedef void const *voidpc;
+ typedef void FAR *voidpf;
+ typedef void *voidp;
+#else
+ typedef Byte const *voidpc;
+ typedef Byte FAR *voidpf;
+ typedef Byte *voidp;
+#endif
+
+#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */
+# include <sys/types.h> /* for off_t */
+# include <unistd.h> /* for SEEK_* and off_t */
+# ifdef VMS
+# include <unixio.h> /* for off_t */
+# endif
+# define z_off_t off_t
+#endif
+#ifndef SEEK_SET
+# define SEEK_SET 0 /* Seek from beginning of file. */
+# define SEEK_CUR 1 /* Seek from current position. */
+# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
+#endif
+#ifndef z_off_t
+# define z_off_t long
+#endif
+
+#if defined(__OS400__)
+# define NO_vsnprintf
+#endif
+
+#if defined(__MVS__)
+# define NO_vsnprintf
+# ifdef FAR
+# undef FAR
+# endif
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+# pragma map(deflateInit_,"DEIN")
+# pragma map(deflateInit2_,"DEIN2")
+# pragma map(deflateEnd,"DEEND")
+# pragma map(deflateBound,"DEBND")
+# pragma map(inflateInit_,"ININ")
+# pragma map(inflateInit2_,"ININ2")
+# pragma map(inflateEnd,"INEND")
+# pragma map(inflateSync,"INSY")
+# pragma map(inflateSetDictionary,"INSEDI")
+# pragma map(compressBound,"CMBND")
+# pragma map(inflate_table,"INTABL")
+# pragma map(inflate_fast,"INFA")
+# pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/zlib.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/zlib.h
new file mode 100644
index 0000000..0228179
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/common/zlib.h
@@ -0,0 +1,1357 @@
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+ version 1.2.3, July 18th, 2005
+
+ Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Jean-loup Gailly Mark Adler
+ jloup at gzip.org madler at alumni.caltech.edu
+
+
+ The data format used by the zlib library is described by RFCs (Request for
+ Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
+ (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
+*/
+
+#ifndef ZLIB_H
+#define ZLIB_H
+
+#include "zconf.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ZLIB_VERSION "1.2.3"
+#define ZLIB_VERNUM 0x1230
+
+/*
+ The 'zlib' compression library provides in-memory compression and
+ decompression functions, including integrity checks of the uncompressed
+ data. This version of the library supports only one compression method
+ (deflation) but other algorithms will be added later and will have the same
+ stream interface.
+
+ Compression can be done in a single step if the buffers are large
+ enough (for example if an input file is mmap'ed), or can be done by
+ repeated calls of the compression function. In the latter case, the
+ application must provide more input and/or consume the output
+ (providing more output space) before each call.
+
+ The compressed data format used by default by the in-memory functions is
+ the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
+ around a deflate stream, which is itself documented in RFC 1951.
+
+ The library also supports reading and writing files in gzip (.gz) format
+ with an interface similar to that of stdio using the functions that start
+ with "gz". The gzip format is different from the zlib format. gzip is a
+ gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
+
+ This library can optionally read and write gzip streams in memory as well.
+
+ The zlib format was designed to be compact and fast for use in memory
+ and on communications channels. The gzip format was designed for single-
+ file compression on file systems, has a larger header than zlib to maintain
+ directory information, and uses a different, slower check method than zlib.
+
+ The library does not install any signal handler. The decoder checks
+ the consistency of the compressed data, so the library should never
+ crash even in case of corrupted input.
+*/
+
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+typedef void (*free_func) OF((voidpf opaque, voidpf address));
+
+struct internal_state;
+
+typedef struct z_stream_s {
+ Bytef *next_in; /* next input byte */
+ uInt avail_in; /* number of bytes available at next_in */
+ uLong total_in; /* total nb of input bytes read so far */
+
+ Bytef *next_out; /* next output byte should be put there */
+ uInt avail_out; /* remaining free space at next_out */
+ uLong total_out; /* total nb of bytes output so far */
+
+ char *msg; /* last error message, NULL if no error */
+ struct internal_state FAR *state; /* not visible by applications */
+
+ alloc_func zalloc; /* used to allocate the internal state */
+ free_func zfree; /* used to free the internal state */
+ voidpf opaque; /* private data object passed to zalloc and zfree */
+
+ int data_type; /* best guess about the data type: binary or text */
+ uLong adler; /* adler32 value of the uncompressed data */
+ uLong reserved; /* reserved for future use */
+} z_stream;
+
+typedef z_stream FAR *z_streamp;
+
+/*
+ gzip header information passed to and from zlib routines. See RFC 1952
+ for more details on the meanings of these fields.
+*/
+typedef struct gz_header_s {
+ int text; /* true if compressed data believed to be text */
+ uLong time; /* modification time */
+ int xflags; /* extra flags (not used when writing a gzip file) */
+ int os; /* operating system */
+ Bytef *extra; /* pointer to extra field or Z_NULL if none */
+ uInt extra_len; /* extra field length (valid if extra != Z_NULL) */
+ uInt extra_max; /* space at extra (only when reading header) */
+ Bytef *name; /* pointer to zero-terminated file name or Z_NULL */
+ uInt name_max; /* space at name (only when reading header) */
+ Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */
+ uInt comm_max; /* space at comment (only when reading header) */
+ int hcrc; /* true if there was or will be a header crc */
+ int done; /* true when done reading gzip header (not used
+ when writing a gzip file) */
+} gz_header;
+
+typedef gz_header FAR *gz_headerp;
+
+/*
+ The application must update next_in and avail_in when avail_in has
+ dropped to zero. It must update next_out and avail_out when avail_out
+ has dropped to zero. The application must initialize zalloc, zfree and
+ opaque before calling the init function. All other fields are set by the
+ compression library and must not be updated by the application.
+
+ The opaque value provided by the application will be passed as the first
+ parameter for calls of zalloc and zfree. This can be useful for custom
+ memory management. The compression library attaches no meaning to the
+ opaque value.
+
+ zalloc must return Z_NULL if there is not enough memory for the object.
+ If zlib is used in a multi-threaded application, zalloc and zfree must be
+ thread safe.
+
+ On 16-bit systems, the functions zalloc and zfree must be able to allocate
+ exactly 65536 bytes, but will not be required to allocate more than this
+ if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
+ pointers returned by zalloc for objects of exactly 65536 bytes *must*
+ have their offset normalized to zero. The default allocation function
+ provided by this library ensures this (see zutil.c). To reduce memory
+ requirements and avoid any allocation of 64K objects, at the expense of
+ compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
+
+ The fields total_in and total_out can be used for statistics or
+ progress reports. After compression, total_in holds the total size of
+ the uncompressed data and may be saved for use in the decompressor
+ (particularly if the decompressor wants to decompress everything in
+ a single step).
+*/
+
+ /* constants */
+
+#define Z_NO_FLUSH 0
+#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
+#define Z_SYNC_FLUSH 2
+#define Z_FULL_FLUSH 3
+#define Z_FINISH 4
+#define Z_BLOCK 5
+/* Allowed flush values; see deflate() and inflate() below for details */
+
+#define Z_OK 0
+#define Z_STREAM_END 1
+#define Z_NEED_DICT 2
+#define Z_ERRNO (-1)
+#define Z_STREAM_ERROR (-2)
+#define Z_DATA_ERROR (-3)
+#define Z_MEM_ERROR (-4)
+#define Z_BUF_ERROR (-5)
+#define Z_VERSION_ERROR (-6)
+/* Return codes for the compression/decompression functions. Negative
+ * values are errors, positive values are used for special but normal events.
+ */
+
+#define Z_NO_COMPRESSION 0
+#define Z_BEST_SPEED 1
+#define Z_BEST_COMPRESSION 9
+#define Z_DEFAULT_COMPRESSION (-1)
+/* compression levels */
+
+#define Z_FILTERED 1
+#define Z_HUFFMAN_ONLY 2
+#define Z_RLE 3
+#define Z_FIXED 4
+#define Z_DEFAULT_STRATEGY 0
+/* compression strategy; see deflateInit2() below for details */
+
+#define Z_BINARY 0
+#define Z_TEXT 1
+#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */
+#define Z_UNKNOWN 2
+/* Possible values of the data_type field (though see inflate()) */
+
+#define Z_DEFLATED 8
+/* The deflate compression method (the only one supported in this version) */
+
+#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */
+
+#define zlib_version zlibVersion()
+/* for compatibility with versions < 1.0.2 */
+
+ /* basic functions */
+
+ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+ If the first character differs, the library code actually used is
+ not compatible with the zlib.h header file used by the application.
+ This check is automatically made by deflateInit and inflateInit.
+ */
+
+/*
+ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+
+ Initializes the internal stream state for compression. The fields
+ zalloc, zfree and opaque must be initialized before by the caller.
+ If zalloc and zfree are set to Z_NULL, deflateInit updates them to
+ use default allocation functions.
+
+ The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+ 1 gives best speed, 9 gives best compression, 0 gives no compression at
+ all (the input data is simply copied a block at a time).
+ Z_DEFAULT_COMPRESSION requests a default compromise between speed and
+ compression (currently equivalent to level 6).
+
+ deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_STREAM_ERROR if level is not a valid compression level,
+ Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+ with the version assumed by the caller (ZLIB_VERSION).
+ msg is set to null if there is no error message. deflateInit does not
+ perform any compression: this will be done by deflate().
+*/
+
+
+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+/*
+ deflate compresses as much data as possible, and stops when the input
+ buffer becomes empty or the output buffer becomes full. It may introduce some
+ output latency (reading input without producing any output) except when
+ forced to flush.
+
+ The detailed semantics are as follows. deflate performs one or both of the
+ following actions:
+
+ - Compress more input starting at next_in and update next_in and avail_in
+ accordingly. If not all input can be processed (because there is not
+ enough room in the output buffer), next_in and avail_in are updated and
+ processing will resume at this point for the next call of deflate().
+
+ - Provide more output starting at next_out and update next_out and avail_out
+ accordingly. This action is forced if the parameter flush is non zero.
+ Forcing flush frequently degrades the compression ratio, so this parameter
+ should be set only when necessary (in interactive applications).
+ Some output may be provided even if flush is not set.
+
+ Before the call of deflate(), the application should ensure that at least
+ one of the actions is possible, by providing more input and/or consuming
+ more output, and updating avail_in or avail_out accordingly; avail_out
+ should never be zero before the call. The application can consume the
+ compressed output when it wants, for example when the output buffer is full
+ (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
+ and with zero avail_out, it must be called again after making room in the
+ output buffer because there might be more output pending.
+
+ Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
+ decide how much data to accumualte before producing output, in order to
+ maximize compression.
+
+ If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+ flushed to the output buffer and the output is aligned on a byte boundary, so
+ that the decompressor can get all input data available so far. (In particular
+ avail_in is zero after the call if enough output space has been provided
+ before the call.) Flushing may degrade compression for some compression
+ algorithms and so it should be used only when necessary.
+
+ If flush is set to Z_FULL_FLUSH, all output is flushed as with
+ Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+ restart from this point if previous compressed data has been damaged or if
+ random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
+ compression.
+
+ If deflate returns with avail_out == 0, this function must be called again
+ with the same value of the flush parameter and more output space (updated
+ avail_out), until the flush is complete (deflate returns with non-zero
+ avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+ avail_out is greater than six to avoid repeated flush markers due to
+ avail_out == 0 on return.
+
+ If the parameter flush is set to Z_FINISH, pending input is processed,
+ pending output is flushed and deflate returns with Z_STREAM_END if there
+ was enough output space; if deflate returns with Z_OK, this function must be
+ called again with Z_FINISH and more output space (updated avail_out) but no
+ more input data, until it returns with Z_STREAM_END or an error. After
+ deflate has returned Z_STREAM_END, the only possible operations on the
+ stream are deflateReset or deflateEnd.
+
+ Z_FINISH can be used immediately after deflateInit if all the compression
+ is to be done in a single step. In this case, avail_out must be at least
+ the value returned by deflateBound (see below). If deflate does not return
+ Z_STREAM_END, then it must be called again as described above.
+
+ deflate() sets strm->adler to the adler32 checksum of all input read
+ so far (that is, total_in bytes).
+
+ deflate() may update strm->data_type if it can make a good guess about
+ the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
+ binary. This field is only for information purposes and does not affect
+ the compression algorithm in any manner.
+
+ deflate() returns Z_OK if some progress has been made (more input
+ processed or more output produced), Z_STREAM_END if all input has been
+ consumed and all output has been produced (only when flush is set to
+ Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
+ if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
+ (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
+ fatal, and deflate() can be called again with more input and more output
+ space to continue compressing.
+*/
+
+
+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+/*
+ All dynamically allocated data structures for this stream are freed.
+ This function discards any unprocessed input and does not flush any
+ pending output.
+
+ deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+ stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+ prematurely (some input or output was discarded). In the error case,
+ msg may be set but then points to a static string (which must not be
+ deallocated).
+*/
+
+
+/*
+ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+
+ Initializes the internal stream state for decompression. The fields
+ next_in, avail_in, zalloc, zfree and opaque must be initialized before by
+ the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
+ value depends on the compression method), inflateInit determines the
+ compression method from the zlib header and allocates all data structures
+ accordingly; otherwise the allocation will be deferred to the first call of
+ inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to
+ use default allocation functions.
+
+ inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+ version assumed by the caller. msg is set to null if there is no error
+ message. inflateInit does not perform any decompression apart from reading
+ the zlib header if present: this will be done by inflate(). (So next_in and
+ avail_in may be modified, but next_out and avail_out are unchanged.)
+*/
+
+
+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+/*
+ inflate decompresses as much data as possible, and stops when the input
+ buffer becomes empty or the output buffer becomes full. It may introduce
+ some output latency (reading input without producing any output) except when
+ forced to flush.
+
+ The detailed semantics are as follows. inflate performs one or both of the
+ following actions:
+
+ - Decompress more input starting at next_in and update next_in and avail_in
+ accordingly. If not all input can be processed (because there is not
+ enough room in the output buffer), next_in is updated and processing
+ will resume at this point for the next call of inflate().
+
+ - Provide more output starting at next_out and update next_out and avail_out
+ accordingly. inflate() provides as much output as possible, until there
+ is no more input data or no more space in the output buffer (see below
+ about the flush parameter).
+
+ Before the call of inflate(), the application should ensure that at least
+ one of the actions is possible, by providing more input and/or consuming
+ more output, and updating the next_* and avail_* values accordingly.
+ The application can consume the uncompressed output when it wants, for
+ example when the output buffer is full (avail_out == 0), or after each
+ call of inflate(). If inflate returns Z_OK and with zero avail_out, it
+ must be called again after making room in the output buffer because there
+ might be more output pending.
+
+ The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
+ Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
+ output as possible to the output buffer. Z_BLOCK requests that inflate() stop
+ if and when it gets to the next deflate block boundary. When decoding the
+ zlib or gzip format, this will cause inflate() to return immediately after
+ the header and before the first block. When doing a raw inflate, inflate()
+ will go ahead and process the first block, and will return when it gets to
+ the end of that block, or when it runs out of data.
+
+ The Z_BLOCK option assists in appending to or combining deflate streams.
+ Also to assist in this, on return inflate() will set strm->data_type to the
+ number of unused bits in the last byte taken from strm->next_in, plus 64
+ if inflate() is currently decoding the last block in the deflate stream,
+ plus 128 if inflate() returned immediately after decoding an end-of-block
+ code or decoding the complete header up to just before the first byte of the
+ deflate stream. The end-of-block will not be indicated until all of the
+ uncompressed data from that block has been written to strm->next_out. The
+ number of unused bits may in general be greater than seven, except when
+ bit 7 of data_type is set, in which case the number of unused bits will be
+ less than eight.
+
+ inflate() should normally be called until it returns Z_STREAM_END or an
+ error. However if all decompression is to be performed in a single step
+ (a single call of inflate), the parameter flush should be set to
+ Z_FINISH. In this case all pending input is processed and all pending
+ output is flushed; avail_out must be large enough to hold all the
+ uncompressed data. (The size of the uncompressed data may have been saved
+ by the compressor for this purpose.) The next operation on this stream must
+ be inflateEnd to deallocate the decompression state. The use of Z_FINISH
+ is never required, but can be used to inform inflate that a faster approach
+ may be used for the single inflate() call.
+
+ In this implementation, inflate() always flushes as much output as
+ possible to the output buffer, and always uses the faster approach on the
+ first call. So the only effect of the flush parameter in this implementation
+ is on the return value of inflate(), as noted below, or when it returns early
+ because Z_BLOCK is used.
+
+ If a preset dictionary is needed after this call (see inflateSetDictionary
+ below), inflate sets strm->adler to the adler32 checksum of the dictionary
+ chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
+ strm->adler to the adler32 checksum of all output produced so far (that is,
+ total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
+ below. At the end of the stream, inflate() checks that its computed adler32
+ checksum is equal to that saved by the compressor and returns Z_STREAM_END
+ only if the checksum is correct.
+
+ inflate() will decompress and check either zlib-wrapped or gzip-wrapped
+ deflate data. The header type is detected automatically. Any information
+ contained in the gzip header is not retained, so applications that need that
+ information should instead use raw inflate, see inflateInit2() below, or
+ inflateBack() and perform their own processing of the gzip header and
+ trailer.
+
+ inflate() returns Z_OK if some progress has been made (more input processed
+ or more output produced), Z_STREAM_END if the end of the compressed data has
+ been reached and all uncompressed output has been produced, Z_NEED_DICT if a
+ preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
+ corrupted (input stream not conforming to the zlib format or incorrect check
+ value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+ if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
+ Z_BUF_ERROR if no progress is possible or if there was not enough room in the
+ output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
+ inflate() can be called again with more input and more output space to
+ continue decompressing. If Z_DATA_ERROR is returned, the application may then
+ call inflateSync() to look for a good compression block if a partial recovery
+ of the data is desired.
+*/
+
+
+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+/*
+ All dynamically allocated data structures for this stream are freed.
+ This function discards any unprocessed input and does not flush any
+ pending output.
+
+ inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
+ was inconsistent. In the error case, msg may be set but then points to a
+ static string (which must not be deallocated).
+*/
+
+ /* Advanced functions */
+
+/*
+ The following functions are needed only in some special applications.
+*/
+
+/*
+ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
+ int level,
+ int method,
+ int windowBits,
+ int memLevel,
+ int strategy));
+
+ This is another version of deflateInit with more compression options. The
+ fields next_in, zalloc, zfree and opaque must be initialized before by
+ the caller.
+
+ The method parameter is the compression method. It must be Z_DEFLATED in
+ this version of the library.
+
+ The windowBits parameter is the base two logarithm of the window size
+ (the size of the history buffer). It should be in the range 8..15 for this
+ version of the library. Larger values of this parameter result in better
+ compression at the expense of memory usage. The default value is 15 if
+ deflateInit is used instead.
+
+ windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
+ determines the window size. deflate() will then generate raw deflate data
+ with no zlib header or trailer, and will not compute an adler32 check value.
+
+ windowBits can also be greater than 15 for optional gzip encoding. Add
+ 16 to windowBits to write a simple gzip header and trailer around the
+ compressed data instead of a zlib wrapper. The gzip header will have no
+ file name, no extra data, no comment, no modification time (set to zero),
+ no header crc, and the operating system will be set to 255 (unknown). If a
+ gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+
+ The memLevel parameter specifies how much memory should be allocated
+ for the internal compression state. memLevel=1 uses minimum memory but
+ is slow and reduces compression ratio; memLevel=9 uses maximum memory
+ for optimal speed. The default value is 8. See zconf.h for total memory
+ usage as a function of windowBits and memLevel.
+
+ The strategy parameter is used to tune the compression algorithm. Use the
+ value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
+ filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
+ string match), or Z_RLE to limit match distances to one (run-length
+ encoding). Filtered data consists mostly of small values with a somewhat
+ random distribution. In this case, the compression algorithm is tuned to
+ compress them better. The effect of Z_FILTERED is to force more Huffman
+ coding and less string matching; it is somewhat intermediate between
+ Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
+ Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
+ parameter only affects the compression ratio but not the correctness of the
+ compressed output even if it is not set appropriately. Z_FIXED prevents the
+ use of dynamic Huffman codes, allowing for a simpler decoder for special
+ applications.
+
+ deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
+ method). msg is set to null if there is no error message. deflateInit2 does
+ not perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
+ const Bytef *dictionary,
+ uInt dictLength));
+/*
+ Initializes the compression dictionary from the given byte sequence
+ without producing any compressed output. This function must be called
+ immediately after deflateInit, deflateInit2 or deflateReset, before any
+ call of deflate. The compressor and decompressor must use exactly the same
+ dictionary (see inflateSetDictionary).
+
+ The dictionary should consist of strings (byte sequences) that are likely
+ to be encountered later in the data to be compressed, with the most commonly
+ used strings preferably put towards the end of the dictionary. Using a
+ dictionary is most useful when the data to be compressed is short and can be
+ predicted with good accuracy; the data can then be compressed better than
+ with the default empty dictionary.
+
+ Depending on the size of the compression data structures selected by
+ deflateInit or deflateInit2, a part of the dictionary may in effect be
+ discarded, for example if the dictionary is larger than the window size in
+ deflate or deflate2. Thus the strings most likely to be useful should be
+ put at the end of the dictionary, not at the front. In addition, the
+ current implementation of deflate will use at most the window size minus
+ 262 bytes of the provided dictionary.
+
+ Upon return of this function, strm->adler is set to the adler32 value
+ of the dictionary; the decompressor may later use this value to determine
+ which dictionary has been used by the compressor. (The adler32 value
+ applies to the whole dictionary even if only a subset of the dictionary is
+ actually used by the compressor.) If a raw deflate was requested, then the
+ adler32 value is not computed and strm->adler is not set.
+
+ deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+ parameter is invalid (such as NULL dictionary) or the stream state is
+ inconsistent (for example if deflate has already been called for this stream
+ or if the compression method is bsort). deflateSetDictionary does not
+ perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
+ z_streamp source));
+/*
+ Sets the destination stream as a complete copy of the source stream.
+
+ This function can be useful when several compression strategies will be
+ tried, for example when there are several ways of pre-processing the input
+ data with a filter. The streams that will be discarded should then be freed
+ by calling deflateEnd. Note that deflateCopy duplicates the internal
+ compression state which can be quite large, so this strategy is slow and
+ can consume lots of memory.
+
+ deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+ (such as zalloc being NULL). msg is left unchanged in both source and
+ destination.
+*/
+
+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+/*
+ This function is equivalent to deflateEnd followed by deflateInit,
+ but does not free and reallocate all the internal compression state.
+ The stream will keep the same compression level and any other attributes
+ that may have been set by deflateInit2.
+
+ deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent (such as zalloc or state being NULL).
+*/
+
+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+ int level,
+ int strategy));
+/*
+ Dynamically update the compression level and compression strategy. The
+ interpretation of level and strategy is as in deflateInit2. This can be
+ used to switch between compression and straight copy of the input data, or
+ to switch to a different kind of input data requiring a different
+ strategy. If the compression level is changed, the input available so far
+ is compressed with the old level (and may be flushed); the new level will
+ take effect only at the next call of deflate().
+
+ Before the call of deflateParams, the stream state must be set as for
+ a call of deflate(), since the currently available input may have to
+ be compressed and flushed. In particular, strm->avail_out must be non-zero.
+
+ deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
+ stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
+ if strm->avail_out was zero.
+*/
+
+ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
+ int good_length,
+ int max_lazy,
+ int nice_length,
+ int max_chain));
+/*
+ Fine tune deflate's internal compression parameters. This should only be
+ used by someone who understands the algorithm used by zlib's deflate for
+ searching for the best matching string, and even then only by the most
+ fanatic optimizer trying to squeeze out the last compressed bit for their
+ specific input data. Read the deflate.c source code for the meaning of the
+ max_lazy, good_length, nice_length, and max_chain parameters.
+
+ deflateTune() can be called after deflateInit() or deflateInit2(), and
+ returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
+ */
+
+ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
+ uLong sourceLen));
+/*
+ deflateBound() returns an upper bound on the compressed size after
+ deflation of sourceLen bytes. It must be called after deflateInit()
+ or deflateInit2(). This would be used to allocate an output buffer
+ for deflation in a single pass, and so would be called before deflate().
+*/
+
+ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
+ int bits,
+ int value));
+/*
+ deflatePrime() inserts bits in the deflate output stream. The intent
+ is that this function is used to start off the deflate output with the
+ bits leftover from a previous deflate stream when appending to it. As such,
+ this function can only be used for raw deflate, and must be used before the
+ first deflate() call after a deflateInit2() or deflateReset(). bits must be
+ less than or equal to 16, and that many of the least significant bits of
+ value will be inserted in the output.
+
+ deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
+ gz_headerp head));
+/*
+ deflateSetHeader() provides gzip header information for when a gzip
+ stream is requested by deflateInit2(). deflateSetHeader() may be called
+ after deflateInit2() or deflateReset() and before the first call of
+ deflate(). The text, time, os, extra field, name, and comment information
+ in the provided gz_header structure are written to the gzip header (xflag is
+ ignored -- the extra flags are set according to the compression level). The
+ caller must assure that, if not Z_NULL, name and comment are terminated with
+ a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
+ available there. If hcrc is true, a gzip header crc is included. Note that
+ the current versions of the command-line version of gzip (up through version
+ 1.3.x) do not support header crc's, and will report that it is a "multi-part
+ gzip file" and give up.
+
+ If deflateSetHeader is not used, the default gzip header has text false,
+ the time set to zero, and os set to 255, with no extra, name, or comment
+ fields. The gzip header is returned to the default state by deflateReset().
+
+ deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
+ int windowBits));
+
+ This is another version of inflateInit with an extra parameter. The
+ fields next_in, avail_in, zalloc, zfree and opaque must be initialized
+ before by the caller.
+
+ The windowBits parameter is the base two logarithm of the maximum window
+ size (the size of the history buffer). It should be in the range 8..15 for
+ this version of the library. The default value is 15 if inflateInit is used
+ instead. windowBits must be greater than or equal to the windowBits value
+ provided to deflateInit2() while compressing, or it must be equal to 15 if
+ deflateInit2() was not used. If a compressed stream with a larger window
+ size is given as input, inflate() will return with the error code
+ Z_DATA_ERROR instead of trying to allocate a larger window.
+
+ windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
+ determines the window size. inflate() will then process raw deflate data,
+ not looking for a zlib or gzip header, not generating a check value, and not
+ looking for any check values for comparison at the end of the stream. This
+ is for use with other formats that use the deflate compressed data format
+ such as zip. Those formats provide their own check values. If a custom
+ format is developed using the raw deflate format for compressed data, it is
+ recommended that a check value such as an adler32 or a crc32 be applied to
+ the uncompressed data as is done in the zlib, gzip, and zip formats. For
+ most applications, the zlib format should be used as is. Note that comments
+ above on the use in deflateInit2() applies to the magnitude of windowBits.
+
+ windowBits can also be greater than 15 for optional gzip decoding. Add
+ 32 to windowBits to enable zlib and gzip decoding with automatic header
+ detection, or add 16 to decode only the gzip format (the zlib format will
+ return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is
+ a crc32 instead of an adler32.
+
+ inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
+ is set to null if there is no error message. inflateInit2 does not perform
+ any decompression apart from reading the zlib header if present: this will
+ be done by inflate(). (So next_in and avail_in may be modified, but next_out
+ and avail_out are unchanged.)
+*/
+
+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+ const Bytef *dictionary,
+ uInt dictLength));
+/*
+ Initializes the decompression dictionary from the given uncompressed byte
+ sequence. This function must be called immediately after a call of inflate,
+ if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
+ can be determined from the adler32 value returned by that call of inflate.
+ The compressor and decompressor must use exactly the same dictionary (see
+ deflateSetDictionary). For raw inflate, this function can be called
+ immediately after inflateInit2() or inflateReset() and before any call of
+ inflate() to set the dictionary. The application must insure that the
+ dictionary that was used for compression is provided.
+
+ inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+ parameter is invalid (such as NULL dictionary) or the stream state is
+ inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
+ expected one (incorrect adler32 value). inflateSetDictionary does not
+ perform any decompression: this will be done by subsequent calls of
+ inflate().
+*/
+
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+/*
+ Skips invalid compressed data until a full flush point (see above the
+ description of deflate with Z_FULL_FLUSH) can be found, or until all
+ available input is skipped. No output is provided.
+
+ inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
+ if no more input was provided, Z_DATA_ERROR if no flush point has been found,
+ or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
+ case, the application may save the current current value of total_in which
+ indicates where valid compressed data was found. In the error case, the
+ application may repeatedly call inflateSync, providing more input each time,
+ until success or end of the input data.
+*/
+
+ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
+ z_streamp source));
+/*
+ Sets the destination stream as a complete copy of the source stream.
+
+ This function can be useful when randomly accessing a large stream. The
+ first pass through the stream can periodically record the inflate state,
+ allowing restarting inflate at those points when randomly accessing the
+ stream.
+
+ inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+ (such as zalloc being NULL). msg is left unchanged in both source and
+ destination.
+*/
+
+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+/*
+ This function is equivalent to inflateEnd followed by inflateInit,
+ but does not free and reallocate all the internal decompression state.
+ The stream will keep attributes that may have been set by inflateInit2.
+
+ inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent (such as zalloc or state being NULL).
+*/
+
+ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
+ int bits,
+ int value));
+/*
+ This function inserts bits in the inflate input stream. The intent is
+ that this function is used to start inflating at a bit position in the
+ middle of a byte. The provided bits will be used before any bytes are used
+ from next_in. This function should only be used with raw inflate, and
+ should be used before the first inflate() call after inflateInit2() or
+ inflateReset(). bits must be less than or equal to 16, and that many of the
+ least significant bits of value will be inserted in the input.
+
+ inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
+ gz_headerp head));
+/*
+ inflateGetHeader() requests that gzip header information be stored in the
+ provided gz_header structure. inflateGetHeader() may be called after
+ inflateInit2() or inflateReset(), and before the first call of inflate().
+ As inflate() processes the gzip stream, head->done is zero until the header
+ is completed, at which time head->done is set to one. If a zlib stream is
+ being decoded, then head->done is set to -1 to indicate that there will be
+ no gzip header information forthcoming. Note that Z_BLOCK can be used to
+ force inflate() to return immediately after header processing is complete
+ and before any actual data is decompressed.
+
+ The text, time, xflags, and os fields are filled in with the gzip header
+ contents. hcrc is set to true if there is a header CRC. (The header CRC
+ was valid if done is set to one.) If extra is not Z_NULL, then extra_max
+ contains the maximum number of bytes to write to extra. Once done is true,
+ extra_len contains the actual extra field length, and extra contains the
+ extra field, or that field truncated if extra_max is less than extra_len.
+ If name is not Z_NULL, then up to name_max characters are written there,
+ terminated with a zero unless the length is greater than name_max. If
+ comment is not Z_NULL, then up to comm_max characters are written there,
+ terminated with a zero unless the length is greater than comm_max. When
+ any of extra, name, or comment are not Z_NULL and the respective field is
+ not present in the header, then that field is set to Z_NULL to signal its
+ absence. This allows the use of deflateSetHeader() with the returned
+ structure to duplicate the header. However if those fields are set to
+ allocated memory, then the application will need to save those pointers
+ elsewhere so that they can be eventually freed.
+
+ If inflateGetHeader is not used, then the header information is simply
+ discarded. The header is always checked for validity, including the header
+ CRC if present. inflateReset() will reset the process to discard the header
+ information. The application would need to call inflateGetHeader() again to
+ retrieve the header from the next gzip stream.
+
+ inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
+ unsigned char FAR *window));
+
+ Initialize the internal stream state for decompression using inflateBack()
+ calls. The fields zalloc, zfree and opaque in strm must be initialized
+ before the call. If zalloc and zfree are Z_NULL, then the default library-
+ derived memory allocation routines are used. windowBits is the base two
+ logarithm of the window size, in the range 8..15. window is a caller
+ supplied buffer of that size. Except for special applications where it is
+ assured that deflate was used with small window sizes, windowBits must be 15
+ and a 32K byte window must be supplied to be able to decompress general
+ deflate streams.
+
+ See inflateBack() for the usage of these routines.
+
+ inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
+ the paramaters are invalid, Z_MEM_ERROR if the internal state could not
+ be allocated, or Z_VERSION_ERROR if the version of the library does not
+ match the version of the header file.
+*/
+
+typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
+typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+
+ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
+ in_func in, void FAR *in_desc,
+ out_func out, void FAR *out_desc));
+/*
+ inflateBack() does a raw inflate with a single call using a call-back
+ interface for input and output. This is more efficient than inflate() for
+ file i/o applications in that it avoids copying between the output and the
+ sliding window by simply making the window itself the output buffer. This
+ function trusts the application to not change the output buffer passed by
+ the output function, at least until inflateBack() returns.
+
+ inflateBackInit() must be called first to allocate the internal state
+ and to initialize the state with the user-provided window buffer.
+ inflateBack() may then be used multiple times to inflate a complete, raw
+ deflate stream with each call. inflateBackEnd() is then called to free
+ the allocated state.
+
+ A raw deflate stream is one with no zlib or gzip header or trailer.
+ This routine would normally be used in a utility that reads zip or gzip
+ files and writes out uncompressed files. The utility would decode the
+ header and process the trailer on its own, hence this routine expects
+ only the raw deflate stream to decompress. This is different from the
+ normal behavior of inflate(), which expects either a zlib or gzip header and
+ trailer around the deflate stream.
+
+ inflateBack() uses two subroutines supplied by the caller that are then
+ called by inflateBack() for input and output. inflateBack() calls those
+ routines until it reads a complete deflate stream and writes out all of the
+ uncompressed data, or until it encounters an error. The function's
+ parameters and return types are defined above in the in_func and out_func
+ typedefs. inflateBack() will call in(in_desc, &buf) which should return the
+ number of bytes of provided input, and a pointer to that input in buf. If
+ there is no input available, in() must return zero--buf is ignored in that
+ case--and inflateBack() will return a buffer error. inflateBack() will call
+ out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out()
+ should return zero on success, or non-zero on failure. If out() returns
+ non-zero, inflateBack() will return with an error. Neither in() nor out()
+ are permitted to change the contents of the window provided to
+ inflateBackInit(), which is also the buffer that out() uses to write from.
+ The length written by out() will be at most the window size. Any non-zero
+ amount of input may be provided by in().
+
+ For convenience, inflateBack() can be provided input on the first call by
+ setting strm->next_in and strm->avail_in. If that input is exhausted, then
+ in() will be called. Therefore strm->next_in must be initialized before
+ calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called
+ immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in
+ must also be initialized, and then if strm->avail_in is not zero, input will
+ initially be taken from strm->next_in[0 .. strm->avail_in - 1].
+
+ The in_desc and out_desc parameters of inflateBack() is passed as the
+ first parameter of in() and out() respectively when they are called. These
+ descriptors can be optionally used to pass any information that the caller-
+ supplied in() and out() functions need to do their job.
+
+ On return, inflateBack() will set strm->next_in and strm->avail_in to
+ pass back any unused input that was provided by the last in() call. The
+ return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
+ if in() or out() returned an error, Z_DATA_ERROR if there was a format
+ error in the deflate stream (in which case strm->msg is set to indicate the
+ nature of the error), or Z_STREAM_ERROR if the stream was not properly
+ initialized. In the case of Z_BUF_ERROR, an input or output error can be
+ distinguished using strm->next_in which will be Z_NULL only if in() returned
+ an error. If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
+ out() returning non-zero. (in() will always be called before out(), so
+ strm->next_in is assured to be defined if out() returns non-zero.) Note
+ that inflateBack() cannot return Z_OK.
+*/
+
+ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
+/*
+ All memory allocated by inflateBackInit() is freed.
+
+ inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
+ state was inconsistent.
+*/
+
+ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+/* Return flags indicating compile-time options.
+
+ Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
+ 1.0: size of uInt
+ 3.2: size of uLong
+ 5.4: size of voidpf (pointer)
+ 7.6: size of z_off_t
+
+ Compiler, assembler, and debug options:
+ 8: DEBUG
+ 9: ASMV or ASMINF -- use ASM code
+ 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
+ 11: 0 (reserved)
+
+ One-time table building (smaller code, but not thread-safe if true):
+ 12: BUILDFIXED -- build static block decoding tables when needed
+ 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
+ 14,15: 0 (reserved)
+
+ Library content (indicates missing functionality):
+ 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
+ deflate code when not needed)
+ 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
+ and decode gzip streams (to avoid linking crc code)
+ 18-19: 0 (reserved)
+
+ Operation variations (changes in library functionality):
+ 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
+ 21: FASTEST -- deflate algorithm with only one, lowest compression level
+ 22,23: 0 (reserved)
+
+ The sprintf variant used by gzprintf (zero is best):
+ 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
+ 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
+ 26: 0 = returns value, 1 = void -- 1 means inferred string length returned
+
+ Remainder:
+ 27-31: 0 (reserved)
+ */
+
+
+ /* utility functions */
+
+/*
+ The following utility functions are implemented on top of the
+ basic stream-oriented functions. To simplify the interface, some
+ default options are assumed (compression level and memory usage,
+ standard memory allocation functions). The source code of these
+ utility functions can easily be modified if you need special options.
+*/
+
+ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen,
+ const Bytef *source, uLong sourceLen));
+/*
+ Compresses the source buffer into the destination buffer. sourceLen is
+ the byte length of the source buffer. Upon entry, destLen is the total
+ size of the destination buffer, which must be at least the value returned
+ by compressBound(sourceLen). Upon exit, destLen is the actual size of the
+ compressed buffer.
+ This function can be used to compress a whole file at once if the
+ input file is mmap'ed.
+ compress returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_BUF_ERROR if there was not enough room in the output
+ buffer.
+*/
+
+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen,
+ const Bytef *source, uLong sourceLen,
+ int level));
+/*
+ Compresses the source buffer into the destination buffer. The level
+ parameter has the same meaning as in deflateInit. sourceLen is the byte
+ length of the source buffer. Upon entry, destLen is the total size of the
+ destination buffer, which must be at least the value returned by
+ compressBound(sourceLen). Upon exit, destLen is the actual size of the
+ compressed buffer.
+
+ compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+ Z_STREAM_ERROR if the level parameter is invalid.
+*/
+
+ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+/*
+ compressBound() returns an upper bound on the compressed size after
+ compress() or compress2() on sourceLen bytes. It would be used before
+ a compress() or compress2() call to allocate the destination buffer.
+*/
+
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen,
+ const Bytef *source, uLong sourceLen));
+/*
+ Decompresses the source buffer into the destination buffer. sourceLen is
+ the byte length of the source buffer. Upon entry, destLen is the total
+ size of the destination buffer, which must be large enough to hold the
+ entire uncompressed data. (The size of the uncompressed data must have
+ been saved previously by the compressor and transmitted to the decompressor
+ by some mechanism outside the scope of this compression library.)
+ Upon exit, destLen is the actual size of the compressed buffer.
+ This function can be used to decompress a whole file at once if the
+ input file is mmap'ed.
+
+ uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_BUF_ERROR if there was not enough room in the output
+ buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
+*/
+
+
+typedef voidp gzFile;
+
+ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
+/*
+ Opens a gzip (.gz) file for reading or writing. The mode parameter
+ is as in fopen ("rb" or "wb") but can also include a compression level
+ ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
+ Huffman only compression as in "wb1h", or 'R' for run-length encoding
+ as in "wb1R". (See the description of deflateInit2 for more information
+ about the strategy parameter.)
+
+ gzopen can be used to read a file which is not in gzip format; in this
+ case gzread will directly read from the file without decompression.
+
+ gzopen returns NULL if the file could not be opened or if there was
+ insufficient memory to allocate the (de)compression state; errno
+ can be checked to distinguish the two cases (if errno is zero, the
+ zlib error is Z_MEM_ERROR). */
+
+ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
+/*
+ gzdopen() associates a gzFile with the file descriptor fd. File
+ descriptors are obtained from calls like open, dup, creat, pipe or
+ fileno (in the file has been previously opened with fopen).
+ The mode parameter is as in gzopen.
+ The next call of gzclose on the returned gzFile will also close the
+ file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
+ descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
+ gzdopen returns NULL if there was insufficient memory to allocate
+ the (de)compression state.
+*/
+
+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+/*
+ Dynamically update the compression level or strategy. See the description
+ of deflateInit2 for the meaning of these parameters.
+ gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
+ opened for writing.
+*/
+
+ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
+/*
+ Reads the given number of uncompressed bytes from the compressed file.
+ If the input file was not in gzip format, gzread copies the given number
+ of bytes into the buffer.
+ gzread returns the number of uncompressed bytes actually read (0 for
+ end of file, -1 for error). */
+
+ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
+ voidpc buf, unsigned len));
+/*
+ Writes the given number of uncompressed bytes into the compressed file.
+ gzwrite returns the number of uncompressed bytes actually written
+ (0 in case of error).
+*/
+
+ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));
+/*
+ Converts, formats, and writes the args to the compressed file under
+ control of the format string, as in fprintf. gzprintf returns the number of
+ uncompressed bytes actually written (0 in case of error). The number of
+ uncompressed bytes written is limited to 4095. The caller should assure that
+ this limit is not exceeded. If it is exceeded, then gzprintf() will return
+ return an error (0) with nothing written. In this case, there may also be a
+ buffer overflow with unpredictable consequences, which is possible only if
+ zlib was compiled with the insecure functions sprintf() or vsprintf()
+ because the secure snprintf() or vsnprintf() functions were not available.
+*/
+
+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+/*
+ Writes the given null-terminated string to the compressed file, excluding
+ the terminating null character.
+ gzputs returns the number of characters written, or -1 in case of error.
+*/
+
+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+/*
+ Reads bytes from the compressed file until len-1 characters are read, or
+ a newline character is read and transferred to buf, or an end-of-file
+ condition is encountered. The string is then terminated with a null
+ character.
+ gzgets returns buf, or Z_NULL in case of error.
+*/
+
+ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
+/*
+ Writes c, converted to an unsigned char, into the compressed file.
+ gzputc returns the value that was written, or -1 in case of error.
+*/
+
+ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
+/*
+ Reads one byte from the compressed file. gzgetc returns this byte
+ or -1 in case of end of file or error.
+*/
+
+ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
+/*
+ Push one character back onto the stream to be read again later.
+ Only one character of push-back is allowed. gzungetc() returns the
+ character pushed, or -1 on failure. gzungetc() will fail if a
+ character has been pushed but not read yet, or if c is -1. The pushed
+ character will be discarded if the stream is repositioned with gzseek()
+ or gzrewind().
+*/
+
+ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
+/*
+ Flushes all pending output into the compressed file. The parameter
+ flush is as in the deflate() function. The return value is the zlib
+ error number (see function gzerror below). gzflush returns Z_OK if
+ the flush parameter is Z_FINISH and all output could be flushed.
+ gzflush should be called only when strictly necessary because it can
+ degrade compression.
+*/
+
+ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
+ z_off_t offset, int whence));
+/*
+ Sets the starting position for the next gzread or gzwrite on the
+ given compressed file. The offset represents a number of bytes in the
+ uncompressed data stream. The whence parameter is defined as in lseek(2);
+ the value SEEK_END is not supported.
+ If the file is opened for reading, this function is emulated but can be
+ extremely slow. If the file is opened for writing, only forward seeks are
+ supported; gzseek then compresses a sequence of zeroes up to the new
+ starting position.
+
+ gzseek returns the resulting offset location as measured in bytes from
+ the beginning of the uncompressed stream, or -1 in case of error, in
+ particular if the file is opened for writing and the new starting position
+ would be before the current position.
+*/
+
+ZEXTERN int ZEXPORT gzrewind OF((gzFile file));
+/*
+ Rewinds the given file. This function is supported only for reading.
+
+ gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+*/
+
+ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file));
+/*
+ Returns the starting position for the next gzread or gzwrite on the
+ given compressed file. This position represents a number of bytes in the
+ uncompressed data stream.
+
+ gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+*/
+
+ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+/*
+ Returns 1 when EOF has previously been detected reading the given
+ input stream, otherwise zero.
+*/
+
+ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
+/*
+ Returns 1 if file is being read directly without decompression, otherwise
+ zero.
+*/
+
+ZEXTERN int ZEXPORT gzclose OF((gzFile file));
+/*
+ Flushes all pending output if necessary, closes the compressed file
+ and deallocates all the (de)compression state. The return value is the zlib
+ error number (see function gzerror below).
+*/
+
+ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+/*
+ Returns the error message for the last error which occurred on the
+ given compressed file. errnum is set to zlib error number. If an
+ error occurred in the file system and not in the compression library,
+ errnum is set to Z_ERRNO and the application may consult errno
+ to get the exact error code.
+*/
+
+ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+/*
+ Clears the error and end-of-file flags for file. This is analogous to the
+ clearerr() function in stdio. This is useful for continuing to read a gzip
+ file that is being written concurrently.
+*/
+
+ /* checksum functions */
+
+/*
+ These functions are not related to compression but are exported
+ anyway because they might be useful in applications using the
+ compression library.
+*/
+
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+/*
+ Update a running Adler-32 checksum with the bytes buf[0..len-1] and
+ return the updated checksum. If buf is NULL, this function returns
+ the required initial value for the checksum.
+ An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+ much faster. Usage example:
+
+ uLong adler = adler32(0L, Z_NULL, 0);
+
+ while (read_buffer(buffer, length) != EOF) {
+ adler = adler32(adler, buffer, length);
+ }
+ if (adler != original_adler) error();
+*/
+
+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
+ z_off_t len2));
+/*
+ Combine two Adler-32 checksums into one. For two sequences of bytes, seq1
+ and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
+ each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of
+ seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
+*/
+
+ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
+/*
+ Update a running CRC-32 with the bytes buf[0..len-1] and return the
+ updated CRC-32. If buf is NULL, this function returns the required initial
+ value for the for the crc. Pre- and post-conditioning (one's complement) is
+ performed within this function so it shouldn't be done by the application.
+ Usage example:
+
+ uLong crc = crc32(0L, Z_NULL, 0);
+
+ while (read_buffer(buffer, length) != EOF) {
+ crc = crc32(crc, buffer, length);
+ }
+ if (crc != original_crc) error();
+*/
+
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+
+/*
+ Combine two CRC-32 check values into one. For two sequences of bytes,
+ seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
+ calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32
+ check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
+ len2.
+*/
+
+
+ /* various hacks, don't look :) */
+
+/* deflateInit and inflateInit are macros to allow checking the zlib version
+ * and the compiler's view of z_stream:
+ */
+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
+ const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
+ const char *version, int stream_size));
+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method,
+ int windowBits, int memLevel,
+ int strategy, const char *version,
+ int stream_size));
+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits,
+ const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
+ unsigned char FAR *window,
+ const char *version,
+ int stream_size));
+#define deflateInit(strm, level) \
+ deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit(strm) \
+ inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream))
+#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+ deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+ (strategy), ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit2(strm, windowBits) \
+ inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+#define inflateBackInit(strm, windowBits, window) \
+ inflateBackInit_((strm), (windowBits), (window), \
+ ZLIB_VERSION, sizeof(z_stream))
+
+
+#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
+ struct internal_state {int dummy;}; /* hack for buggy compilers */
+#endif
+
+ZEXTERN const char * ZEXPORT zError OF((int));
+ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z));
+ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZLIB_H */
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CMakeLists.txt
new file mode 100644
index 0000000..f396d9a
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CMakeLists.txt
@@ -0,0 +1,73 @@
+##
+## $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.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.
+##
+
+include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${BREAKPAD_INCLUDE_DIR}
+)
+
+## Add the application source files
+set(crashreporter_SRCS
+ main.cpp
+ CrashReportDialog.cpp
+ CrashReportUploader.cpp
+ UploadProgressDialog.cpp
+)
+qt4_wrap_cpp(crashreporter_SRCS
+ CrashReportDialog.h
+ CrashReportUploader.h
+ UploadProgressDialog.h
+)
+qt4_wrap_ui(crashreporter_SRCS
+ CrashReportDialog.ui
+ UploadProgressDialog.ui
+)
+qt4_add_resources(crashreporter_SRCS
+ res/CrashReporter.qrc
+)
+if (MSVC)
+ configure_file(
+ res/CrashReporter.rc.in
+ ${CMAKE_CURRENT_BINARY_DIR}/CrashReporter.rc
+ )
+ set(crashreporter_SRCS
+ ${crashreporter_SRCS}
+ ${CMAKE_CURRENT_BINARY_DIR}/CrashReporter.rc
+ )
+endif(MSVC)
+
+## Create the crashreporter executable
+if (WIN32)
+ add_executable(crashreporter WIN32 ${crashreporter_SRCS})
+else(WIN32)
+ add_executable(crashreporter ${crashreporter_SRCS})
+endif(WIN32)
+
+## Link the crash reporter application with the Qt and Breakpad libraries
+target_link_libraries(crashreporter
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+ ${QT_QTNETWORK_LIBRARY}
+ common
+)
+if (WIN32)
+ target_link_libraries(crashreporter
+ ${QT_QTMAIN_LIBRARY}
+ )
+endif(WIN32)
+
+## Remember the location of the crash reporter binary so we can use it in
+## the Windows packaging scripts
+get_target_property(CRASHREPORTER_EXECUTABLE crashreporter LOCATION_RelWithDebInfo)
+set(VIDALIA_CRASHREPORTER_EXECUTABLE ${CRASHREPORTER_EXECUTABLE}
+ CACHE STRING "Location of Vidalia's crash reporting application." FORCE)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CrashReportDialog.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CrashReportDialog.cpp
new file mode 100644
index 0000000..6433c66
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CrashReportDialog.cpp
@@ -0,0 +1,129 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 CrashReportDialog.cpp
+** \version $Id$
+** \brief Dialog that asks the user whether they would like to
+** submit the crash report, along with optional additional details
+** about what they were doing at the time of the crash.
+*/
+
+#include "CrashReportDialog.h"
+#include "CrashReportUploader.h"
+#include "UploadProgressDialog.h"
+
+#include "stringutil.h"
+
+#include <QProcess>
+#include <QPushButton>
+#include <QMessageBox>
+#include <QFileInfo>
+
+
+CrashReportDialog::CrashReportDialog(QWidget *parent)
+ : QDialog(parent)
+{
+ ui.setupUi(this);
+
+ /* Tweak the text displayed on the buttons at the bottom of the dialog */
+ QPushButton *btn;
+ btn = ui.buttonBox->button(QDialogButtonBox::Ok);
+ btn->setText(tr("Restart Vidalia"));
+
+ btn = ui.buttonBox->button(QDialogButtonBox::Cancel);
+ btn->setText(tr("Don't Restart"));
+}
+
+void
+CrashReportDialog::setCrashAnnotations(const QHash<QString,QString> &annotations)
+{
+ _annotations = annotations;
+}
+
+void
+CrashReportDialog::setMinidump(const QString &id, const QByteArray &minidump)
+{
+ _minidump = minidump;
+ _minidumpId = id;
+}
+
+void
+CrashReportDialog::submitCrashReport()
+{
+ CrashReportUploader *uploader = new CrashReportUploader();
+ UploadProgressDialog *progressDialog = new UploadProgressDialog(this);
+ QMap<QString,QString> parameters;
+
+ connect(uploader, SIGNAL(statusChanged(QString)),
+ progressDialog, SLOT(setStatus(QString)));
+ connect(uploader, SIGNAL(uploadProgress(int, int)),
+ progressDialog, SLOT(setUploadProgress(int, int)));
+ connect(uploader, SIGNAL(uploadFinished()),
+ progressDialog, SLOT(accept()));
+ connect(uploader, SIGNAL(uploadFailed(QString)),
+ progressDialog, SLOT(uploadFailed(QString)));
+
+ /* Set up the form fields that will be uploaded with the minidump */
+ QString comments = ui.textDetails->toPlainText();
+ if (! comments.isEmpty())
+ parameters.insert("Comments", comments);
+ parameters.insert("ProductName", "Vidalia");
+ parameters.insert("Vendor", "Vidalia");
+ parameters.insert("Version", _annotations.value("BuildVersion"));
+ parameters.insert("CrashTime", _annotations.value("CrashTime"));
+ parameters.insert("StartupTime", _annotations.value("StartupTime"));
+
+ /* Start the upload (returns immediately) */
+ uploader->uploadMinidump(QUrl("https://crashes.vidalia-project.net/submit"),
+ _minidumpId, _minidump, parameters);
+
+ /* Displays a modal progress dialog showing the progress of the upload. This
+ * will return when either the upload completes or the user hits "Cancel". */
+ if (progressDialog->exec() == QDialog::Rejected)
+ uploader->cancel(); /* User clicked "Cancel" */
+
+ delete uploader;
+}
+
+void
+CrashReportDialog::accept()
+{
+ /* Upload the crash report, unless the user opted out */
+ if (ui.chkSubmitCrashReport->isChecked())
+ submitCrashReport();
+
+ /* Attempt to restart Vidalia with the saved arguments */
+ QString exe = _annotations.value("RestartExecutable");
+ QString args = _annotations.value("RestartExecutableArgs");
+ QStringList argList = string_parse_arguments(args);
+ if (! QProcess::startDetached(exe, argList, QFileInfo(exe).absolutePath())) {
+ QMessageBox dlg(QMessageBox::Warning, tr("Unable to restart Vidalia"),
+ tr("We were unable to automatically restart Vidalia. "
+ "Please restart Vidalia manually."),
+ QMessageBox::Ok, this);
+ dlg.exec();
+ }
+
+ /* Close the dialog */
+ QDialog::accept();
+}
+
+void
+CrashReportDialog::reject()
+{
+ /* Upload the crash report, unless the user opted out */
+ if (ui.chkSubmitCrashReport->isChecked())
+ submitCrashReport();
+
+ /* Close this dialog without restarting Vidalia */
+ QDialog::reject();
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CrashReportDialog.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CrashReportDialog.h
new file mode 100644
index 0000000..00e7bc0
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CrashReportDialog.h
@@ -0,0 +1,92 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 CrashReportDialog.h
+** \version $Id$
+** \brief Dialog that asks the user whether they would like to
+** submit the crash report, along with optional additional details
+** about what they were doing at the time of the crash.
+*/
+
+#include "ui_CrashReportDialog.h"
+
+#include <QHash>
+#include <QByteArray>
+
+class QString;
+
+
+class CrashReportDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor.
+ */
+ CrashReportDialog(QWidget *parent = 0);
+
+ /** Sets the crash <b>annotations</b> key-value pairs associated with
+ * the generated minidump.
+ */
+ void setCrashAnnotations(const QHash<QString,QString> &annotations);
+
+ /** Sets the <b>minidump</b> contents generated by the crashed
+ * applications exception handler.
+ */
+ void setMinidump(const QString &id, const QByteArray &minidump);
+
+ /** Uploads the generated minidump, user comments, and any additional
+ * crash annotations generated by the exception handler to the crash
+ * reporting server.
+ * \sa setMinidump()
+ * \sa setCrashAnnotations()
+ */
+ void submitCrashReport();
+
+public slots:
+ /** Called when the user clicks the "Restart Vidalia" button on the
+ * dialog. If the "Submit my crash report..." checkbox is checked, it
+ * will first attempt to submit the crash report. After that is complete,
+ * it will try to restart the Vidalia process with any arguments specified
+ * in the crash annotations file.
+ * \sa setCrashAnnotations()
+ */
+ virtual void accept();
+
+ /** Called when the user clicks the "Don't Restart" button on the
+ * dialog. If the "Submit my crash report.." checkbox is checked, it
+ * will attempt to submit the crash report and then exit without
+ * restarting Vidalia.
+ */
+ virtual void reject();
+
+private:
+ /** Each minidump is given a randomly-generated GUID when it is created,
+ * which is used to form the minidump filename. This ID is also used by
+ * the crash reporting server when accepting and processing uploaded
+ * minidumps.
+ */
+ QString _minidumpId;
+
+ /** Contents of the generated minidump.
+ */
+ QByteArray _minidump;
+
+ /** Set of parsed key-value pairs generated by the crashed application's
+ * exception handler and written alongside the minidump.
+ */
+ QHash<QString,QString> _annotations;
+
+ /** Qt Designer created object.
+ */
+ Ui::CrashReportDialog ui;
+};
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CrashReportDialog.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CrashReportDialog.ui
new file mode 100644
index 0000000..b565822
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CrashReportDialog.ui
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CrashReportDialog</class>
+ <widget class="QDialog" name="CrashReportDialog">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>434</width>
+ <height>310</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Submit a Crash Report</string>
+ </property>
+ <property name="windowIcon">
+ <iconset resource="res/CrashReporter.qrc">
+ <normaloff>:/images/32x32/tools-report-bug.png</normaloff>:/images/32x32/tools-report-bug.png</iconset>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0" rowspan="2">
+ <widget class="QLabel" name="lblHeaderImage">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="pixmap">
+ <pixmap resource="res/CrashReporter.qrc">:/images/64x64/tools-report-bug.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLabel" name="lblTitle">
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Vidalia encountered an error and needed to close</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLabel" name="lblHeader">
+ <property name="text">
+ <string>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.</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="2">
+ <widget class="Line" name="line">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" colspan="2">
+ <widget class="QLabel" name="lblDetails">
+ <property name="text">
+ <string>Please also describe what you were doing before the application crashed (optional):</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0" colspan="2">
+ <widget class="QTextBrowser" name="textDetails">
+ <property name="tabChangesFocus">
+ <bool>true</bool>
+ </property>
+ <property name="readOnly">
+ <bool>false</bool>
+ </property>
+ <property name="openLinks">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0" colspan="2">
+ <widget class="QCheckBox" name="chkSubmitCrashReport">
+ <property name="text">
+ <string>Send my crash report to the Vidalia developers</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources>
+ <include location="res/CrashReporter.qrc"/>
+ </resources>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>CrashReportDialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>157</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>CrashReportDialog</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>286</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CrashReportUploader.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CrashReportUploader.cpp
new file mode 100644
index 0000000..ef76ff3
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CrashReportUploader.cpp
@@ -0,0 +1,153 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 CrashReportUploader.cpp
+** \version $Id$
+** \brief Uploads a minidump file and any extra information to a crash
+** reporting server.
+*/
+
+#include "CrashReportUploader.h"
+
+#include <QtGlobal>
+#include <QDateTime>
+#include <QSslSocket>
+#include <QSslCertificate>
+#include <QHttpRequestHeader>
+#include <QHttpResponseHeader>
+#include <QMap>
+#include <QUrl>
+
+
+CrashReportUploader::CrashReportUploader(QObject *parent)
+ : QObject(parent),
+ _requestId(-1)
+{
+ /* Clear the default CA certificate store and add the only one we want */
+ QSslSocket::setDefaultCaCertificates(QList<QSslCertificate>());
+ QSslSocket::addDefaultCaCertificates(":/pki/gd-class2-root.crt");
+
+ /* Create the QHttp object used to talk to the crash reporting server */
+ _http = new QHttp(this);
+ connect(_http, SIGNAL(stateChanged(int)),
+ this, SLOT(httpStateChanged(int)));
+ connect(_http, SIGNAL(requestFinished(int, bool)),
+ this, SLOT(httpRequestFinished(int, bool)));
+ connect(_http, SIGNAL(dataSendProgress(int, int)),
+ this, SIGNAL(uploadProgress(int, int)));
+
+ /* Seed the lame PRNG we'll use to generate the multipart boundary marker */
+ qsrand(QDateTime::currentDateTime().toTime_t());
+}
+
+void
+CrashReportUploader::uploadMinidump(const QUrl &serverUrl,
+ const QString &minidumpId,
+ const QByteArray &minidump,
+ const QMap<QString,QString> ¶meters)
+{
+ QByteArray body;
+
+ /* Set the destination host. If it looks like the destination URL uses SSL,
+ * then we need to tell the QHttp object to use it as well. */
+ if (! serverUrl.scheme().compare("https", Qt::CaseInsensitive)) {
+ _http->setHost(serverUrl.host(), QHttp::ConnectionModeHttps,
+ serverUrl.port(443));
+ } else {
+ _http->setHost(serverUrl.host(), QHttp::ConnectionModeHttp,
+ serverUrl.port(80));
+ }
+
+ /* Set up the request header */
+ QHttpRequestHeader header("POST", serverUrl.path());
+ QString boundary = generateBoundaryMarker();
+ header.setValue("Host", serverUrl.host());
+ header.setContentType(QString("multipart/form-data; boundary=%1")
+ .arg(boundary));
+
+ /* Add all the key=value parameters to the request body */
+ foreach (QString key, parameters.keys()) {
+ QString value = parameters.value(key);
+ if (! value.isEmpty()) {
+ body.append(QString("--%1\r\n").arg(boundary));
+ body.append(QString("Content-Disposition: form-data; name=\"%1\"").arg(key));
+ body.append("\r\n\r\n");
+ body.append(value.toUtf8());
+ body.append("\r\n");
+ }
+ }
+
+ /* Append the minidump contents */
+ body.append(QString("--%1\r\n").arg(boundary));
+ body.append("Content-Disposition: form-data; ");
+ body.append("name=\"upload_file_minidump\"; ");
+ body.append(QString("filename=\"%1\"\r\n").arg(minidumpId));
+ body.append("Content-Type: application/octet-stream\r\n\r\n");
+ body.append(minidump);
+ body.append(QString("\r\n--%1\r\n").arg(boundary));
+
+ /* Initiate the request and return the request ID */
+ _requestId = _http->request(header, body);
+}
+
+QString
+CrashReportUploader::generateBoundaryMarker() const
+{
+ return QString("%1%2").arg((quint32)qrand(), 8, 16, QChar('0'))
+ .arg((quint32)qrand(), 8, 16, QChar('0'));
+}
+
+void
+CrashReportUploader::cancel()
+{
+ _http->abort();
+}
+
+void
+CrashReportUploader::httpStateChanged(int state)
+{
+ switch (state) {
+ case QHttp::Connecting:
+ emit statusChanged(tr("Connecting..."));
+ break;
+
+ case QHttp::Sending:
+ emit statusChanged(tr("Sending crash report..."));
+ break;
+
+ case QHttp::Reading:
+ emit statusChanged(tr("Receiving response..."));
+ break;
+
+ default:
+ break;
+ }
+}
+
+void
+CrashReportUploader::httpRequestFinished(int id, bool error)
+{
+ if (id != _requestId)
+ return;
+
+ if (error) {
+ QString errorString = _http->errorString();
+ emit uploadFailed(errorString);
+ } else {
+ QHttpResponseHeader response = _http->lastResponse();
+ if (response.statusCode() == 200)
+ emit uploadFinished();
+ else
+ emit uploadFailed(response.reasonPhrase());
+ }
+ _http->close();
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CrashReportUploader.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CrashReportUploader.h
new file mode 100644
index 0000000..724ce0c
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/CrashReportUploader.h
@@ -0,0 +1,110 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 CrashReportUploader.h
+** \version $Id$
+** \brief Uploads a minidump file and any extra information to a crash
+** reporting server.
+*/
+
+#ifndef _CRASHREPORTUPLOADER_H
+#define _CRASHREPORTUPLOADER_H
+
+#include <QObject>
+#include <QHttp>
+#include <QMap>
+
+class QUrl;
+class QString;
+class QByteArray;
+
+
+class CrashReportUploader : public QObject
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor.
+ */
+ CrashReportUploader(QObject *parent = 0);
+
+ /** Starts uploading <b>minidump</b> to <b>serverUrl</b> and returns
+ * immediately. <b>minidumpId</b> is the minidump GUID generated by
+ * the exception handler and used for the minidump's filename. The
+ * optional <b>parameters</b> can be used to pass additional form fields
+ * to the crash reporting server.
+ */
+ void uploadMinidump(const QUrl &serverUrl,
+ const QString &minidumpId,
+ const QByteArray &minidump,
+ const QMap<QString,QString> ¶meters);
+
+public slots:
+ /** Cancels a pending minidump upload.
+ */
+ void cancel();
+
+signals:
+ /** Emitted when the underlying QHttp object posts data to the server.
+ * <b>done</b> indicates how many bytes out of <b>total</b>
+ * have been sent so far.
+ */
+ void uploadProgress(int done, int total);
+
+ /** Emitted when the status of the POST request changes. <b>status</b>
+ * describes the new current state of the request.
+ */
+ void statusChanged(const QString &status);
+
+ /** Emitted when the previous minidump upload completes successfully.
+ */
+ void uploadFinished();
+
+ /** Emitted when the previous crash report upload fails. The QString
+ * <b>error</b> is a human-readable string describing the error
+ * encountered.
+ */
+ void uploadFailed(const QString &error);
+
+private slots:
+ /** Called when the state of the underlying QHttp object changes. A
+ * statusChanged() signal is emitted with the appropriate text
+ * describing the new state of the POST request.
+ */
+ void httpStateChanged(int state);
+
+ /** Called when the underlying QHttp object used to upload the minidump
+ * completes. <b>error</b> is set to false if the upload was
+ * successful, or true if the upload failed. If <b>id</b> does not
+ * match the request ID previously returned by QHttp::get(), then the
+ * signal is ignored since it is the result of a close() or abort()
+ * request.
+ */
+ void httpRequestFinished(int id, bool error);
+
+private:
+ /** Generates a "random" 8-byte multipart boundary marker encoded into
+ * 16 hex characters.
+ */
+ QString generateBoundaryMarker() const;
+
+ /** Unique numeric identifier of the current minidump upload POST request.
+ */
+ int _requestId;
+
+ /** Object used to POST a minidump to the crash server and read the
+ * response.
+ */
+ QHttp *_http;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/UploadProgressDialog.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/UploadProgressDialog.cpp
new file mode 100644
index 0000000..21f0844
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/UploadProgressDialog.cpp
@@ -0,0 +1,61 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 UploadProgressDialog.cpp
+** \version $Id$
+** \brief Displays the progress of uploading a crash report to the server
+*/
+
+#include "UploadProgressDialog.h"
+
+
+UploadProgressDialog::UploadProgressDialog(QWidget *parent)
+ : QDialog(parent)
+{
+ ui.setupUi(this);
+
+ setModal(true);
+}
+
+void
+UploadProgressDialog::setVisible(bool visible)
+{
+ if (visible) {
+ ui.progressBar->setRange(0, 0);
+ ui.buttonBox->setStandardButtons(QDialogButtonBox::Cancel);
+ }
+ QDialog::setVisible(visible);
+}
+
+void
+UploadProgressDialog::setStatus(const QString &status)
+{
+ ui.lblStatus->setText(status);
+}
+
+void
+UploadProgressDialog::setUploadProgress(int done, int total)
+{
+ ui.progressBar->setRange(0, total);
+ ui.progressBar->setValue(done);
+}
+
+void
+UploadProgressDialog::uploadFailed(const QString &error)
+{
+ ui.lblStatus->setText(tr("Unable to send report: %1").arg(error));
+
+ ui.progressBar->setRange(0, 1);
+ ui.progressBar->setValue(1);
+
+ ui.buttonBox->setStandardButtons(QDialogButtonBox::Ok);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/UploadProgressDialog.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/UploadProgressDialog.h
new file mode 100644
index 0000000..f6d0218
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/UploadProgressDialog.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.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 UploadProgressDialog.cpp
+** \version $Id$
+** \brief Displays the progress of uploading a crash report to the server
+*/
+
+#ifndef _UPLOADPROGRESSDIALOG_H
+#define _UPLOADPROGRESSDIALOG_H
+
+#include "ui_UploadProgressDialog.h"
+
+
+class UploadProgressDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor.
+ */
+ UploadProgressDialog(QWidget *parent = 0);
+
+public slots:
+ /** Sets the status message text in the dialog to <b>status</b>.
+ */
+ void setStatus(const QString &status);
+
+ /** Updates the minidump upload progress bar to <b>value</b> out of
+ * <b>maximum</b> steps. If <b>value</b> and <b>maximum</b> are both 0,
+ * then a "busy" progress bar is displayed.
+ */
+ void setUploadProgress(int value, int maximum);
+
+ /** Called when the minidump upload fails. The string <b>error</b>
+ * provides a human-readable description of the reason the upload
+ * failed, which is displayed for the user.
+ */
+ void uploadFailed(const QString &error);
+
+protected:
+ /** Overloaded method called when the progress dialog is first shown in
+ * order to initialize the progress bar, status text and dialog button
+ * box.
+ */
+ virtual void setVisible(bool visible);
+
+private:
+ /** Qt Designer generated object.
+ */
+ Ui::UploadProgressDialog ui;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/UploadProgressDialog.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/UploadProgressDialog.ui
new file mode 100644
index 0000000..4b985ac
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/UploadProgressDialog.ui
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>UploadProgressDialog</class>
+ <widget class="QDialog" name="UploadProgressDialog">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>366</width>
+ <height>104</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Uploading Crash Report</string>
+ </property>
+ <property name="windowIcon">
+ <iconset resource="res/CrashReporter.qrc">
+ <normaloff>:/images/32x32/tools-report-bug.png</normaloff>:/images/32x32/tools-report-bug.png</iconset>
+ </property>
+ <property name="modal">
+ <bool>true</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0" rowspan="2">
+ <widget class="QLabel" name="lblPixmap">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="pixmap">
+ <pixmap resource="res/CrashReporter.qrc">:/images/48x48/tools-report-bug.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLabel" name="lblStatus">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QProgressBar" name="progressBar">
+ <property name="value">
+ <number>0</number>
+ </property>
+ <property name="textVisible">
+ <bool>false</bool>
+ </property>
+ <property name="format">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="2">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources>
+ <include location="res/CrashReporter.qrc"/>
+ </resources>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>UploadProgressDialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>182</x>
+ <y>81</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>182</x>
+ <y>51</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>UploadProgressDialog</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>182</x>
+ <y>81</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>182</x>
+ <y>51</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/main.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/main.cpp
new file mode 100644
index 0000000..a6412d7
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/main.cpp
@@ -0,0 +1,182 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 main.cpp
+** \version $Id$
+** \brief Application that is run after Vidalia crashes and asks the
+** user if they would like to submit the crash report.
+*/
+
+#include "CrashReportDialog.h"
+
+#include <QApplication>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QTextStream>
+#include <QTextCodec>
+
+
+/** Open the minidump file given by <b>fileName</b> and read its entire
+ * contents into a QByteArray. Returns the contents of the minidump file
+ * on success. If an error occurs, this returns a default-constructed
+ * QByteArray and sets <b>errorMessage</b> to a string describing the error
+ * ecountered.
+ */
+QByteArray
+read_minidump_file(const QString &fileName, QString &errorMessage)
+{
+ QByteArray md;
+ QFile mdFile(fileName);
+
+ if (! mdFile.open(QIODevice::ReadOnly)) {
+ errorMessage = mdFile.errorString();
+ return QByteArray();
+ }
+ while (! mdFile.atEnd()) {
+ md.append(mdFile.readAll());
+ if (mdFile.error() != QFile::NoError) {
+ errorMessage = mdFile.errorString();
+ return QByteArray();
+ }
+ }
+ mdFile.close();
+ return md;
+}
+
+/** Read the crash dump annotations file given by <b>fileName</b> and parse
+ * each line into a Key=Value pair. Returns a QHash containing the keys
+ * mapped to their values on success. If a file or parse error occurs, this
+ * returns a default-constructed QHash and sets <b>errorMessage</b> to a
+ * string describing the error encountered.
+ */
+QHash<QString,QString>
+read_annotations_file(const QString &fileName, QString &errorMessage)
+{
+ QHash<QString, QString> annotations;
+
+ /* Open the annotations file for reading text */
+ QFile infile(fileName);
+ if (! infile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ errorMessage = infile.errorString();
+ return QHash<QString,QString>();
+ }
+
+ /* The annotations file should be UTF-8 encoded */
+ QTextStream reader(&infile);
+ reader.setCodec(QTextCodec::codecForName("utf-8"));
+ while (! reader.atEnd()) {
+ QString line = reader.readLine().trimmed();
+ if (line.isEmpty())
+ continue;
+
+ int idx = line.indexOf("=");
+ if (idx > 0 && idx < line.length()-1) {
+ QString key = line.mid(0, idx).trimmed();
+ QString val = line.mid(idx + 1).trimmed();
+ annotations.insert(key, val);
+ }
+ }
+ return annotations;
+}
+
+int
+main(int argc, char *argv[])
+{
+ QApplication app(argc, argv);
+ CrashReportDialog crashDialog;
+ QFileInfo minidumpFile, extraInfoFile;
+ QString minidumpFilePath, extraInfoFilePath, errorMessage;
+ QHash<QString,QString> annotations;
+ QByteArray minidump;
+
+ if (argc < 2) {
+ errorMessage = "No minidump file specified.";
+ goto err;
+ }
+
+ /* Ensure that the specified minidump file exists and is readable */
+ minidumpFile = QFileInfo(argv[1]);
+ minidumpFilePath = minidumpFile.absoluteFilePath();
+ if (! minidumpFile.exists() || ! minidumpFile.size()) {
+ errorMessage = QString("The specified minidump file does not exist: %1")
+ .arg(minidumpFilePath);
+ goto err;
+ }
+ if (! minidumpFile.isReadable()) {
+ errorMessage = QString("The specified minidump file is not readable: %1")
+ .arg(minidumpFilePath);
+ goto err;
+ }
+
+ /* Ensure that the specified minidump has an associated extra crash
+ * information file that exists and is readable. */
+ extraInfoFile = QFileInfo(minidumpFilePath + ".info");
+ extraInfoFilePath = extraInfoFile.absoluteFilePath();
+ if (! extraInfoFile.exists() || ! extraInfoFile.size()) {
+ errorMessage = QString("The specified minidump does not have a "
+ "corresponding crash annotations file: %1")
+ .arg(extraInfoFilePath);
+ goto err;
+ }
+ if (! extraInfoFile.isReadable()) {
+ errorMessage = QString("The specified crash information file is not "
+ "readable: %1").arg(extraInfoFilePath);
+ goto err;
+ }
+
+ /* Read the minidump file's contents */
+ minidump = read_minidump_file(minidumpFilePath, errorMessage);
+ if (minidump.isNull()) {
+ errorMessage = QString("Unable to read minidump file '%1': %2")
+ .arg(minidumpFilePath)
+ .arg(errorMessage);
+ goto err;
+ }
+ /* Read and parse the crash annotations file */
+ annotations = read_annotations_file(extraInfoFilePath, errorMessage);
+ if (annotations.isEmpty()) {
+ errorMessage = QString("Unable to read crash annotations file '%1': %2")
+ .arg(extraInfoFilePath)
+ .arg(errorMessage);
+ goto err;
+ }
+
+ /* Display the crash reporting dialog */
+ crashDialog.setMinidump(minidumpFile.baseName(), minidump);
+ crashDialog.setCrashAnnotations(annotations);
+ crashDialog.show();
+ return app.exec();
+
+err:
+ /* We encountered an error trying to load the minidump or extra crash
+ * information file. So, display an error and then bail, since now there's
+ * nothing for us to send. */
+ QMessageBox dlg;
+ dlg.setWindowIcon(QIcon(":/images/32x32/tools-report-bug.png"));
+ dlg.setWindowTitle("Crash Reporter Error");
+
+ dlg.setIconPixmap(QPixmap(":/images/64x64/tools-report-bug.png"));
+ dlg.setStandardButtons(QMessageBox::Ok);
+
+ dlg.setText("<b>Vidalia encountered an error and needed to close</b>");
+ dlg.setInformativeText(
+ "<p>Vidalia attempted to automatically create an error report to "
+ "help diagnose the problem, but was unable to do so. Please report "
+ "this problem, along with what you were doing before Vidalia crashed, "
+ "to the developers at:</p><p>"
+ "<a href=\"https://trac.vidalia-project.net/wiki/ReportingBugs\">"
+ "https://trac.vidalia-project.net/wiki/ReportingBugs</a></p> "
+ "<p>Click \"Show Details\" below for information about the problem "
+ "encountered.");
+
+ dlg.setDetailedText(errorMessage);
+ return dlg.exec();
+}
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/32x32/tools-report-bug.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/32x32/tools-report-bug.png
new file mode 100644
index 0000000..c7ace70
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/32x32/tools-report-bug.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/48x48/tools-report-bug.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/48x48/tools-report-bug.png
new file mode 100644
index 0000000..239a43e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/48x48/tools-report-bug.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/64x64/tools-report-bug.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/64x64/tools-report-bug.png
new file mode 100644
index 0000000..b313d4d
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/64x64/tools-report-bug.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/CrashReporter.ico b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/CrashReporter.ico
new file mode 100644
index 0000000..f1459db
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/CrashReporter.ico differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/CrashReporter.qrc b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/CrashReporter.qrc
new file mode 100644
index 0000000..fce4d94
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/CrashReporter.qrc
@@ -0,0 +1,11 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+ <qresource prefix="images">
+ <file>32x32/tools-report-bug.png</file>
+ <file>48x48/tools-report-bug.png</file>
+ <file>64x64/tools-report-bug.png</file>
+ </qresource>
+ <qresource prefix="pki">
+ <file>gd-class2-root.crt</file>
+ </qresource>
+</RCC>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/CrashReporter.rc.in b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/CrashReporter.rc.in
new file mode 100644
index 0000000..d3e5951
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/CrashReporter.rc.in
@@ -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 CrashReporter.rc.in
+** \version $Id$
+** Defines resource identifiers for icons used on Win32.
+*/
+
+#include <winver.h>
+
+
+1 VERSIONINFO
+FILEVERSION @VER_MAJOR@, at VER_MINOR@, at VER_PATCH@,0
+PRODUCTVERSION @VER_MAJOR@, at VER_MINOR@, at VER_PATCH@,0
+FILEFLAGSMASK 0
+FILEOS VOS__WINDOWS32
+FILETYPE VFT_APP
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "FileVersion", "@VERSION@"
+ VALUE "ProductVersion", "@VERSION@"
+ VALUE "InternalName", "CrashReporter"
+ VALUE "ProductName", "Vidalia Crash Reporter"
+ VALUE "FileDescription", "Vidalia Crash Reporter"
+ VALUE "OriginalFilename", "CrashReporter.exe"
+ VALUE "CompanyName", "vidalia-project.net"
+ VALUE "LegalCopyright", "Copyright (C) 2009, Matt Edman"
+ }
+ }
+}
+
+
+/* Application icon */
+101 ICON DISCARDABLE "@CMAKE_CURRENT_SOURCE_DIR@/res/CrashReporter.ico"
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/gd-class2-root.crt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/gd-class2-root.crt
new file mode 100644
index 0000000..42e8d1e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/crashreporter/res/gd-class2-root.crt
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
+MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
+YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
+MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
+ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
+MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
+ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
+PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
+wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
+EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
+avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
+sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
+/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
+IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
+OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
+TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
+dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
+ReYNnyicsbkqWletNw+vHX/bvZ8=
+-----END CERTIFICATE-----
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/CMakeLists.txt
new file mode 100644
index 0000000..1454e06
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/CMakeLists.txt
@@ -0,0 +1,35 @@
+##
+## $Id: CMakeLists.txt 4274 2010-04-28 21:47:18Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+add_definitions(-DSTATICLIB -DNDEBUG)
+
+set(miniupnpc_SRCS
+ igd_desc_parse.c
+ minisoap.c
+ miniupnpc.c
+ miniwget.c
+ minixml.c
+ upnpcommands.c
+ upnperrors.c
+ upnpreplyparse.c
+ connecthostport.c
+)
+if (NOT WIN32)
+ set(miniupnpc_SRCS ${miniupnpc_SRCS} minissdpc.c)
+endif(NOT WIN32)
+
+add_library(miniupnpc STATIC ${miniupnpc_SRCS})
+if (WIN32)
+ add_definitions(-D_WIN32_WINNT=0x0501)
+ target_link_libraries(miniupnpc ws2_32)
+endif(WIN32)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/bsdqueue.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/bsdqueue.h
new file mode 100644
index 0000000..1fe0599
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/bsdqueue.h
@@ -0,0 +1,531 @@
+/* $OpenBSD: queue.h,v 1.31 2005/11/25 08:06:25 otto Exp $ */
+/* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */
+
+/*
+ * Copyright (c) 1991, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)queue.h 8.5 (Berkeley) 8/20/94
+ */
+
+#ifndef _SYS_QUEUE_H_
+#define _SYS_QUEUE_H_
+
+/*
+ * This file defines five types of data structures: singly-linked lists,
+ * lists, simple queues, tail queues, and circular queues.
+ *
+ *
+ * A singly-linked list is headed by a single forward pointer. The elements
+ * are singly linked for minimum space and pointer manipulation overhead at
+ * the expense of O(n) removal for arbitrary elements. New elements can be
+ * added to the list after an existing element or at the head of the list.
+ * Elements being removed from the head of the list should use the explicit
+ * macro for this purpose for optimum efficiency. A singly-linked list may
+ * only be traversed in the forward direction. Singly-linked lists are ideal
+ * for applications with large datasets and few or no removals or for
+ * implementing a LIFO queue.
+ *
+ * A list is headed by a single forward pointer (or an array of forward
+ * pointers for a hash table header). The elements are doubly linked
+ * so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before
+ * or after an existing element or at the head of the list. A list
+ * may only be traversed in the forward direction.
+ *
+ * A simple queue is headed by a pair of pointers, one the head of the
+ * list and the other to the tail of the list. The elements are singly
+ * linked to save space, so elements can only be removed from the
+ * head of the list. New elements can be added to the list before or after
+ * an existing element, at the head of the list, or at the end of the
+ * list. A simple queue may only be traversed in the forward direction.
+ *
+ * A tail queue is headed by a pair of pointers, one to the head of the
+ * list and the other to the tail of the list. The elements are doubly
+ * linked so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before or
+ * after an existing element, at the head of the list, or at the end of
+ * the list. A tail queue may be traversed in either direction.
+ *
+ * A circle queue is headed by a pair of pointers, one to the head of the
+ * list and the other to the tail of the list. The elements are doubly
+ * linked so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before or after
+ * an existing element, at the head of the list, or at the end of the list.
+ * A circle queue may be traversed in either direction, but has a more
+ * complex end of list detection.
+ *
+ * For details on the use of these macros, see the queue(3) manual page.
+ */
+
+#ifdef QUEUE_MACRO_DEBUG
+#define _Q_INVALIDATE(a) (a) = ((void *)-1)
+#else
+#define _Q_INVALIDATE(a)
+#endif
+
+/*
+ * Singly-linked List definitions.
+ */
+#define SLIST_HEAD(name, type) \
+struct name { \
+ struct type *slh_first; /* first element */ \
+}
+
+#define SLIST_HEAD_INITIALIZER(head) \
+ { NULL }
+
+#ifdef SLIST_ENTRY
+#undef SLIST_ENTRY
+#endif
+
+#define SLIST_ENTRY(type) \
+struct { \
+ struct type *sle_next; /* next element */ \
+}
+
+/*
+ * Singly-linked List access methods.
+ */
+#define SLIST_FIRST(head) ((head)->slh_first)
+#define SLIST_END(head) NULL
+#define SLIST_EMPTY(head) (SLIST_FIRST(head) == SLIST_END(head))
+#define SLIST_NEXT(elm, field) ((elm)->field.sle_next)
+
+#define SLIST_FOREACH(var, head, field) \
+ for((var) = SLIST_FIRST(head); \
+ (var) != SLIST_END(head); \
+ (var) = SLIST_NEXT(var, field))
+
+#define SLIST_FOREACH_PREVPTR(var, varp, head, field) \
+ for ((varp) = &SLIST_FIRST((head)); \
+ ((var) = *(varp)) != SLIST_END(head); \
+ (varp) = &SLIST_NEXT((var), field))
+
+/*
+ * Singly-linked List functions.
+ */
+#define SLIST_INIT(head) { \
+ SLIST_FIRST(head) = SLIST_END(head); \
+}
+
+#define SLIST_INSERT_AFTER(slistelm, elm, field) do { \
+ (elm)->field.sle_next = (slistelm)->field.sle_next; \
+ (slistelm)->field.sle_next = (elm); \
+} while (0)
+
+#define SLIST_INSERT_HEAD(head, elm, field) do { \
+ (elm)->field.sle_next = (head)->slh_first; \
+ (head)->slh_first = (elm); \
+} while (0)
+
+#define SLIST_REMOVE_NEXT(head, elm, field) do { \
+ (elm)->field.sle_next = (elm)->field.sle_next->field.sle_next; \
+} while (0)
+
+#define SLIST_REMOVE_HEAD(head, field) do { \
+ (head)->slh_first = (head)->slh_first->field.sle_next; \
+} while (0)
+
+#define SLIST_REMOVE(head, elm, type, field) do { \
+ if ((head)->slh_first == (elm)) { \
+ SLIST_REMOVE_HEAD((head), field); \
+ } else { \
+ struct type *curelm = (head)->slh_first; \
+ \
+ while (curelm->field.sle_next != (elm)) \
+ curelm = curelm->field.sle_next; \
+ curelm->field.sle_next = \
+ curelm->field.sle_next->field.sle_next; \
+ _Q_INVALIDATE((elm)->field.sle_next); \
+ } \
+} while (0)
+
+/*
+ * List definitions.
+ */
+#define LIST_HEAD(name, type) \
+struct name { \
+ struct type *lh_first; /* first element */ \
+}
+
+#define LIST_HEAD_INITIALIZER(head) \
+ { NULL }
+
+#define LIST_ENTRY(type) \
+struct { \
+ struct type *le_next; /* next element */ \
+ struct type **le_prev; /* address of previous next element */ \
+}
+
+/*
+ * List access methods
+ */
+#define LIST_FIRST(head) ((head)->lh_first)
+#define LIST_END(head) NULL
+#define LIST_EMPTY(head) (LIST_FIRST(head) == LIST_END(head))
+#define LIST_NEXT(elm, field) ((elm)->field.le_next)
+
+#define LIST_FOREACH(var, head, field) \
+ for((var) = LIST_FIRST(head); \
+ (var)!= LIST_END(head); \
+ (var) = LIST_NEXT(var, field))
+
+/*
+ * List functions.
+ */
+#define LIST_INIT(head) do { \
+ LIST_FIRST(head) = LIST_END(head); \
+} while (0)
+
+#define LIST_INSERT_AFTER(listelm, elm, field) do { \
+ if (((elm)->field.le_next = (listelm)->field.le_next) != NULL) \
+ (listelm)->field.le_next->field.le_prev = \
+ &(elm)->field.le_next; \
+ (listelm)->field.le_next = (elm); \
+ (elm)->field.le_prev = &(listelm)->field.le_next; \
+} while (0)
+
+#define LIST_INSERT_BEFORE(listelm, elm, field) do { \
+ (elm)->field.le_prev = (listelm)->field.le_prev; \
+ (elm)->field.le_next = (listelm); \
+ *(listelm)->field.le_prev = (elm); \
+ (listelm)->field.le_prev = &(elm)->field.le_next; \
+} while (0)
+
+#define LIST_INSERT_HEAD(head, elm, field) do { \
+ if (((elm)->field.le_next = (head)->lh_first) != NULL) \
+ (head)->lh_first->field.le_prev = &(elm)->field.le_next;\
+ (head)->lh_first = (elm); \
+ (elm)->field.le_prev = &(head)->lh_first; \
+} while (0)
+
+#define LIST_REMOVE(elm, field) do { \
+ if ((elm)->field.le_next != NULL) \
+ (elm)->field.le_next->field.le_prev = \
+ (elm)->field.le_prev; \
+ *(elm)->field.le_prev = (elm)->field.le_next; \
+ _Q_INVALIDATE((elm)->field.le_prev); \
+ _Q_INVALIDATE((elm)->field.le_next); \
+} while (0)
+
+#define LIST_REPLACE(elm, elm2, field) do { \
+ if (((elm2)->field.le_next = (elm)->field.le_next) != NULL) \
+ (elm2)->field.le_next->field.le_prev = \
+ &(elm2)->field.le_next; \
+ (elm2)->field.le_prev = (elm)->field.le_prev; \
+ *(elm2)->field.le_prev = (elm2); \
+ _Q_INVALIDATE((elm)->field.le_prev); \
+ _Q_INVALIDATE((elm)->field.le_next); \
+} while (0)
+
+/*
+ * Simple queue definitions.
+ */
+#define SIMPLEQ_HEAD(name, type) \
+struct name { \
+ struct type *sqh_first; /* first element */ \
+ struct type **sqh_last; /* addr of last next element */ \
+}
+
+#define SIMPLEQ_HEAD_INITIALIZER(head) \
+ { NULL, &(head).sqh_first }
+
+#define SIMPLEQ_ENTRY(type) \
+struct { \
+ struct type *sqe_next; /* next element */ \
+}
+
+/*
+ * Simple queue access methods.
+ */
+#define SIMPLEQ_FIRST(head) ((head)->sqh_first)
+#define SIMPLEQ_END(head) NULL
+#define SIMPLEQ_EMPTY(head) (SIMPLEQ_FIRST(head) == SIMPLEQ_END(head))
+#define SIMPLEQ_NEXT(elm, field) ((elm)->field.sqe_next)
+
+#define SIMPLEQ_FOREACH(var, head, field) \
+ for((var) = SIMPLEQ_FIRST(head); \
+ (var) != SIMPLEQ_END(head); \
+ (var) = SIMPLEQ_NEXT(var, field))
+
+/*
+ * Simple queue functions.
+ */
+#define SIMPLEQ_INIT(head) do { \
+ (head)->sqh_first = NULL; \
+ (head)->sqh_last = &(head)->sqh_first; \
+} while (0)
+
+#define SIMPLEQ_INSERT_HEAD(head, elm, field) do { \
+ if (((elm)->field.sqe_next = (head)->sqh_first) == NULL) \
+ (head)->sqh_last = &(elm)->field.sqe_next; \
+ (head)->sqh_first = (elm); \
+} while (0)
+
+#define SIMPLEQ_INSERT_TAIL(head, elm, field) do { \
+ (elm)->field.sqe_next = NULL; \
+ *(head)->sqh_last = (elm); \
+ (head)->sqh_last = &(elm)->field.sqe_next; \
+} while (0)
+
+#define SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do { \
+ if (((elm)->field.sqe_next = (listelm)->field.sqe_next) == NULL)\
+ (head)->sqh_last = &(elm)->field.sqe_next; \
+ (listelm)->field.sqe_next = (elm); \
+} while (0)
+
+#define SIMPLEQ_REMOVE_HEAD(head, field) do { \
+ if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL) \
+ (head)->sqh_last = &(head)->sqh_first; \
+} while (0)
+
+/*
+ * Tail queue definitions.
+ */
+#define TAILQ_HEAD(name, type) \
+struct name { \
+ struct type *tqh_first; /* first element */ \
+ struct type **tqh_last; /* addr of last next element */ \
+}
+
+#define TAILQ_HEAD_INITIALIZER(head) \
+ { NULL, &(head).tqh_first }
+
+#define TAILQ_ENTRY(type) \
+struct { \
+ struct type *tqe_next; /* next element */ \
+ struct type **tqe_prev; /* address of previous next element */ \
+}
+
+/*
+ * tail queue access methods
+ */
+#define TAILQ_FIRST(head) ((head)->tqh_first)
+#define TAILQ_END(head) NULL
+#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
+#define TAILQ_LAST(head, headname) \
+ (*(((struct headname *)((head)->tqh_last))->tqh_last))
+/* XXX */
+#define TAILQ_PREV(elm, headname, field) \
+ (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
+#define TAILQ_EMPTY(head) \
+ (TAILQ_FIRST(head) == TAILQ_END(head))
+
+#define TAILQ_FOREACH(var, head, field) \
+ for((var) = TAILQ_FIRST(head); \
+ (var) != TAILQ_END(head); \
+ (var) = TAILQ_NEXT(var, field))
+
+#define TAILQ_FOREACH_REVERSE(var, head, headname, field) \
+ for((var) = TAILQ_LAST(head, headname); \
+ (var) != TAILQ_END(head); \
+ (var) = TAILQ_PREV(var, headname, field))
+
+/*
+ * Tail queue functions.
+ */
+#define TAILQ_INIT(head) do { \
+ (head)->tqh_first = NULL; \
+ (head)->tqh_last = &(head)->tqh_first; \
+} while (0)
+
+#define TAILQ_INSERT_HEAD(head, elm, field) do { \
+ if (((elm)->field.tqe_next = (head)->tqh_first) != NULL) \
+ (head)->tqh_first->field.tqe_prev = \
+ &(elm)->field.tqe_next; \
+ else \
+ (head)->tqh_last = &(elm)->field.tqe_next; \
+ (head)->tqh_first = (elm); \
+ (elm)->field.tqe_prev = &(head)->tqh_first; \
+} while (0)
+
+#define TAILQ_INSERT_TAIL(head, elm, field) do { \
+ (elm)->field.tqe_next = NULL; \
+ (elm)->field.tqe_prev = (head)->tqh_last; \
+ *(head)->tqh_last = (elm); \
+ (head)->tqh_last = &(elm)->field.tqe_next; \
+} while (0)
+
+#define TAILQ_INSERT_AFTER(head, listelm, elm, field) do { \
+ if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
+ (elm)->field.tqe_next->field.tqe_prev = \
+ &(elm)->field.tqe_next; \
+ else \
+ (head)->tqh_last = &(elm)->field.tqe_next; \
+ (listelm)->field.tqe_next = (elm); \
+ (elm)->field.tqe_prev = &(listelm)->field.tqe_next; \
+} while (0)
+
+#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \
+ (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \
+ (elm)->field.tqe_next = (listelm); \
+ *(listelm)->field.tqe_prev = (elm); \
+ (listelm)->field.tqe_prev = &(elm)->field.tqe_next; \
+} while (0)
+
+#define TAILQ_REMOVE(head, elm, field) do { \
+ if (((elm)->field.tqe_next) != NULL) \
+ (elm)->field.tqe_next->field.tqe_prev = \
+ (elm)->field.tqe_prev; \
+ else \
+ (head)->tqh_last = (elm)->field.tqe_prev; \
+ *(elm)->field.tqe_prev = (elm)->field.tqe_next; \
+ _Q_INVALIDATE((elm)->field.tqe_prev); \
+ _Q_INVALIDATE((elm)->field.tqe_next); \
+} while (0)
+
+#define TAILQ_REPLACE(head, elm, elm2, field) do { \
+ if (((elm2)->field.tqe_next = (elm)->field.tqe_next) != NULL) \
+ (elm2)->field.tqe_next->field.tqe_prev = \
+ &(elm2)->field.tqe_next; \
+ else \
+ (head)->tqh_last = &(elm2)->field.tqe_next; \
+ (elm2)->field.tqe_prev = (elm)->field.tqe_prev; \
+ *(elm2)->field.tqe_prev = (elm2); \
+ _Q_INVALIDATE((elm)->field.tqe_prev); \
+ _Q_INVALIDATE((elm)->field.tqe_next); \
+} while (0)
+
+/*
+ * Circular queue definitions.
+ */
+#define CIRCLEQ_HEAD(name, type) \
+struct name { \
+ struct type *cqh_first; /* first element */ \
+ struct type *cqh_last; /* last element */ \
+}
+
+#define CIRCLEQ_HEAD_INITIALIZER(head) \
+ { CIRCLEQ_END(&head), CIRCLEQ_END(&head) }
+
+#define CIRCLEQ_ENTRY(type) \
+struct { \
+ struct type *cqe_next; /* next element */ \
+ struct type *cqe_prev; /* previous element */ \
+}
+
+/*
+ * Circular queue access methods
+ */
+#define CIRCLEQ_FIRST(head) ((head)->cqh_first)
+#define CIRCLEQ_LAST(head) ((head)->cqh_last)
+#define CIRCLEQ_END(head) ((void *)(head))
+#define CIRCLEQ_NEXT(elm, field) ((elm)->field.cqe_next)
+#define CIRCLEQ_PREV(elm, field) ((elm)->field.cqe_prev)
+#define CIRCLEQ_EMPTY(head) \
+ (CIRCLEQ_FIRST(head) == CIRCLEQ_END(head))
+
+#define CIRCLEQ_FOREACH(var, head, field) \
+ for((var) = CIRCLEQ_FIRST(head); \
+ (var) != CIRCLEQ_END(head); \
+ (var) = CIRCLEQ_NEXT(var, field))
+
+#define CIRCLEQ_FOREACH_REVERSE(var, head, field) \
+ for((var) = CIRCLEQ_LAST(head); \
+ (var) != CIRCLEQ_END(head); \
+ (var) = CIRCLEQ_PREV(var, field))
+
+/*
+ * Circular queue functions.
+ */
+#define CIRCLEQ_INIT(head) do { \
+ (head)->cqh_first = CIRCLEQ_END(head); \
+ (head)->cqh_last = CIRCLEQ_END(head); \
+} while (0)
+
+#define CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do { \
+ (elm)->field.cqe_next = (listelm)->field.cqe_next; \
+ (elm)->field.cqe_prev = (listelm); \
+ if ((listelm)->field.cqe_next == CIRCLEQ_END(head)) \
+ (head)->cqh_last = (elm); \
+ else \
+ (listelm)->field.cqe_next->field.cqe_prev = (elm); \
+ (listelm)->field.cqe_next = (elm); \
+} while (0)
+
+#define CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do { \
+ (elm)->field.cqe_next = (listelm); \
+ (elm)->field.cqe_prev = (listelm)->field.cqe_prev; \
+ if ((listelm)->field.cqe_prev == CIRCLEQ_END(head)) \
+ (head)->cqh_first = (elm); \
+ else \
+ (listelm)->field.cqe_prev->field.cqe_next = (elm); \
+ (listelm)->field.cqe_prev = (elm); \
+} while (0)
+
+#define CIRCLEQ_INSERT_HEAD(head, elm, field) do { \
+ (elm)->field.cqe_next = (head)->cqh_first; \
+ (elm)->field.cqe_prev = CIRCLEQ_END(head); \
+ if ((head)->cqh_last == CIRCLEQ_END(head)) \
+ (head)->cqh_last = (elm); \
+ else \
+ (head)->cqh_first->field.cqe_prev = (elm); \
+ (head)->cqh_first = (elm); \
+} while (0)
+
+#define CIRCLEQ_INSERT_TAIL(head, elm, field) do { \
+ (elm)->field.cqe_next = CIRCLEQ_END(head); \
+ (elm)->field.cqe_prev = (head)->cqh_last; \
+ if ((head)->cqh_first == CIRCLEQ_END(head)) \
+ (head)->cqh_first = (elm); \
+ else \
+ (head)->cqh_last->field.cqe_next = (elm); \
+ (head)->cqh_last = (elm); \
+} while (0)
+
+#define CIRCLEQ_REMOVE(head, elm, field) do { \
+ if ((elm)->field.cqe_next == CIRCLEQ_END(head)) \
+ (head)->cqh_last = (elm)->field.cqe_prev; \
+ else \
+ (elm)->field.cqe_next->field.cqe_prev = \
+ (elm)->field.cqe_prev; \
+ if ((elm)->field.cqe_prev == CIRCLEQ_END(head)) \
+ (head)->cqh_first = (elm)->field.cqe_next; \
+ else \
+ (elm)->field.cqe_prev->field.cqe_next = \
+ (elm)->field.cqe_next; \
+ _Q_INVALIDATE((elm)->field.cqe_prev); \
+ _Q_INVALIDATE((elm)->field.cqe_next); \
+} while (0)
+
+#define CIRCLEQ_REPLACE(head, elm, elm2, field) do { \
+ if (((elm2)->field.cqe_next = (elm)->field.cqe_next) == \
+ CIRCLEQ_END(head)) \
+ (head).cqh_last = (elm2); \
+ else \
+ (elm2)->field.cqe_next->field.cqe_prev = (elm2); \
+ if (((elm2)->field.cqe_prev = (elm)->field.cqe_prev) == \
+ CIRCLEQ_END(head)) \
+ (head).cqh_first = (elm2); \
+ else \
+ (elm2)->field.cqe_prev->field.cqe_next = (elm2); \
+ _Q_INVALIDATE((elm)->field.cqe_prev); \
+ _Q_INVALIDATE((elm)->field.cqe_next); \
+} while (0)
+
+#endif /* !_SYS_QUEUE_H_ */
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/codelength.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/codelength.h
new file mode 100644
index 0000000..f11e5e9
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/codelength.h
@@ -0,0 +1,24 @@
+/* $Id: codelength.h,v 1.1 2008/10/06 22:04:06 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas BERNARD
+ * copyright (c) 2005-2008 Thomas Bernard
+ * This software is subjet to the conditions detailed in the
+ * provided LICENCE file. */
+#ifndef __CODELENGTH_H__
+#define __CODELENGTH_H__
+
+/* Encode length by using 7bit per Byte :
+ * Most significant bit of each byte specifies that the
+ * following byte is part of the code */
+#define DECODELENGTH(n, p) n = 0; \
+ do { n = (n << 7) | (*p & 0x7f); } \
+ while(*(p++)&0x80);
+
+#define CODELENGTH(n, p) if(n>=268435456) *(p++) = (n >> 28) | 0x80; \
+ if(n>=2097152) *(p++) = (n >> 21) | 0x80; \
+ if(n>=16384) *(p++) = (n >> 14) | 0x80; \
+ if(n>=128) *(p++) = (n >> 7) | 0x80; \
+ *(p++) = n & 0x7f;
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/connecthostport.c b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/connecthostport.c
new file mode 100644
index 0000000..e52eed0
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/connecthostport.c
@@ -0,0 +1,221 @@
+/* $Id: connecthostport.c,v 1.2 2010/04/05 00:08:15 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas Bernard
+ * Copyright (c) 2010 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution. */
+
+/* use getaddrinfo() or gethostbyname()
+ * uncomment the following line in order to use gethostbyname() */
+/* #define USE_GETHOSTBYNAME */
+
+#include <string.h>
+#include <stdio.h>
+#ifdef WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <io.h>
+#define snprintf _snprintf
+#define herror
+#define socklen_t int
+#else /* #ifdef WIN32 */
+#include <unistd.h>
+#include <errno.h>
+#define closesocket close
+#include <netdb.h>
+/* defining MINIUPNPC_IGNORE_EINTR enable the ignore of interruptions
+ * during the connect() call */
+#define MINIUPNPC_IGNORE_EINTR
+#ifndef USE_GETHOSTBYNAME
+#include <sys/types.h>
+#include <sys/socket.h>
+#endif /* #ifndef USE_GETHOSTBYNAME */
+#endif /* #else WIN32 */
+
+/* definition of PRINT_SOCKET_ERROR */
+#ifdef WIN32
+#define PRINT_SOCKET_ERROR(x) printf("Socket error: %s, %d\n", x, WSAGetLastError());
+#else
+#define PRINT_SOCKET_ERROR(x) perror(x)
+#endif
+
+#if defined(__amigaos__) || defined(__amigaos4__)
+#define herror(A) printf("%s\n", A)
+#endif
+
+#include "connecthostport.h"
+
+/* connecthostport()
+ * return a socket connected (TCP) to the host and port
+ * or -1 in case of error */
+int connecthostport(const char * host, unsigned short port)
+{
+ int s, n;
+#ifdef USE_GETHOSTBYNAME
+ struct sockaddr_in dest;
+ struct hostent *hp;
+#else /* #ifdef USE_GETHOSTBYNAME */
+ char port_str[8];
+ struct addrinfo *ai, *p;
+ struct addrinfo hints;
+#endif /* #ifdef USE_GETHOSTBYNAME */
+#ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
+ struct timeval timeout;
+#endif /* #ifdef MINIUPNPC_SET_SOCKET_TIMEOUT */
+
+#ifdef USE_GETHOSTBYNAME
+ hp = gethostbyname(host);
+ if(hp == NULL)
+ {
+ herror(host);
+ return -1;
+ }
+ memcpy(&dest.sin_addr, hp->h_addr, sizeof(dest.sin_addr));
+ memset(dest.sin_zero, 0, sizeof(dest.sin_zero));
+ s = socket(PF_INET, SOCK_STREAM, 0);
+ if(s < 0)
+ {
+ PRINT_SOCKET_ERROR("socket");
+ return -1;
+ }
+#ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
+ /* setting a 3 seconds timeout for the connect() call */
+ timeout.tv_sec = 3;
+ timeout.tv_usec = 0;
+ if(setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(struct timeval)) < 0)
+ {
+ PRINT_SOCKET_ERROR("setsockopt");
+ }
+ timeout.tv_sec = 3;
+ timeout.tv_usec = 0;
+ if(setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(struct timeval)) < 0)
+ {
+ PRINT_SOCKET_ERROR("setsockopt");
+ }
+#endif /* #ifdef MINIUPNPC_SET_SOCKET_TIMEOUT */
+ dest.sin_family = AF_INET;
+ dest.sin_port = htons(port);
+ n = connect(s, (struct sockaddr *)&dest, sizeof(struct sockaddr_in));
+#ifdef MINIUPNPC_IGNORE_EINTR
+ while(n < 0 && errno == EINTR)
+ {
+ socklen_t len;
+ fd_set wset;
+ int err;
+ FD_ZERO(&wset);
+ FD_SET(s, &wset);
+ if((n = select(s + 1, NULL, &wset, NULL, NULL)) == -1 && errno == EINTR)
+ continue;
+ /*len = 0;*/
+ /*n = getpeername(s, NULL, &len);*/
+ len = sizeof(err);
+ if(getsockopt(s, SOL_SOCKET, SO_ERROR, &err, &len) < 0) {
+ PRINT_SOCKET_ERROR("getsockopt");
+ closesocket(s);
+ return -1;
+ }
+ if(err != 0) {
+ errno = err;
+ n = -1;
+ }
+ }
+#endif /* #ifdef MINIUPNPC_IGNORE_EINTR */
+ if(n<0)
+ {
+ PRINT_SOCKET_ERROR("connect");
+ closesocket(s);
+ return -1;
+ }
+#else /* #ifdef USE_GETHOSTBYNAME */
+ /* use getaddrinfo() instead of gethostbyname() */
+ memset(&hints, 0, sizeof(hints));
+ /* hints.ai_flags = AI_ADDRCONFIG; */
+#ifdef AI_NUMERICSERV
+ hints.ai_flags = AI_NUMERICSERV;
+#endif
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_family = AF_UNSPEC; /* AF_INET, AF_INET6 or AF_UNSPEC */
+ /* hints.ai_protocol = IPPROTO_TCP; */
+ snprintf(port_str, sizeof(port_str), "%hu", port);
+ n = getaddrinfo(host, port_str, &hints, &ai);
+ if(n != 0)
+ {
+#ifdef WIN32
+ fprintf(stderr, "getaddrinfo() error : %d\n", n);
+#else
+ fprintf(stderr, "getaddrinfo() error : %s\n", gai_strerror(n));
+#endif
+ return -1;
+ }
+ s = -1;
+ for(p = ai; p; p = p->ai_next)
+ {
+ s = socket(p->ai_family, p->ai_socktype, p->ai_protocol);
+ if(s < 0)
+ continue;
+#ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
+ /* setting a 3 seconds timeout for the connect() call */
+ timeout.tv_sec = 3;
+ timeout.tv_usec = 0;
+ if(setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(struct timeval)) < 0)
+ {
+ PRINT_SOCKET_ERROR("setsockopt");
+ }
+ timeout.tv_sec = 3;
+ timeout.tv_usec = 0;
+ if(setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(struct timeval)) < 0)
+ {
+ PRINT_SOCKET_ERROR("setsockopt");
+ }
+#endif /* #ifdef MINIUPNPC_SET_SOCKET_TIMEOUT */
+ n = connect(s, p->ai_addr, p->ai_addrlen);
+#ifdef MINIUPNPC_IGNORE_EINTR
+ while(n < 0 && errno == EINTR)
+ {
+ socklen_t len;
+ fd_set wset;
+ int err;
+ FD_ZERO(&wset);
+ FD_SET(s, &wset);
+ if((n = select(s + 1, NULL, &wset, NULL, NULL)) == -1 && errno == EINTR)
+ continue;
+ /*len = 0;*/
+ /*n = getpeername(s, NULL, &len);*/
+ len = sizeof(err);
+ if(getsockopt(s, SOL_SOCKET, SO_ERROR, &err, &len) < 0) {
+ PRINT_SOCKET_ERROR("getsockopt");
+ closesocket(s);
+ freeaddrinfo(ai);
+ return -1;
+ }
+ if(err != 0) {
+ errno = err;
+ n = -1;
+ }
+ }
+#endif /* #ifdef MINIUPNPC_IGNORE_EINTR */
+ if(n < 0)
+ {
+ closesocket(s);
+ continue;
+ }
+ else
+ {
+ break;
+ }
+ }
+ freeaddrinfo(ai);
+ if(s < 0)
+ {
+ PRINT_SOCKET_ERROR("socket");
+ return -1;
+ }
+ if(n < 0)
+ {
+ PRINT_SOCKET_ERROR("connect");
+ return -1;
+ }
+#endif /* #ifdef USE_GETHOSTBYNAME */
+ return s;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/connecthostport.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/connecthostport.h
new file mode 100644
index 0000000..57e24eb
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/connecthostport.h
@@ -0,0 +1,17 @@
+/* $Id: connecthostport.h,v 1.1 2010/04/04 23:21:03 nanard Exp $ */
+/* Project: miniupnp
+ * http://miniupnp.free.fr/
+ * Author: Thomas Bernard
+ * Copyright (c) 2010 Thomas Bernard
+ * This software is subjects to the conditions detailed
+ * in the LICENCE file provided within this distribution */
+#ifndef __CONNECTHOSTPORT_H__
+#define __CONNECTHOSTPORT_H__
+
+/* connecthostport()
+ * return a socket connected (TCP) to the host and port
+ * or -1 in case of error */
+int connecthostport(const char * host, unsigned short port);
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/declspec.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/declspec.h
new file mode 100644
index 0000000..b804247
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/declspec.h
@@ -0,0 +1,15 @@
+#ifndef __DECLSPEC_H__
+#define __DECLSPEC_H__
+
+#if defined(WIN32) && !defined(STATICLIB)
+ #ifdef MINIUPNP_EXPORTS
+ #define LIBSPEC __declspec(dllexport)
+ #else
+ #define LIBSPEC __declspec(dllimport)
+ #endif
+#else
+ #define LIBSPEC
+#endif
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/igd_desc_parse.c b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/igd_desc_parse.c
new file mode 100644
index 0000000..7440e9f
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/igd_desc_parse.c
@@ -0,0 +1,114 @@
+/* $Id: igd_desc_parse.c,v 1.10 2010/04/05 20:36:59 nanard Exp $ */
+/* Project : miniupnp
+ * http://miniupnp.free.fr/
+ * Author : Thomas Bernard
+ * Copyright (c) 2005-2010 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution. */
+
+#include "igd_desc_parse.h"
+#include <stdio.h>
+#include <string.h>
+
+/* Start element handler :
+ * update nesting level counter and copy element name */
+void IGDstartelt(void * d, const char * name, int l)
+{
+ struct IGDdatas * datas = (struct IGDdatas *)d;
+ memcpy( datas->cureltname, name, l);
+ datas->cureltname[l] = '\0';
+ datas->level++;
+ if( (l==7) && !memcmp(name, "service", l) ) {
+ datas->tmp.controlurl[0] = '\0';
+ datas->tmp.eventsuburl[0] = '\0';
+ datas->tmp.scpdurl[0] = '\0';
+ datas->tmp.servicetype[0] = '\0';
+ }
+}
+
+/* End element handler :
+ * update nesting level counter and update parser state if
+ * service element is parsed */
+void IGDendelt(void * d, const char * name, int l)
+{
+ struct IGDdatas * datas = (struct IGDdatas *)d;
+ datas->level--;
+ /*printf("endelt %2d %.*s\n", datas->level, l, name);*/
+ if( (l==7) && !memcmp(name, "service", l) )
+ {
+ /*
+ if( datas->state < 1
+ && !strcmp(datas->servicetype,
+ // "urn:schemas-upnp-org:service:WANIPConnection:1") )
+ "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1"))
+ datas->state ++;
+ */
+ if(0==strcmp(datas->tmp.servicetype,
+ "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1")) {
+ memcpy(&datas->CIF, &datas->tmp, sizeof(struct IGDdatas_service));
+ } else if(0==strcmp(datas->tmp.servicetype,
+ "urn:schemas-upnp-org:service:WANIPConnection:1")
+ || 0==strcmp(datas->tmp.servicetype,
+ "urn:schemas-upnp-org:service:WANPPPConnection:1") ) {
+ if(datas->first.servicetype[0] == '\0') {
+ memcpy(&datas->first, &datas->tmp, sizeof(struct IGDdatas_service));
+ } else {
+ memcpy(&datas->second, &datas->tmp, sizeof(struct IGDdatas_service));
+ }
+ }
+ }
+}
+
+/* Data handler :
+ * copy data depending on the current element name and state */
+void IGDdata(void * d, const char * data, int l)
+{
+ struct IGDdatas * datas = (struct IGDdatas *)d;
+ char * dstmember = 0;
+ /*printf("%2d %s : %.*s\n",
+ datas->level, datas->cureltname, l, data); */
+ if( !strcmp(datas->cureltname, "URLBase") )
+ dstmember = datas->urlbase;
+ else if( !strcmp(datas->cureltname, "serviceType") )
+ dstmember = datas->tmp.servicetype;
+ else if( !strcmp(datas->cureltname, "controlURL") )
+ dstmember = datas->tmp.controlurl;
+ else if( !strcmp(datas->cureltname, "eventSubURL") )
+ dstmember = datas->tmp.eventsuburl;
+ else if( !strcmp(datas->cureltname, "SCPDURL") )
+ dstmember = datas->tmp.scpdurl;
+/* else if( !strcmp(datas->cureltname, "deviceType") )
+ dstmember = datas->devicetype_tmp;*/
+ if(dstmember)
+ {
+ if(l>=MINIUPNPC_URL_MAXSIZE)
+ l = MINIUPNPC_URL_MAXSIZE-1;
+ memcpy(dstmember, data, l);
+ dstmember[l] = '\0';
+ }
+}
+
+void printIGD(struct IGDdatas * d)
+{
+ printf("urlbase = '%s'\n", d->urlbase);
+ printf("WAN Device (Common interface config) :\n");
+ /*printf(" deviceType = '%s'\n", d->CIF.devicetype);*/
+ printf(" serviceType = '%s'\n", d->CIF.servicetype);
+ printf(" controlURL = '%s'\n", d->CIF.controlurl);
+ printf(" eventSubURL = '%s'\n", d->CIF.eventsuburl);
+ printf(" SCPDURL = '%s'\n", d->CIF.scpdurl);
+ printf("WAN Connection Device (IP or PPP Connection):\n");
+ /*printf(" deviceType = '%s'\n", d->first.devicetype);*/
+ printf(" servicetype = '%s'\n", d->first.servicetype);
+ printf(" controlURL = '%s'\n", d->first.controlurl);
+ printf(" eventSubURL = '%s'\n", d->first.eventsuburl);
+ printf(" SCPDURL = '%s'\n", d->first.scpdurl);
+ printf("secondary WAN Connection Device (IP or PPP Connection):\n");
+ /*printf(" deviceType = '%s'\n", d->second.devicetype);*/
+ printf(" servicetype = '%s'\n", d->second.servicetype);
+ printf(" controlURL = '%s'\n", d->second.controlurl);
+ printf(" eventSubURL = '%s'\n", d->second.eventsuburl);
+ printf(" SCPDURL = '%s'\n", d->second.scpdurl);
+}
+
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/igd_desc_parse.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/igd_desc_parse.h
new file mode 100644
index 0000000..40cca60
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/igd_desc_parse.h
@@ -0,0 +1,45 @@
+/* $Id: igd_desc_parse.h,v 1.7 2010/04/05 20:36:59 nanard Exp $ */
+/* Project : miniupnp
+ * http://miniupnp.free.fr/
+ * Author : Thomas Bernard
+ * Copyright (c) 2005-2010 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution.
+ * */
+#ifndef __IGD_DESC_PARSE_H__
+#define __IGD_DESC_PARSE_H__
+
+/* Structure to store the result of the parsing of UPnP
+ * descriptions of Internet Gateway Devices */
+#define MINIUPNPC_URL_MAXSIZE (128)
+struct IGDdatas_service {
+ char controlurl[MINIUPNPC_URL_MAXSIZE];
+ char eventsuburl[MINIUPNPC_URL_MAXSIZE];
+ char scpdurl[MINIUPNPC_URL_MAXSIZE];
+ char servicetype[MINIUPNPC_URL_MAXSIZE];
+ /*char devicetype[MINIUPNPC_URL_MAXSIZE];*/
+};
+
+struct IGDdatas {
+ char cureltname[MINIUPNPC_URL_MAXSIZE];
+ char urlbase[MINIUPNPC_URL_MAXSIZE];
+ int level;
+ /*int state;*/
+ /* "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1" */
+ struct IGDdatas_service CIF;
+ /* "urn:schemas-upnp-org:service:WANIPConnection:1"
+ * "urn:schemas-upnp-org:service:WANPPPConnection:1" */
+ struct IGDdatas_service first;
+ /* if both WANIPConnection and WANPPPConnection are present */
+ struct IGDdatas_service second;
+ /* tmp */
+ struct IGDdatas_service tmp;
+};
+
+void IGDstartelt(void *, const char *, int);
+void IGDendelt(void *, const char *, int);
+void IGDdata(void *, const char *, int);
+void printIGD(struct IGDdatas *);
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minisoap.c b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minisoap.c
new file mode 100644
index 0000000..26022ad
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minisoap.c
@@ -0,0 +1,116 @@
+/* $Id: minisoap.c,v 1.18 2009/12/04 11:29:18 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas Bernard
+ * Copyright (c) 2005-2009 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution.
+ *
+ * Minimal SOAP implementation for UPnP protocol.
+ */
+#include <stdio.h>
+#include <string.h>
+#ifdef WIN32
+#include <io.h>
+#include <winsock2.h>
+#define snprintf _snprintf
+#else
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#endif
+#include "minisoap.h"
+#include "miniupnpcstrings.h"
+
+/* only for malloc */
+#include <stdlib.h>
+
+#ifdef WIN32
+#define PRINT_SOCKET_ERROR(x) printf("Socket error: %s, %d\n", x, WSAGetLastError());
+#else
+#define PRINT_SOCKET_ERROR(x) perror(x)
+#endif
+
+/* httpWrite sends the headers and the body to the socket
+ * and returns the number of bytes sent */
+static int
+httpWrite(int fd, const char * body, int bodysize,
+ const char * headers, int headerssize)
+{
+ int n = 0;
+ /*n = write(fd, headers, headerssize);*/
+ /*if(bodysize>0)
+ n += write(fd, body, bodysize);*/
+ /* Note : my old linksys router only took into account
+ * soap request that are sent into only one packet */
+ char * p;
+ /* TODO: AVOID MALLOC */
+ p = malloc(headerssize+bodysize);
+ if(!p)
+ return 0;
+ memcpy(p, headers, headerssize);
+ memcpy(p+headerssize, body, bodysize);
+ /*n = write(fd, p, headerssize+bodysize);*/
+ n = send(fd, p, headerssize+bodysize, 0);
+ if(n<0) {
+ PRINT_SOCKET_ERROR("send");
+ }
+ /* disable send on the socket */
+ /* draytek routers dont seems to like that... */
+#if 0
+#ifdef WIN32
+ if(shutdown(fd, SD_SEND)<0) {
+#else
+ if(shutdown(fd, SHUT_WR)<0) { /*SD_SEND*/
+#endif
+ PRINT_SOCKET_ERROR("shutdown");
+ }
+#endif
+ free(p);
+ return n;
+}
+
+/* self explanatory */
+int soapPostSubmit(int fd,
+ const char * url,
+ const char * host,
+ unsigned short port,
+ const char * action,
+ const char * body)
+{
+ int bodysize;
+ char headerbuf[512];
+ int headerssize;
+ char portstr[8];
+ bodysize = (int)strlen(body);
+ /* We are not using keep-alive HTTP connections.
+ * HTTP/1.1 needs the header Connection: close to do that.
+ * This is the default with HTTP/1.0
+ * Using HTTP/1.1 means we need to support chunked transfer-encoding :
+ * When using HTTP/1.1, the router "BiPAC 7404VNOX" always use chunked
+ * transfer encoding. */
+ /* Connection: Close is normally there only in HTTP/1.1 but who knows */
+ portstr[0] = '\0';
+ if(port != 80)
+ snprintf(portstr, sizeof(portstr), ":%hu", port);
+ headerssize = snprintf(headerbuf, sizeof(headerbuf),
+/* "POST %s HTTP/1.1\r\n" */
+ "POST %s HTTP/1.0\r\n"
+ "Host: %s%s\r\n"
+ "User-Agent: " OS_STRING ", UPnP/1.0, MiniUPnPc/" MINIUPNPC_VERSION_STRING "\r\n"
+ "Content-Length: %d\r\n"
+ "Content-Type: text/xml\r\n"
+ "SOAPAction: \"%s\"\r\n"
+ "Connection: Close\r\n"
+ "Cache-Control: no-cache\r\n" /* ??? */
+ "Pragma: no-cache\r\n"
+ "\r\n",
+ url, host, portstr, bodysize, action);
+#ifdef DEBUG
+ printf("SOAP request : headersize=%d bodysize=%d\n",
+ headerssize, bodysize);
+ /*printf("%s", headerbuf);*/
+#endif
+ return httpWrite(fd, body, bodysize, headerbuf, headerssize);
+}
+
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minisoap.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minisoap.h
new file mode 100644
index 0000000..9fa297f
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minisoap.h
@@ -0,0 +1,15 @@
+/* $Id: minisoap.h,v 1.3 2006/11/19 22:32:34 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas Bernard
+ * Copyright (c) 2005 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution. */
+#ifndef __MINISOAP_H__
+#define __MINISOAP_H__
+
+/*int httpWrite(int, const char *, int, const char *);*/
+int soapPostSubmit(int, const char *, const char *, unsigned short,
+ const char *, const char *);
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minissdpc.c b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minissdpc.c
new file mode 100644
index 0000000..33ffa3a
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minissdpc.c
@@ -0,0 +1,130 @@
+/* $Id: minissdpc.c,v 1.13 2009/12/04 16:57:29 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas BERNARD
+ * copyright (c) 2005-2009 Thomas Bernard
+ * This software is subjet to the conditions detailed in the
+ * provided LICENCE file. */
+/*#include <syslog.h>*/
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#if defined(WIN32) || defined(__amigaos__) || defined(__amigaos4__)
+#ifdef WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <io.h>
+#endif
+#if defined(__amigaos__) || defined(__amigaos4__)
+#include <sys/socket.h>
+#endif
+#if defined(__amigaos__)
+#define uint16_t unsigned short
+#endif
+/* Hack */
+#define UNIX_PATH_LEN 108
+struct sockaddr_un {
+ uint16_t sun_family;
+ char sun_path[UNIX_PATH_LEN];
+};
+#else
+#include <sys/socket.h>
+#include <sys/un.h>
+#endif
+
+#include "minissdpc.h"
+#include "miniupnpc.h"
+
+#include "codelength.h"
+
+struct UPNPDev *
+getDevicesFromMiniSSDPD(const char * devtype, const char * socketpath)
+{
+ struct UPNPDev * tmp;
+ struct UPNPDev * devlist = NULL;
+ unsigned char buffer[2048];
+ ssize_t n;
+ unsigned char * p;
+ unsigned char * url;
+ unsigned int i;
+ unsigned int urlsize, stsize, usnsize, l;
+ int s;
+ struct sockaddr_un addr;
+
+ s = socket(AF_UNIX, SOCK_STREAM, 0);
+ if(s < 0)
+ {
+ /*syslog(LOG_ERR, "socket(unix): %m");*/
+ perror("socket(unix)");
+ return NULL;
+ }
+ addr.sun_family = AF_UNIX;
+ strncpy(addr.sun_path, socketpath, sizeof(addr.sun_path));
+ /* TODO : check if we need to handle the EINTR */
+ if(connect(s, (struct sockaddr *)&addr, sizeof(struct sockaddr_un)) < 0)
+ {
+ /*syslog(LOG_WARNING, "connect(\"%s\"): %m", socketpath);*/
+ close(s);
+ return NULL;
+ }
+ stsize = strlen(devtype);
+ buffer[0] = 1; /* request type 1 : request devices/services by type */
+ p = buffer + 1;
+ l = stsize; CODELENGTH(l, p);
+ if(p + stsize > buffer + sizeof(buffer))
+ {
+ /* devtype is too long ! */
+ close(s);
+ return NULL;
+ }
+ memcpy(p, devtype, stsize);
+ p += stsize;
+ if(write(s, buffer, p - buffer) < 0)
+ {
+ /*syslog(LOG_ERR, "write(): %m");*/
+ perror("minissdpc.c: write()");
+ close(s);
+ return NULL;
+ }
+ n = read(s, buffer, sizeof(buffer));
+ if(n<=0)
+ {
+ perror("minissdpc.c: read()");
+ close(s);
+ return NULL;
+ }
+ p = buffer + 1;
+ for(i = 0; i < buffer[0]; i++)
+ {
+ if(p+2>=buffer+sizeof(buffer))
+ break;
+ DECODELENGTH(urlsize, p);
+ if(p+urlsize+2>=buffer+sizeof(buffer))
+ break;
+ url = p;
+ p += urlsize;
+ DECODELENGTH(stsize, p);
+ if(p+stsize+2>=buffer+sizeof(buffer))
+ break;
+ tmp = (struct UPNPDev *)malloc(sizeof(struct UPNPDev)+urlsize+stsize);
+ tmp->pNext = devlist;
+ tmp->descURL = tmp->buffer;
+ tmp->st = tmp->buffer + 1 + urlsize;
+ memcpy(tmp->buffer, url, urlsize);
+ tmp->buffer[urlsize] = '\0';
+ memcpy(tmp->buffer + urlsize + 1, p, stsize);
+ p += stsize;
+ tmp->buffer[urlsize+1+stsize] = '\0';
+ devlist = tmp;
+ /* added for compatibility with recent versions of MiniSSDPd
+ * >= 2007/12/19 */
+ DECODELENGTH(usnsize, p);
+ p += usnsize;
+ if(p>buffer + sizeof(buffer))
+ break;
+ }
+ close(s);
+ return devlist;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minissdpc.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minissdpc.h
new file mode 100644
index 0000000..25e91ce
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minissdpc.h
@@ -0,0 +1,15 @@
+/* $Id: minissdpc.h,v 1.1 2007/08/31 15:15:33 nanard Exp $ */
+/* Project: miniupnp
+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * Author: Thomas Bernard
+ * Copyright (c) 2005-2007 Thomas Bernard
+ * This software is subjects to the conditions detailed
+ * in the LICENCE file provided within this distribution */
+#ifndef __MINISSDPC_H__
+#define __MINISSDPC_H__
+
+struct UPNPDev *
+getDevicesFromMiniSSDPD(const char * devtype, const char * socketpath);
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniupnpc.c b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniupnpc.c
new file mode 100644
index 0000000..e76b034
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniupnpc.c
@@ -0,0 +1,892 @@
+/* $Id: miniupnpc.c,v 1.78 2010/04/05 20:36:59 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas BERNARD
+ * copyright (c) 2005-2010 Thomas Bernard
+ * This software is subjet to the conditions detailed in the
+ * provided LICENSE file. */
+#define __EXTENSIONS__ 1
+#if !defined(MACOSX) && !defined(__sun)
+#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+#ifndef __cplusplus
+#define _XOPEN_SOURCE 600
+#endif
+#endif
+#ifndef __BSD_VISIBLE
+#define __BSD_VISIBLE 1
+#endif
+#endif
+
+#ifdef __APPLE__
+#define _DARWIN_C_SOURCE
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#ifdef WIN32
+/* Win32 Specific includes and defines */
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <io.h>
+/*#include <IPHlpApi.h>*/
+#define snprintf _snprintf
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#define strncasecmp _memicmp
+#else /* defined(_MSC_VER) && (_MSC_VER >= 1400) */
+#define strncasecmp memicmp
+#endif /* defined(_MSC_VER) && (_MSC_VER >= 1400) */
+#define MAXHOSTNAMELEN 64
+#else /* #ifdef WIN32 */
+/* Standard POSIX includes */
+#include <unistd.h>
+#if defined(__amigaos__) && !defined(__amigaos4__)
+/* Amiga OS 3 specific stuff */
+#define socklen_t int
+#else
+#include <sys/select.h>
+#endif
+#if defined(__APPLE__)
+#undef _POSIX_C_SOURCE
+#endif
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/param.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#if !defined(__amigaos__) && !defined(__amigaos4__)
+#include <poll.h>
+#endif
+#include <strings.h>
+#include <errno.h>
+#define closesocket close
+#define MINIUPNPC_IGNORE_EINTR
+#endif /* #else WIN32 */
+#ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
+#include <sys/time.h>
+#endif
+#if defined(__amigaos__) || defined(__amigaos4__)
+/* Amiga OS specific stuff */
+#define TIMEVAL struct timeval
+#endif
+
+#include "miniupnpc.h"
+#include "minissdpc.h"
+#include "miniwget.h"
+#include "minisoap.h"
+#include "minixml.h"
+#include "upnpcommands.h"
+#include "connecthostport.h"
+
+#ifdef WIN32
+#define PRINT_SOCKET_ERROR(x) printf("Socket error: %s, %d\n", x, WSAGetLastError());
+#else
+#define PRINT_SOCKET_ERROR(x) perror(x)
+#endif
+
+#define SOAPPREFIX "s"
+#define SERVICEPREFIX "u"
+#define SERVICEPREFIX2 'u'
+
+/* root description parsing */
+LIBSPEC void parserootdesc(const char * buffer, int bufsize, struct IGDdatas * data)
+{
+ struct xmlparser parser;
+ /* xmlparser object */
+ parser.xmlstart = buffer;
+ parser.xmlsize = bufsize;
+ parser.data = data;
+ parser.starteltfunc = IGDstartelt;
+ parser.endeltfunc = IGDendelt;
+ parser.datafunc = IGDdata;
+ parser.attfunc = 0;
+ parsexml(&parser);
+#ifdef DEBUG
+ printIGD(data);
+#endif
+}
+
+/* getcontentlenfromline() : parse the Content-Length HTTP header line.
+ * Content-length: nnn */
+static int getcontentlenfromline(const char * p, int n)
+{
+ static const char contlenstr[] = "content-length";
+ const char * p2 = contlenstr;
+ int a = 0;
+ while(*p2)
+ {
+ if(n==0)
+ return -1;
+ if(*p2 != *p && *p2 != (*p + 32))
+ return -1;
+ p++; p2++; n--;
+ }
+ if(n==0)
+ return -1;
+ if(*p != ':')
+ return -1;
+ p++; n--;
+ while(*p == ' ')
+ {
+ if(n==0)
+ return -1;
+ p++; n--;
+ }
+ while(*p >= '0' && *p <= '9')
+ {
+ if(n==0)
+ return -1;
+ a = (a * 10) + (*p - '0');
+ p++; n--;
+ }
+ return a;
+}
+
+/* getContentLengthAndHeaderLength()
+ * retrieve header length and content length from an HTTP response
+ * TODO : retrieve Transfer-Encoding: header value, in order to support
+ * HTTP/1.1, chunked transfer encoding must be supported. */
+static void
+getContentLengthAndHeaderLength(char * p, int n,
+ int * contentlen, int * headerlen)
+{
+ char * line;
+ int linelen;
+ int r;
+ line = p;
+ while(line < p + n)
+ {
+ linelen = 0;
+ while(line[linelen] != '\r' && line[linelen] != '\r')
+ {
+ if(line+linelen >= p+n)
+ return;
+ linelen++;
+ }
+ r = getcontentlenfromline(line, linelen);
+ if(r>0)
+ *contentlen = r;
+ line = line + linelen + 2;
+ if(line[0] == '\r' && line[1] == '\n')
+ {
+ *headerlen = (line - p) + 2;
+ return;
+ }
+ }
+}
+
+/* simpleUPnPcommand :
+ * not so simple !
+ * return values :
+ * 0 - OK
+ * -1 - error */
+int simpleUPnPcommand(int s, const char * url, const char * service,
+ const char * action, struct UPNParg * args,
+ char * buffer, int * bufsize)
+{
+ char hostname[MAXHOSTNAMELEN+1];
+ unsigned short port = 0;
+ char * path;
+ char soapact[128];
+ char soapbody[2048];
+ char * buf;
+ int buffree;
+ int n;
+ int contentlen, headerlen; /* for the response */
+
+ snprintf(soapact, sizeof(soapact), "%s#%s", service, action);
+ if(args==NULL)
+ {
+ /*soapbodylen = */snprintf(soapbody, sizeof(soapbody),
+ "<?xml version=\"1.0\"?>\r\n"
+ "<" SOAPPREFIX ":Envelope "
+ "xmlns:" SOAPPREFIX "=\"http://schemas.xmlsoap.org/soap/envelope/\" "
+ SOAPPREFIX ":encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
+ "<" SOAPPREFIX ":Body>"
+ "<" SERVICEPREFIX ":%s xmlns:" SERVICEPREFIX "=\"%s\">"
+ "</" SERVICEPREFIX ":%s>"
+ "</" SOAPPREFIX ":Body></" SOAPPREFIX ":Envelope>"
+ "\r\n", action, service, action);
+ }
+ else
+ {
+ char * p;
+ const char * pe, * pv;
+ int soapbodylen;
+ soapbodylen = snprintf(soapbody, sizeof(soapbody),
+ "<?xml version=\"1.0\"?>\r\n"
+ "<" SOAPPREFIX ":Envelope "
+ "xmlns:" SOAPPREFIX "=\"http://schemas.xmlsoap.org/soap/envelope/\" "
+ SOAPPREFIX ":encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
+ "<" SOAPPREFIX ":Body>"
+ "<" SERVICEPREFIX ":%s xmlns:" SERVICEPREFIX "=\"%s\">",
+ action, service);
+ p = soapbody + soapbodylen;
+ while(args->elt)
+ {
+ /* check that we are never overflowing the string... */
+ if(soapbody + sizeof(soapbody) <= p + 100)
+ {
+ /* we keep a margin of at least 100 bytes */
+ *bufsize = 0;
+ return -1;
+ }
+ *(p++) = '<';
+ pe = args->elt;
+ while(*pe)
+ *(p++) = *(pe++);
+ *(p++) = '>';
+ if((pv = args->val))
+ {
+ while(*pv)
+ *(p++) = *(pv++);
+ }
+ *(p++) = '<';
+ *(p++) = '/';
+ pe = args->elt;
+ while(*pe)
+ *(p++) = *(pe++);
+ *(p++) = '>';
+ args++;
+ }
+ *(p++) = '<';
+ *(p++) = '/';
+ *(p++) = SERVICEPREFIX2;
+ *(p++) = ':';
+ pe = action;
+ while(*pe)
+ *(p++) = *(pe++);
+ strncpy(p, "></" SOAPPREFIX ":Body></" SOAPPREFIX ":Envelope>\r\n",
+ soapbody + sizeof(soapbody) - p);
+ }
+ if(!parseURL(url, hostname, &port, &path)) return -1;
+ if(s<0)
+ {
+ s = connecthostport(hostname, port);
+ if(s < 0)
+ {
+ *bufsize = 0;
+ return -1;
+ }
+ }
+
+ n = soapPostSubmit(s, path, hostname, port, soapact, soapbody);
+ if(n<=0) {
+#ifdef DEBUG
+ printf("Error sending SOAP request\n");
+#endif
+ closesocket(s);
+ return -1;
+ }
+
+ contentlen = -1;
+ headerlen = -1;
+ buf = buffer;
+ buffree = *bufsize;
+ *bufsize = 0;
+ while ((n = ReceiveData(s, buf, buffree, 5000)) > 0) {
+ buffree -= n;
+ buf += n;
+ *bufsize += n;
+ getContentLengthAndHeaderLength(buffer, *bufsize,
+ &contentlen, &headerlen);
+#ifdef DEBUG
+ printf("received n=%dbytes bufsize=%d ContLen=%d HeadLen=%d\n",
+ n, *bufsize, contentlen, headerlen);
+#endif
+ /* break if we received everything */
+ if(contentlen > 0 && headerlen > 0 && *bufsize >= contentlen+headerlen)
+ break;
+ }
+
+ closesocket(s);
+ return 0;
+}
+
+/* parseMSEARCHReply()
+ * the last 4 arguments are filled during the parsing :
+ * - location/locationsize : "location:" field of the SSDP reply packet
+ * - st/stsize : "st:" field of the SSDP reply packet.
+ * The strings are NOT null terminated */
+static void
+parseMSEARCHReply(const char * reply, int size,
+ const char * * location, int * locationsize,
+ const char * * st, int * stsize)
+{
+ int a, b, i;
+ i = 0;
+ a = i; /* start of the line */
+ b = 0;
+ while(i<size)
+ {
+ switch(reply[i])
+ {
+ case ':':
+ if(b==0)
+ {
+ b = i; /* end of the "header" */
+ /*for(j=a; j<b; j++)
+ {
+ putchar(reply[j]);
+ }
+ */
+ }
+ break;
+ case '\x0a':
+ case '\x0d':
+ if(b!=0)
+ {
+ /*for(j=b+1; j<i; j++)
+ {
+ putchar(reply[j]);
+ }
+ putchar('\n');*/
+ do { b++; } while(reply[b]==' ');
+ if(0==strncasecmp(reply+a, "location", 8))
+ {
+ *location = reply+b;
+ *locationsize = i-b;
+ }
+ else if(0==strncasecmp(reply+a, "st", 2))
+ {
+ *st = reply+b;
+ *stsize = i-b;
+ }
+ b = 0;
+ }
+ a = i+1;
+ break;
+ default:
+ break;
+ }
+ i++;
+ }
+}
+
+/* port upnp discover : SSDP protocol */
+#define PORT 1900
+#define XSTR(s) STR(s)
+#define STR(s) #s
+#define UPNP_MCAST_ADDR "239.255.255.250"
+
+/* upnpDiscover() :
+ * return a chained list of all devices found or NULL if
+ * no devices was found.
+ * It is up to the caller to free the chained list
+ * delay is in millisecond (poll) */
+LIBSPEC struct UPNPDev * upnpDiscover(int delay, const char * multicastif,
+ const char * minissdpdsock, int sameport)
+{
+ struct UPNPDev * tmp;
+ struct UPNPDev * devlist = 0;
+ int opt = 1;
+ static const char MSearchMsgFmt[] =
+ "M-SEARCH * HTTP/1.1\r\n"
+ "HOST: " UPNP_MCAST_ADDR ":" XSTR(PORT) "\r\n"
+ "ST: %s\r\n"
+ "MAN: \"ssdp:discover\"\r\n"
+ "MX: %u\r\n"
+ "\r\n";
+ static const char * const deviceList[] = {
+ "urn:schemas-upnp-org:device:InternetGatewayDevice:1",
+ "urn:schemas-upnp-org:service:WANIPConnection:1",
+ "urn:schemas-upnp-org:service:WANPPPConnection:1",
+ "upnp:rootdevice",
+ 0
+ };
+ int deviceIndex = 0;
+ char bufr[1536]; /* reception and emission buffer */
+ int sudp;
+ int n;
+ struct sockaddr sockudp_r;
+ unsigned int mx;
+ int rv;
+ struct addrinfo hints, *servinfo, *p;
+#ifdef WIN32
+ /*MIB_IPFORWARDROW ip_forward;*/
+#endif
+
+#if !defined(WIN32) && !defined(__amigaos__) && !defined(__amigaos4__)
+ /* first try to get infos from minissdpd ! */
+ if(!minissdpdsock)
+ minissdpdsock = "/var/run/minissdpd.sock";
+ while(!devlist && deviceList[deviceIndex]) {
+ devlist = getDevicesFromMiniSSDPD(deviceList[deviceIndex],
+ minissdpdsock);
+ /* We return what we have found if it was not only a rootdevice */
+ if(devlist && !strstr(deviceList[deviceIndex], "rootdevice"))
+ return devlist;
+ deviceIndex++;
+ }
+ deviceIndex = 0;
+#endif
+ /* fallback to direct discovery */
+#ifdef WIN32
+ sudp = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+#else
+ sudp = socket(PF_INET, SOCK_DGRAM, 0);
+#endif
+ if(sudp < 0)
+ {
+ PRINT_SOCKET_ERROR("socket");
+ return NULL;
+ }
+ /* reception */
+ memset(&sockudp_r, 0, sizeof(struct sockaddr));
+ if(0/*ipv6*/) {
+ struct sockaddr_in6 * p = (struct sockaddr_in6 *)&sockudp_r;
+ p->sin6_family = AF_INET6;
+ if(sameport)
+ p->sin6_port = htons(PORT);
+ p->sin6_addr = in6addr_any;//IN6ADDR_ANY_INIT;/*INADDR_ANY;*/
+ } else {
+ struct sockaddr_in * p = (struct sockaddr_in *)&sockudp_r;
+ p->sin_family = AF_INET;
+ if(sameport)
+ p->sin_port = htons(PORT);
+ p->sin_addr.s_addr = INADDR_ANY;
+ }
+#if 0
+ /* emission */
+ memset(&sockudp_w, 0, sizeof(struct sockaddr_in));
+ sockudp_w.sin_family = AF_INET;
+ sockudp_w.sin_port = htons(PORT);
+ sockudp_w.sin_addr.s_addr = inet_addr(UPNP_MCAST_ADDR);
+#endif
+#ifdef WIN32
+/* This code could help us to use the right Network interface for
+ * SSDP multicast traffic */
+/* TODO : Get IP associated with the index given in the ip_forward struct
+ * in order to give this ip to setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF) */
+ /*
+ if(GetBestRoute(inet_addr("223.255.255.255"), 0, &ip_forward) == NO_ERROR) {
+ DWORD dwRetVal = 0;
+ PMIB_IPADDRTABLE pIPAddrTable;
+ DWORD dwSize = 0;
+ IN_ADDR IPAddr;
+ int i;
+ printf("ifIndex=%lu nextHop=%lx \n", ip_forward.dwForwardIfIndex, ip_forward.dwForwardNextHop);
+ pIPAddrTable = (MIB_IPADDRTABLE *) malloc(sizeof (MIB_IPADDRTABLE));
+ if (GetIpAddrTable(pIPAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) {
+ free(pIPAddrTable);
+ pIPAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+ }
+ if(pIPAddrTable) {
+ dwRetVal = GetIpAddrTable( pIPAddrTable, &dwSize, 0 );
+ printf("\tNum Entries: %ld\n", pIPAddrTable->dwNumEntries);
+ for (i=0; i < (int) pIPAddrTable->dwNumEntries; i++) {
+ printf("\n\tInterface Index[%d]:\t%ld\n", i, pIPAddrTable->table[i].dwIndex);
+ IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwAddr;
+ printf("\tIP Address[%d]: \t%s\n", i, inet_ntoa(IPAddr) );
+ IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwMask;
+ printf("\tSubnet Mask[%d]: \t%s\n", i, inet_ntoa(IPAddr) );
+ IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwBCastAddr;
+ printf("\tBroadCast[%d]: \t%s (%ld)\n", i, inet_ntoa(IPAddr), pIPAddrTable->table[i].dwBCastAddr);
+ printf("\tReassembly size[%d]:\t%ld\n", i, pIPAddrTable->table[i].dwReasmSize);
+ printf("\tType and State[%d]:", i);
+ printf("\n");
+ }
+ free(pIPAddrTable);
+ pIPAddrTable = NULL;
+ }
+ }
+*/
+#endif
+
+#ifdef WIN32
+ if (setsockopt(sudp, SOL_SOCKET, SO_REUSEADDR, (const char *)&opt, sizeof (opt)) < 0)
+#else
+ if (setsockopt(sudp, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof (opt)) < 0)
+#endif
+ {
+ PRINT_SOCKET_ERROR("setsockopt");
+ return NULL;
+ }
+
+ if(multicastif)
+ {
+ struct in_addr mc_if;
+ mc_if.s_addr = inet_addr(multicastif);
+ if(0/*ipv6*/) {
+ } else {
+ ((struct sockaddr_in *)&sockudp_r)->sin_addr.s_addr = mc_if.s_addr;
+ }
+ if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&mc_if, sizeof(mc_if)) < 0)
+ {
+ PRINT_SOCKET_ERROR("setsockopt");
+ }
+ }
+
+ /* Avant d'envoyer le paquet on bind pour recevoir la reponse */
+ if (bind(sudp, &sockudp_r, 0/*ipv6*/?sizeof(struct sockaddr_in6):sizeof(struct sockaddr_in)) != 0)
+ {
+ PRINT_SOCKET_ERROR("bind");
+ closesocket(sudp);
+ return NULL;
+ }
+
+ /* Calculating maximum response time in seconds */
+ mx = ((unsigned int)delay) / 1000u;
+ /* receiving SSDP response packet */
+ for(n = 0;;)
+ {
+ if(n == 0)
+ {
+ /* sending the SSDP M-SEARCH packet */
+ n = snprintf(bufr, sizeof(bufr),
+ MSearchMsgFmt, deviceList[deviceIndex++], mx);
+ /*printf("Sending %s", bufr);*/
+#if 0
+ n = sendto(sudp, bufr, n, 0,
+ (struct sockaddr *)&sockudp_w, sizeof(struct sockaddr_in));
+ if (n < 0) {
+ PRINT_SOCKET_ERROR("sendto");
+ closesocket(sudp);
+ return devlist;
+ }
+#endif
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = AF_UNSPEC; // AF_INET6 or AF_INET
+ hints.ai_socktype = SOCK_DGRAM;
+ /*hints.ai_flags = */
+ if ((rv = getaddrinfo(UPNP_MCAST_ADDR, XSTR(PORT), &hints, &servinfo)) != 0) {
+#ifdef WIN32
+ fprintf(stderr, "getaddrinfo() failed: %d\n", rv);
+#else
+ fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(rv));
+#endif
+ return devlist;
+ }
+ for(p = servinfo; p; p = p->ai_next) {
+ n = sendto(sudp, bufr, n, 0, p->ai_addr, p->ai_addrlen);
+ if (n < 0) {
+ PRINT_SOCKET_ERROR("sendto");
+ continue;
+ }
+ }
+ freeaddrinfo(servinfo);
+ if(n < 0) {
+ closesocket(sudp);
+ return devlist;
+ }
+ }
+ /* Waiting for SSDP REPLY packet to M-SEARCH */
+ n = ReceiveData(sudp, bufr, sizeof(bufr), delay);
+ if (n < 0) {
+ /* error */
+ closesocket(sudp);
+ return devlist;
+ } else if (n == 0) {
+ /* no data or Time Out */
+ if (devlist || (deviceList[deviceIndex] == 0)) {
+ /* no more device type to look for... */
+ closesocket(sudp);
+ return devlist;
+ }
+ } else {
+ const char * descURL=NULL;
+ int urlsize=0;
+ const char * st=NULL;
+ int stsize=0;
+ /*printf("%d byte(s) :\n%s\n", n, bufr);*/ /* affichage du message */
+ parseMSEARCHReply(bufr, n, &descURL, &urlsize, &st, &stsize);
+ if(st&&descURL)
+ {
+ /*printf("M-SEARCH Reply:\nST: %.*s\nLocation: %.*s\n",
+ stsize, st, urlsize, descURL); */
+ tmp = (struct UPNPDev *)malloc(sizeof(struct UPNPDev)+urlsize+stsize);
+ tmp->pNext = devlist;
+ tmp->descURL = tmp->buffer;
+ tmp->st = tmp->buffer + 1 + urlsize;
+ memcpy(tmp->buffer, descURL, urlsize);
+ tmp->buffer[urlsize] = '\0';
+ memcpy(tmp->buffer + urlsize + 1, st, stsize);
+ tmp->buffer[urlsize+1+stsize] = '\0';
+ devlist = tmp;
+ }
+ }
+ }
+}
+
+/* freeUPNPDevlist() should be used to
+ * free the chained list returned by upnpDiscover() */
+LIBSPEC void freeUPNPDevlist(struct UPNPDev * devlist)
+{
+ struct UPNPDev * next;
+ while(devlist)
+ {
+ next = devlist->pNext;
+ free(devlist);
+ devlist = next;
+ }
+}
+
+static void
+url_cpy_or_cat(char * dst, const char * src, int n)
+{
+ if( (src[0] == 'h')
+ &&(src[1] == 't')
+ &&(src[2] == 't')
+ &&(src[3] == 'p')
+ &&(src[4] == ':')
+ &&(src[5] == '/')
+ &&(src[6] == '/'))
+ {
+ strncpy(dst, src, n);
+ }
+ else
+ {
+ int l = strlen(dst);
+ if(src[0] != '/')
+ dst[l++] = '/';
+ if(l<=n)
+ strncpy(dst + l, src, n - l);
+ }
+}
+
+/* Prepare the Urls for usage...
+ */
+LIBSPEC void GetUPNPUrls(struct UPNPUrls * urls, struct IGDdatas * data,
+ const char * descURL)
+{
+ char * p;
+ int n1, n2, n3;
+ n1 = strlen(data->urlbase);
+ if(n1==0)
+ n1 = strlen(descURL);
+ n1 += 2; /* 1 byte more for Null terminator, 1 byte for '/' if needed */
+ n2 = n1; n3 = n1;
+ n1 += strlen(data->first.scpdurl);
+ n2 += strlen(data->first.controlurl);
+ n3 += strlen(data->CIF.controlurl);
+
+ urls->ipcondescURL = (char *)malloc(n1);
+ urls->controlURL = (char *)malloc(n2);
+ urls->controlURL_CIF = (char *)malloc(n3);
+ /* maintenant on chope la desc du WANIPConnection */
+ if(data->urlbase[0] != '\0')
+ strncpy(urls->ipcondescURL, data->urlbase, n1);
+ else
+ strncpy(urls->ipcondescURL, descURL, n1);
+ p = strchr(urls->ipcondescURL+7, '/');
+ if(p) p[0] = '\0';
+ strncpy(urls->controlURL, urls->ipcondescURL, n2);
+ strncpy(urls->controlURL_CIF, urls->ipcondescURL, n3);
+
+ url_cpy_or_cat(urls->ipcondescURL, data->first.scpdurl, n1);
+
+ url_cpy_or_cat(urls->controlURL, data->first.controlurl, n2);
+
+ url_cpy_or_cat(urls->controlURL_CIF, data->CIF.controlurl, n3);
+
+#ifdef DEBUG
+ printf("urls->ipcondescURL='%s' %u n1=%d\n", urls->ipcondescURL,
+ (unsigned)strlen(urls->ipcondescURL), n1);
+ printf("urls->controlURL='%s' %u n2=%d\n", urls->controlURL,
+ (unsigned)strlen(urls->controlURL), n2);
+ printf("urls->controlURL_CIF='%s' %u n3=%d\n", urls->controlURL_CIF,
+ (unsigned)strlen(urls->controlURL_CIF), n3);
+#endif
+}
+
+LIBSPEC void
+FreeUPNPUrls(struct UPNPUrls * urls)
+{
+ if(!urls)
+ return;
+ free(urls->controlURL);
+ urls->controlURL = 0;
+ free(urls->ipcondescURL);
+ urls->ipcondescURL = 0;
+ free(urls->controlURL_CIF);
+ urls->controlURL_CIF = 0;
+}
+
+
+int ReceiveData(int socket, char * data, int length, int timeout)
+{
+ int n;
+#if !defined(WIN32) && !defined(__amigaos__) && !defined(__amigaos4__)
+ struct pollfd fds[1]; /* for the poll */
+#ifdef MINIUPNPC_IGNORE_EINTR
+ do {
+#endif
+ fds[0].fd = socket;
+ fds[0].events = POLLIN;
+ n = poll(fds, 1, timeout);
+#ifdef MINIUPNPC_IGNORE_EINTR
+ } while(n < 0 && errno == EINTR);
+#endif
+ if(n < 0)
+ {
+ PRINT_SOCKET_ERROR("poll");
+ return -1;
+ }
+ else if(n == 0)
+ {
+ return 0;
+ }
+#else
+ fd_set socketSet;
+ TIMEVAL timeval;
+ FD_ZERO(&socketSet);
+ FD_SET(socket, &socketSet);
+ timeval.tv_sec = timeout / 1000;
+ timeval.tv_usec = (timeout % 1000) * 1000;
+ n = select(FD_SETSIZE, &socketSet, NULL, NULL, &timeval);
+ if(n < 0)
+ {
+ PRINT_SOCKET_ERROR("select");
+ return -1;
+ }
+ else if(n == 0)
+ {
+ return 0;
+ }
+#endif
+ n = recv(socket, data, length, 0);
+ if(n<0)
+ {
+ PRINT_SOCKET_ERROR("recv");
+ }
+ return n;
+}
+
+int
+UPNPIGD_IsConnected(struct UPNPUrls * urls, struct IGDdatas * data)
+{
+ char status[64];
+ unsigned int uptime;
+ status[0] = '\0';
+ UPNP_GetStatusInfo(urls->controlURL, data->first.servicetype,
+ status, &uptime, NULL);
+ if(0 == strcmp("Connected", status))
+ {
+ return 1;
+ }
+ else
+ return 0;
+}
+
+
+/* UPNP_GetValidIGD() :
+ * return values :
+ * 0 = NO IGD found
+ * 1 = A valid connected IGD has been found
+ * 2 = A valid IGD has been found but it reported as
+ * not connected
+ * 3 = an UPnP device has been found but was not recognized as an IGD
+ *
+ * In any non zero return case, the urls and data structures
+ * passed as parameters are set. Donc forget to call FreeUPNPUrls(urls) to
+ * free allocated memory.
+ */
+LIBSPEC int
+UPNP_GetValidIGD(struct UPNPDev * devlist,
+ struct UPNPUrls * urls,
+ struct IGDdatas * data,
+ char * lanaddr, int lanaddrlen)
+{
+ char * descXML;
+ int descXMLsize = 0;
+ struct UPNPDev * dev;
+ int ndev = 0;
+ int state; /* state 1 : IGD connected. State 2 : IGD. State 3 : anything */
+ if(!devlist)
+ {
+#ifdef DEBUG
+ printf("Empty devlist\n");
+#endif
+ return 0;
+ }
+ for(state = 1; state <= 3; state++)
+ {
+ for(dev = devlist; dev; dev = dev->pNext)
+ {
+ /* we should choose an internet gateway device.
+ * with st == urn:schemas-upnp-org:device:InternetGatewayDevice:1 */
+ descXML = miniwget_getaddr(dev->descURL, &descXMLsize,
+ lanaddr, lanaddrlen);
+ if(descXML)
+ {
+ ndev++;
+ memset(data, 0, sizeof(struct IGDdatas));
+ memset(urls, 0, sizeof(struct UPNPUrls));
+ parserootdesc(descXML, descXMLsize, data);
+ free(descXML);
+ descXML = NULL;
+ if(0==strcmp(data->CIF.servicetype,
+ "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1")
+ || state >= 3 )
+ {
+ GetUPNPUrls(urls, data, dev->descURL);
+
+#ifdef DEBUG
+ printf("UPNPIGD_IsConnected(%s) = %d\n",
+ urls->controlURL,
+ UPNPIGD_IsConnected(urls, data));
+#endif
+ if((state >= 2) || UPNPIGD_IsConnected(urls, data))
+ return state;
+ FreeUPNPUrls(urls);
+ if(data->second.servicetype[0] != '\0') {
+#ifdef DEBUG
+ printf("We tried %s, now we try %s !\n",
+ data->first.servicetype, data->second.servicetype);
+#endif
+ /* swaping WANPPPConnection and WANIPConnection ! */
+ memcpy(&data->tmp, &data->first, sizeof(struct IGDdatas_service));
+ memcpy(&data->first, &data->second, sizeof(struct IGDdatas_service));
+ memcpy(&data->second, &data->tmp, sizeof(struct IGDdatas_service));
+ GetUPNPUrls(urls, data, dev->descURL);
+#ifdef DEBUG
+ printf("UPNPIGD_IsConnected(%s) = %d\n",
+ urls->controlURL,
+ UPNPIGD_IsConnected(urls, data));
+#endif
+ if((state >= 2) || UPNPIGD_IsConnected(urls, data))
+ return state;
+ FreeUPNPUrls(urls);
+ }
+ }
+ memset(data, 0, sizeof(struct IGDdatas));
+ }
+#ifdef DEBUG
+ else
+ {
+ printf("error getting XML description %s\n", dev->descURL);
+ }
+#endif
+ }
+ }
+ return 0;
+}
+
+/* UPNP_GetIGDFromUrl()
+ * Used when skipping the discovery process.
+ * return value :
+ * 0 - Not ok
+ * 1 - OK */
+int
+UPNP_GetIGDFromUrl(const char * rootdescurl,
+ struct UPNPUrls * urls,
+ struct IGDdatas * data,
+ char * lanaddr, int lanaddrlen)
+{
+ char * descXML;
+ int descXMLsize = 0;
+ descXML = miniwget_getaddr(rootdescurl, &descXMLsize,
+ lanaddr, lanaddrlen);
+ if(descXML) {
+ memset(data, 0, sizeof(struct IGDdatas));
+ memset(urls, 0, sizeof(struct UPNPUrls));
+ parserootdesc(descXML, descXMLsize, data);
+ free(descXML);
+ descXML = NULL;
+ GetUPNPUrls(urls, data, rootdescurl);
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniupnpc.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniupnpc.h
new file mode 100644
index 0000000..2379ba1
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniupnpc.h
@@ -0,0 +1,114 @@
+/* $Id: miniupnpc.h,v 1.19 2009/10/10 19:15:35 nanard Exp $ */
+/* Project: miniupnp
+ * http://miniupnp.free.fr/
+ * Author: Thomas Bernard
+ * Copyright (c) 2005-2006 Thomas Bernard
+ * This software is subjects to the conditions detailed
+ * in the LICENCE file provided within this distribution */
+#ifndef __MINIUPNPC_H__
+#define __MINIUPNPC_H__
+
+#include "declspec.h"
+#include "igd_desc_parse.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Structures definitions : */
+struct UPNParg { const char * elt; const char * val; };
+
+int simpleUPnPcommand(int, const char *, const char *,
+ const char *, struct UPNParg *,
+ char *, int *);
+
+struct UPNPDev {
+ struct UPNPDev * pNext;
+ char * descURL;
+ char * st;
+ char buffer[2];
+};
+
+/* upnpDiscover()
+ * discover UPnP devices on the network.
+ * The discovered devices are returned as a chained list.
+ * It is up to the caller to free the list with freeUPNPDevlist().
+ * delay (in millisecond) is the maximum time for waiting any device
+ * response.
+ * If available, device list will be obtained from MiniSSDPd.
+ * Default path for minissdpd socket will be used if minissdpdsock argument
+ * is NULL.
+ * If multicastif is not NULL, it will be used instead of the default
+ * multicast interface for sending SSDP discover packets.
+ * If sameport is not null, SSDP packets will be sent from the source port
+ * 1900 (same as destination port) otherwise system assign a source port. */
+LIBSPEC struct UPNPDev * upnpDiscover(int delay, const char * multicastif,
+ const char * minissdpdsock, int sameport);
+/* freeUPNPDevlist()
+ * free list returned by upnpDiscover() */
+LIBSPEC void freeUPNPDevlist(struct UPNPDev * devlist);
+
+/* parserootdesc() :
+ * parse root XML description of a UPnP device and fill the IGDdatas
+ * structure. */
+LIBSPEC void parserootdesc(const char *, int, struct IGDdatas *);
+
+/* structure used to get fast access to urls
+ * controlURL: controlURL of the WANIPConnection
+ * ipcondescURL: url of the description of the WANIPConnection
+ * controlURL_CIF: controlURL of the WANCommonInterfaceConfig
+ */
+struct UPNPUrls {
+ char * controlURL;
+ char * ipcondescURL;
+ char * controlURL_CIF;
+};
+
+/* UPNP_GetValidIGD() :
+ * return values :
+ * 0 = NO IGD found
+ * 1 = A valid connected IGD has been found
+ * 2 = A valid IGD has been found but it reported as
+ * not connected
+ * 3 = an UPnP device has been found but was not recognized as an IGD
+ *
+ * In any non zero return case, the urls and data structures
+ * passed as parameters are set. Donc forget to call FreeUPNPUrls(urls) to
+ * free allocated memory.
+ */
+LIBSPEC int
+UPNP_GetValidIGD(struct UPNPDev * devlist,
+ struct UPNPUrls * urls,
+ struct IGDdatas * data,
+ char * lanaddr, int lanaddrlen);
+
+/* UPNP_GetIGDFromUrl()
+ * Used when skipping the discovery process.
+ * return value :
+ * 0 - Not ok
+ * 1 - OK */
+LIBSPEC int
+UPNP_GetIGDFromUrl(const char * rootdescurl,
+ struct UPNPUrls * urls,
+ struct IGDdatas * data,
+ char * lanaddr, int lanaddrlen);
+
+LIBSPEC void GetUPNPUrls(struct UPNPUrls *, struct IGDdatas *, const char *);
+
+LIBSPEC void FreeUPNPUrls(struct UPNPUrls *);
+
+/* Reads data from the specified socket.
+ * Returns the number of bytes read if successful, zero if no bytes were
+ * read or if we timed out. Returns negative if there was an error. */
+int ReceiveData(int socket, char * data, int length, int timeout);
+
+/* return 0 or 1 */
+LIBSPEC int UPNPIGD_IsConnected(struct UPNPUrls *, struct IGDdatas *);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniupnpcmodule.c b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniupnpcmodule.c
new file mode 100644
index 0000000..417d192
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniupnpcmodule.c
@@ -0,0 +1,494 @@
+/* $Id: miniupnpcmodule.c,v 1.14 2009/10/16 09:02:47 nanard Exp $*/
+/* Project : miniupnp
+ * Author : Thomas BERNARD
+ * website : http://miniupnp.tuxfamily.org/
+ * copyright (c) 2007-2009 Thomas Bernard
+ * This software is subjet to the conditions detailed in the
+ * provided LICENCE file. */
+#include <Python.h>
+#define STATICLIB
+#include "structmember.h"
+#include "miniupnpc.h"
+#include "upnpcommands.h"
+#include "upnperrors.h"
+
+/* for compatibility with Python < 2.4 */
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#endif
+
+#ifndef Py_RETURN_TRUE
+#define Py_RETURN_TRUE return Py_INCREF(Py_True), Py_True
+#endif
+
+#ifndef Py_RETURN_FALSE
+#define Py_RETURN_FALSE return Py_INCREF(Py_False), Py_False
+#endif
+
+typedef struct {
+ PyObject_HEAD
+ /* Type-specific fields go here. */
+ struct UPNPDev * devlist;
+ struct UPNPUrls urls;
+ struct IGDdatas data;
+ unsigned int discoverdelay; /* value passed to upnpDiscover() */
+ char lanaddr[16]; /* our ip address on the LAN */
+ char * multicastif;
+ char * minissdpdsocket;
+} UPnPObject;
+
+static PyMemberDef UPnP_members[] = {
+ {"lanaddr", T_STRING_INPLACE, offsetof(UPnPObject, lanaddr),
+ READONLY, "ip address on the LAN"
+ },
+ {"discoverdelay", T_UINT, offsetof(UPnPObject, discoverdelay),
+ 0/*READWRITE*/, "value in ms used to wait for SSDP responses"
+ },
+ /* T_STRING is allways readonly :( */
+ {"multicastif", T_STRING, offsetof(UPnPObject, multicastif),
+ 0, "IP of the network interface to be used for multicast operations"
+ },
+ {"minissdpdsocket", T_STRING, offsetof(UPnPObject, multicastif),
+ 0, "path of the MiniSSDPd unix socket"
+ },
+ {NULL}
+};
+
+static void
+UPnPObject_dealloc(UPnPObject *self)
+{
+ freeUPNPDevlist(self->devlist);
+ FreeUPNPUrls(&self->urls);
+ self->ob_type->tp_free((PyObject*)self);
+}
+
+static PyObject *
+UPnP_discover(UPnPObject *self)
+{
+ struct UPNPDev * dev;
+ int i;
+ PyObject *res = NULL;
+ if(self->devlist)
+ {
+ freeUPNPDevlist(self->devlist);
+ self->devlist = 0;
+ }
+ Py_BEGIN_ALLOW_THREADS
+ self->devlist = upnpDiscover((int)self->discoverdelay/*timeout in ms*/,
+ 0/* multicast if*/,
+ 0/*minissdpd socket*/,
+ 0/*sameport flag*/);
+ Py_END_ALLOW_THREADS
+ /* Py_RETURN_NONE ??? */
+ for(dev = self->devlist, i = 0; dev; dev = dev->pNext)
+ i++;
+ res = Py_BuildValue("i", i);
+ return res;
+}
+
+static PyObject *
+UPnP_selectigd(UPnPObject *self)
+{
+ int r;
+Py_BEGIN_ALLOW_THREADS
+ r = UPNP_GetValidIGD(self->devlist, &self->urls, &self->data,
+ self->lanaddr, sizeof(self->lanaddr));
+Py_END_ALLOW_THREADS
+ if(r)
+ {
+ return Py_BuildValue("s", self->urls.controlURL);
+ }
+ else
+ {
+ /* TODO: have our own exception type ! */
+ PyErr_SetString(PyExc_Exception, "No UPnP device discovered");
+ return NULL;
+ }
+}
+
+static PyObject *
+UPnP_totalbytesent(UPnPObject *self)
+{
+ UNSIGNED_INTEGER i;
+Py_BEGIN_ALLOW_THREADS
+ i = UPNP_GetTotalBytesSent(self->urls.controlURL_CIF,
+ self->data.servicetype_CIF);
+Py_END_ALLOW_THREADS
+ return Py_BuildValue("I", i);
+}
+
+static PyObject *
+UPnP_totalbytereceived(UPnPObject *self)
+{
+ UNSIGNED_INTEGER i;
+Py_BEGIN_ALLOW_THREADS
+ i = UPNP_GetTotalBytesReceived(self->urls.controlURL_CIF,
+ self->data.servicetype_CIF);
+Py_END_ALLOW_THREADS
+ return Py_BuildValue("I", i);
+}
+
+static PyObject *
+UPnP_totalpacketsent(UPnPObject *self)
+{
+ UNSIGNED_INTEGER i;
+Py_BEGIN_ALLOW_THREADS
+ i = UPNP_GetTotalPacketsSent(self->urls.controlURL_CIF,
+ self->data.servicetype_CIF);
+Py_END_ALLOW_THREADS
+ return Py_BuildValue("I", i);
+}
+
+static PyObject *
+UPnP_totalpacketreceived(UPnPObject *self)
+{
+ UNSIGNED_INTEGER i;
+Py_BEGIN_ALLOW_THREADS
+ i = UPNP_GetTotalPacketsReceived(self->urls.controlURL_CIF,
+ self->data.servicetype_CIF);
+Py_END_ALLOW_THREADS
+ return Py_BuildValue("I", i);
+}
+
+static PyObject *
+UPnP_statusinfo(UPnPObject *self)
+{
+ char status[64];
+ char lastconnerror[64];
+ unsigned int uptime = 0;
+ int r;
+ status[0] = '\0';
+ lastconnerror[0] = '\0';
+Py_BEGIN_ALLOW_THREADS
+ r = UPNP_GetStatusInfo(self->urls.controlURL, self->data.servicetype,
+ status, &uptime, lastconnerror);
+Py_END_ALLOW_THREADS
+ if(r==UPNPCOMMAND_SUCCESS) {
+ return Py_BuildValue("(s,I,s)", status, uptime, lastconnerror);
+ } else {
+ /* TODO: have our own exception type ! */
+ PyErr_SetString(PyExc_Exception, strupnperror(r));
+ return NULL;
+ }
+}
+
+static PyObject *
+UPnP_connectiontype(UPnPObject *self)
+{
+ char connectionType[64];
+ int r;
+ connectionType[0] = '\0';
+Py_BEGIN_ALLOW_THREADS
+ r = UPNP_GetConnectionTypeInfo(self->urls.controlURL,
+ self->data.servicetype,
+ connectionType);
+Py_END_ALLOW_THREADS
+ if(r==UPNPCOMMAND_SUCCESS) {
+ return Py_BuildValue("s", connectionType);
+ } else {
+ /* TODO: have our own exception type ! */
+ PyErr_SetString(PyExc_Exception, strupnperror(r));
+ return NULL;
+ }
+}
+
+static PyObject *
+UPnP_externalipaddress(UPnPObject *self)
+{
+ char externalIPAddress[16];
+ int r;
+ externalIPAddress[0] = '\0';
+Py_BEGIN_ALLOW_THREADS
+ r = UPNP_GetExternalIPAddress(self->urls.controlURL,
+ self->data.servicetype,
+ externalIPAddress);
+Py_END_ALLOW_THREADS
+ if(r==UPNPCOMMAND_SUCCESS) {
+ return Py_BuildValue("s", externalIPAddress);
+ } else {
+ /* TODO: have our own exception type ! */
+ PyErr_SetString(PyExc_Exception, strupnperror(r));
+ return NULL;
+ }
+}
+
+/* AddPortMapping(externalPort, protocol, internalHost, internalPort, desc,
+ * remoteHost)
+ * protocol is 'UDP' or 'TCP' */
+static PyObject *
+UPnP_addportmapping(UPnPObject *self, PyObject *args)
+{
+ char extPort[6];
+ unsigned short ePort;
+ char inPort[6];
+ unsigned short iPort;
+ const char * proto;
+ const char * host;
+ const char * desc;
+ const char * remoteHost;
+ int r;
+ if (!PyArg_ParseTuple(args, "HssHss", &ePort, &proto,
+ &host, &iPort, &desc, &remoteHost))
+ return NULL;
+Py_BEGIN_ALLOW_THREADS
+ sprintf(extPort, "%hu", ePort);
+ sprintf(inPort, "%hu", iPort);
+ r = UPNP_AddPortMapping(self->urls.controlURL, self->data.servicetype,
+ extPort, inPort, host, desc, proto, remoteHost);
+Py_END_ALLOW_THREADS
+ if(r==UPNPCOMMAND_SUCCESS)
+ {
+ Py_RETURN_TRUE;
+ }
+ else
+ {
+ // TODO: RAISE an Exception. See upnpcommands.h for errors codes.
+ // upnperrors.c
+ //Py_RETURN_FALSE;
+ /* TODO: have our own exception type ! */
+ PyErr_SetString(PyExc_Exception, strupnperror(r));
+ return NULL;
+ }
+}
+
+/* DeletePortMapping(extPort, proto, removeHost='')
+ * proto = 'UDP', 'TCP' */
+static PyObject *
+UPnP_deleteportmapping(UPnPObject *self, PyObject *args)
+{
+ char extPort[6];
+ unsigned short ePort;
+ const char * proto;
+ const char * remoteHost = "";
+ int r;
+ if(!PyArg_ParseTuple(args, "Hs|z", &ePort, &proto, &remoteHost))
+ return NULL;
+Py_BEGIN_ALLOW_THREADS
+ sprintf(extPort, "%hu", ePort);
+ r = UPNP_DeletePortMapping(self->urls.controlURL, self->data.servicetype,
+ extPort, proto, remoteHost);
+Py_END_ALLOW_THREADS
+ if(r==UPNPCOMMAND_SUCCESS) {
+ Py_RETURN_TRUE;
+ } else {
+ /* TODO: have our own exception type ! */
+ PyErr_SetString(PyExc_Exception, strupnperror(r));
+ return NULL;
+ }
+}
+
+static PyObject *
+UPnP_getportmappingnumberofentries(UPnPObject *self)
+{
+ unsigned int n = 0;
+ int r;
+Py_BEGIN_ALLOW_THREADS
+ r = UPNP_GetPortMappingNumberOfEntries(self->urls.controlURL,
+ self->data.servicetype,
+ &n);
+Py_END_ALLOW_THREADS
+ if(r==UPNPCOMMAND_SUCCESS) {
+ return Py_BuildValue("I", n);
+ } else {
+ /* TODO: have our own exception type ! */
+ PyErr_SetString(PyExc_Exception, strupnperror(r));
+ return NULL;
+ }
+}
+
+/* GetSpecificPortMapping(ePort, proto)
+ * proto = 'UDP' or 'TCP' */
+static PyObject *
+UPnP_getspecificportmapping(UPnPObject *self, PyObject *args)
+{
+ char extPort[6];
+ unsigned short ePort;
+ const char * proto;
+ char intClient[16];
+ char intPort[6];
+ unsigned short iPort;
+ if(!PyArg_ParseTuple(args, "Hs", &ePort, &proto))
+ return NULL;
+Py_BEGIN_ALLOW_THREADS
+ sprintf(extPort, "%hu", ePort);
+ UPNP_GetSpecificPortMappingEntry(self->urls.controlURL,
+ self->data.servicetype,
+ extPort, proto,
+ intClient, intPort);
+Py_END_ALLOW_THREADS
+ if(intClient[0])
+ {
+ iPort = (unsigned short)atoi(intPort);
+ return Py_BuildValue("(s,H)", intClient, iPort);
+ }
+ else
+ {
+ Py_RETURN_NONE;
+ }
+}
+
+/* GetGenericPortMapping(index) */
+static PyObject *
+UPnP_getgenericportmapping(UPnPObject *self, PyObject *args)
+{
+ int i, r;
+ char index[8];
+ char intClient[16];
+ char intPort[6];
+ unsigned short iPort;
+ char extPort[6];
+ unsigned short ePort;
+ char protocol[4];
+ char desc[80];
+ char enabled[6];
+ char rHost[64];
+ char duration[16]; /* lease duration */
+ unsigned int dur;
+ if(!PyArg_ParseTuple(args, "i", &i))
+ return NULL;
+Py_BEGIN_ALLOW_THREADS
+ snprintf(index, sizeof(index), "%d", i);
+ rHost[0] = '\0'; enabled[0] = '\0';
+ duration[0] = '\0'; desc[0] = '\0';
+ extPort[0] = '\0'; intPort[0] = '\0'; intClient[0] = '\0';
+ r = UPNP_GetGenericPortMappingEntry(self->urls.controlURL,
+ self->data.servicetype,
+ index,
+ extPort, intClient, intPort,
+ protocol, desc, enabled, rHost,
+ duration);
+Py_END_ALLOW_THREADS
+ if(r==UPNPCOMMAND_SUCCESS)
+ {
+ ePort = (unsigned short)atoi(extPort);
+ iPort = (unsigned short)atoi(intPort);
+ dur = (unsigned int)strtoul(duration, 0, 0);
+ return Py_BuildValue("(H,s,(s,H),s,s,s,I)",
+ ePort, protocol, intClient, iPort,
+ desc, enabled, rHost, dur);
+ }
+ else
+ {
+ Py_RETURN_NONE;
+ }
+}
+
+/* miniupnpc.UPnP object Method Table */
+static PyMethodDef UPnP_methods[] = {
+ {"discover", (PyCFunction)UPnP_discover, METH_NOARGS,
+ "discover UPnP IGD devices on the network"
+ },
+ {"selectigd", (PyCFunction)UPnP_selectigd, METH_NOARGS,
+ "select a valid UPnP IGD among discovered devices"
+ },
+ {"totalbytesent", (PyCFunction)UPnP_totalbytesent, METH_NOARGS,
+ "return the total number of bytes sent by UPnP IGD"
+ },
+ {"totalbytereceived", (PyCFunction)UPnP_totalbytereceived, METH_NOARGS,
+ "return the total number of bytes received by UPnP IGD"
+ },
+ {"totalpacketsent", (PyCFunction)UPnP_totalpacketsent, METH_NOARGS,
+ "return the total number of packets sent by UPnP IGD"
+ },
+ {"totalpacketreceived", (PyCFunction)UPnP_totalpacketreceived, METH_NOARGS,
+ "return the total number of packets received by UPnP IGD"
+ },
+ {"statusinfo", (PyCFunction)UPnP_statusinfo, METH_NOARGS,
+ "return status and uptime"
+ },
+ {"connectiontype", (PyCFunction)UPnP_connectiontype, METH_NOARGS,
+ "return IGD WAN connection type"
+ },
+ {"externalipaddress", (PyCFunction)UPnP_externalipaddress, METH_NOARGS,
+ "return external IP address"
+ },
+ {"addportmapping", (PyCFunction)UPnP_addportmapping, METH_VARARGS,
+ "add a port mapping"
+ },
+ {"deleteportmapping", (PyCFunction)UPnP_deleteportmapping, METH_VARARGS,
+ "delete a port mapping"
+ },
+ {"getportmappingnumberofentries", (PyCFunction)UPnP_getportmappingnumberofentries, METH_NOARGS,
+ "-- non standard --"
+ },
+ {"getspecificportmapping", (PyCFunction)UPnP_getspecificportmapping, METH_VARARGS,
+ "get details about a specific port mapping entry"
+ },
+ {"getgenericportmapping", (PyCFunction)UPnP_getgenericportmapping, METH_VARARGS,
+ "get all details about the port mapping at index"
+ },
+ {NULL} /* Sentinel */
+};
+
+static PyTypeObject UPnPType = {
+ PyObject_HEAD_INIT(NULL)
+ 0, /*ob_size*/
+ "miniupnpc.UPnP", /*tp_name*/
+ sizeof(UPnPObject), /*tp_basicsize*/
+ 0, /*tp_itemsize*/
+ (destructor)UPnPObject_dealloc,/*tp_dealloc*/
+ 0, /*tp_print*/
+ 0, /*tp_getattr*/
+ 0, /*tp_setattr*/
+ 0, /*tp_compare*/
+ 0, /*tp_repr*/
+ 0, /*tp_as_number*/
+ 0, /*tp_as_sequence*/
+ 0, /*tp_as_mapping*/
+ 0, /*tp_hash */
+ 0, /*tp_call*/
+ 0, /*tp_str*/
+ 0, /*tp_getattro*/
+ 0, /*tp_setattro*/
+ 0, /*tp_as_buffer*/
+ Py_TPFLAGS_DEFAULT, /*tp_flags*/
+ "UPnP objects", /* tp_doc */
+ 0, /* tp_traverse */
+ 0, /* tp_clear */
+ 0, /* tp_richcompare */
+ 0, /* tp_weaklistoffset */
+ 0, /* tp_iter */
+ 0, /* tp_iternext */
+ UPnP_methods, /* tp_methods */
+ UPnP_members, /* tp_members */
+ 0, /* tp_getset */
+ 0, /* tp_base */
+ 0, /* tp_dict */
+ 0, /* tp_descr_get */
+ 0, /* tp_descr_set */
+ 0, /* tp_dictoffset */
+ 0,/*(initproc)UPnP_init,*/ /* tp_init */
+ 0, /* tp_alloc */
+#ifndef WIN32
+ PyType_GenericNew,/*UPnP_new,*/ /* tp_new */
+#else
+ 0,
+#endif
+};
+
+/* module methods */
+static PyMethodDef miniupnpc_methods[] = {
+ {NULL} /* Sentinel */
+};
+
+#ifndef PyMODINIT_FUNC /* declarations for DLL import/export */
+#define PyMODINIT_FUNC void
+#endif
+PyMODINIT_FUNC
+initminiupnpc(void)
+{
+ PyObject* m;
+
+#ifdef WIN32
+ UPnPType.tp_new = PyType_GenericNew;
+#endif
+ if (PyType_Ready(&UPnPType) < 0)
+ return;
+
+ m = Py_InitModule3("miniupnpc", miniupnpc_methods,
+ "miniupnpc module.");
+
+ Py_INCREF(&UPnPType);
+ PyModule_AddObject(m, "UPnP", (PyObject *)&UPnPType);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniupnpcstrings.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniupnpcstrings.h
new file mode 100644
index 0000000..9eb86ac
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniupnpcstrings.h
@@ -0,0 +1,15 @@
+/* $Id: miniupnpcstrings.h.in,v 1.2 2009/10/30 09:18:18 nanard Exp $ */
+/* Project: miniupnp
+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * Author: Thomas Bernard
+ * Copyright (c) 2005-2009 Thomas Bernard
+ * This software is subjects to the conditions detailed
+ * in the LICENCE file provided within this distribution */
+#ifndef __MINIUPNPCSTRINGS_H__
+#define __MINIUPNPCSTRINGS_H__
+
+#define OS_STRING "Darwin/10.3.0"
+#define MINIUPNPC_VERSION_STRING "1.4"
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniwget.c b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniwget.c
new file mode 100644
index 0000000..55719e9
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniwget.c
@@ -0,0 +1,250 @@
+/* $Id: miniwget.c,v 1.36 2010/04/05 12:34:05 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas Bernard
+ * Copyright (c) 2005-2010 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "miniupnpc.h"
+#ifdef WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <io.h>
+#define MAXHOSTNAMELEN 64
+#define MIN(x,y) (((x)<(y))?(x):(y))
+#define snprintf _snprintf
+#define socklen_t int
+#else /* #ifdef WIN32 */
+#include <unistd.h>
+#include <sys/param.h>
+#if defined(__amigaos__) && !defined(__amigaos4__)
+#define socklen_t int
+#else /* #if defined(__amigaos__) && !defined(__amigaos4__) */
+#include <sys/select.h>
+#endif /* #else defined(__amigaos__) && !defined(__amigaos4__) */
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#define closesocket close
+/* defining MINIUPNPC_IGNORE_EINTR enable the ignore of interruptions
+ * during the connect() call */
+#define MINIUPNPC_IGNORE_EINTR
+#endif /* #else WIN32 */
+#if defined(__sun) || defined(sun)
+#define MIN(x,y) (((x)<(y))?(x):(y))
+#endif
+
+#include "miniupnpcstrings.h"
+#include "miniwget.h"
+#include "connecthostport.h"
+
+/* miniwget2() :
+ * do all the work.
+ * Return NULL if something failed. */
+static void *
+miniwget2(const char * url, const char * host,
+ unsigned short port, const char * path,
+ int * size, char * addr_str, int addr_str_len)
+{
+ char buf[2048];
+ int s;
+ int n;
+ int len;
+ int sent;
+
+ *size = 0;
+ s = connecthostport(host, port);
+ if(s < 0)
+ return NULL;
+
+ /* get address for caller ! */
+ if(addr_str)
+ {
+ struct sockaddr saddr;
+ socklen_t saddrlen;
+
+ saddrlen = sizeof(saddr);
+ if(getsockname(s, &saddr, &saddrlen) < 0)
+ {
+ perror("getsockname");
+ }
+ else
+ {
+#if defined(__amigaos__) && !defined(__amigaos4__)
+ /* using INT WINAPI WSAAddressToStringA(LPSOCKADDR, DWORD, LPWSAPROTOCOL_INFOA, LPSTR, LPDWORD);
+ * But his function make a string with the port : nn.nn.nn.nn:port */
+/* if(WSAAddressToStringA((SOCKADDR *)&saddr, sizeof(saddr),
+ NULL, addr_str, (DWORD *)&addr_str_len))
+ {
+ printf("WSAAddressToStringA() failed : %d\n", WSAGetLastError());
+ }*/
+ strncpy(addr_str, inet_ntoa(((struct sockaddr_in *)&saddr)->sin_addr), addr_str_len);
+#else
+ /*inet_ntop(AF_INET, &saddr.sin_addr, addr_str, addr_str_len);*/
+ n = getnameinfo(&saddr, saddrlen,
+ addr_str, addr_str_len,
+ NULL, 0,
+ NI_NUMERICHOST | NI_NUMERICSERV);
+ if(n != 0) {
+#ifdef WIN32
+ fprintf(stderr, "getnameinfo() failed : %d\n", n);
+#else
+ fprintf(stderr, "getnameinfo() failed : %s\n", gai_strerror(n));
+#endif
+ }
+#endif
+ }
+#ifdef DEBUG
+ printf("address miniwget : %s\n", addr_str);
+#endif
+ }
+
+ len = snprintf(buf, sizeof(buf),
+ "GET %s HTTP/1.0\r\n"
+ "Host: %s:%d\r\n"
+ "Connection: Close\r\n"
+ "User-Agent: " OS_STRING ", UPnP/1.0, MiniUPnPc/" MINIUPNPC_VERSION_STRING "\r\n"
+
+ "\r\n",
+ path, host, port);
+ sent = 0;
+ /* sending the HTTP request */
+ while(sent < len)
+ {
+ n = send(s, buf+sent, len-sent, 0);
+ if(n < 0)
+ {
+ perror("send");
+ closesocket(s);
+ return NULL;
+ }
+ else
+ {
+ sent += n;
+ }
+ }
+ {
+ /* TODO : in order to support HTTP/1.1, chunked transfer encoding
+ * must be supported. That means parsing of headers must be
+ * added. */
+ int headers=1;
+ char * respbuffer = NULL;
+ int allreadyread = 0;
+ /*while((n = recv(s, buf, 2048, 0)) > 0)*/
+ while((n = ReceiveData(s, buf, 2048, 5000)) > 0)
+ {
+ if(headers)
+ {
+ int i=0;
+ while(i<n-3)
+ {
+ /* searching for the end of the HTTP headers */
+ if(buf[i]=='\r' && buf[i+1]=='\n'
+ && buf[i+2]=='\r' && buf[i+3]=='\n')
+ {
+ headers = 0; /* end */
+ if(i<n-4)
+ {
+ /* Copy the content into respbuffet */
+ respbuffer = (char *)realloc((void *)respbuffer,
+ allreadyread+(n-i-4));
+ memcpy(respbuffer+allreadyread, buf + i + 4, n-i-4);
+ allreadyread += (n-i-4);
+ }
+ break;
+ }
+ i++;
+ }
+ }
+ else
+ {
+ respbuffer = (char *)realloc((void *)respbuffer,
+ allreadyread+n);
+ memcpy(respbuffer+allreadyread, buf, n);
+ allreadyread += n;
+ }
+ }
+ *size = allreadyread;
+#ifdef DEBUG
+ printf("%d bytes read\n", *size);
+#endif
+ closesocket(s);
+ return respbuffer;
+ }
+}
+
+/* parseURL()
+ * arguments :
+ * url : source string not modified
+ * hostname : hostname destination string (size of MAXHOSTNAMELEN+1)
+ * port : port (destination)
+ * path : pointer to the path part of the URL
+ *
+ * Return values :
+ * 0 - Failure
+ * 1 - Success */
+int parseURL(const char * url, char * hostname, unsigned short * port, char * * path)
+{
+ char * p1, *p2, *p3;
+ p1 = strstr(url, "://");
+ if(!p1)
+ return 0;
+ p1 += 3;
+ if( (url[0]!='h') || (url[1]!='t')
+ ||(url[2]!='t') || (url[3]!='p'))
+ return 0;
+ p2 = strchr(p1, ':');
+ p3 = strchr(p1, '/');
+ if(!p3)
+ return 0;
+ memset(hostname, 0, MAXHOSTNAMELEN + 1);
+ if(!p2 || (p2>p3))
+ {
+ strncpy(hostname, p1, MIN(MAXHOSTNAMELEN, (int)(p3-p1)));
+ *port = 80;
+ }
+ else
+ {
+ strncpy(hostname, p1, MIN(MAXHOSTNAMELEN, (int)(p2-p1)));
+ *port = 0;
+ p2++;
+ while( (*p2 >= '0') && (*p2 <= '9'))
+ {
+ *port *= 10;
+ *port += (unsigned short)(*p2 - '0');
+ p2++;
+ }
+ }
+ *path = p3;
+ return 1;
+}
+
+void * miniwget(const char * url, int * size)
+{
+ unsigned short port;
+ char * path;
+ /* protocol://host:port/chemin */
+ char hostname[MAXHOSTNAMELEN+1];
+ *size = 0;
+ if(!parseURL(url, hostname, &port, &path))
+ return NULL;
+ return miniwget2(url, hostname, port, path, size, 0, 0);
+}
+
+void * miniwget_getaddr(const char * url, int * size, char * addr, int addrlen)
+{
+ unsigned short port;
+ char * path;
+ /* protocol://host:port/chemin */
+ char hostname[MAXHOSTNAMELEN+1];
+ *size = 0;
+ if(addr)
+ addr[0] = '\0';
+ if(!parseURL(url, hostname, &port, &path))
+ return NULL;
+ return miniwget2(url, hostname, port, path, size, addr, addrlen);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniwget.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniwget.h
new file mode 100644
index 0000000..12c062c
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/miniwget.h
@@ -0,0 +1,28 @@
+/* $Id: miniwget.h,v 1.5 2007/01/29 20:27:23 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas Bernard
+ * Copyright (c) 2005 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution.
+ * */
+#ifndef __MINIWGET_H__
+#define __MINIWGET_H__
+
+#include "declspec.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+LIBSPEC void * miniwget(const char *, int *);
+
+LIBSPEC void * miniwget_getaddr(const char *, int *, char *, int);
+
+int parseURL(const char *, char *, unsigned short *, char * *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minixml.c b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minixml.c
new file mode 100644
index 0000000..83c6acd
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minixml.c
@@ -0,0 +1,191 @@
+/* $Id: minixml.c,v 1.7 2009/10/10 19:15:35 nanard Exp $ */
+/* minixml.c : the minimum size a xml parser can be ! */
+/* Project : miniupnp
+ * webpage: http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * Author : Thomas Bernard
+
+Copyright (c) 2005-2009, Thomas BERNARD
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+*/
+#include "minixml.h"
+
+/* parseatt : used to parse the argument list
+ * return 0 (false) in case of success and -1 (true) if the end
+ * of the xmlbuffer is reached. */
+static int parseatt(struct xmlparser * p)
+{
+ const char * attname;
+ int attnamelen;
+ const char * attvalue;
+ int attvaluelen;
+ while(p->xml < p->xmlend)
+ {
+ if(*p->xml=='/' || *p->xml=='>')
+ return 0;
+ if( !IS_WHITE_SPACE(*p->xml) )
+ {
+ char sep;
+ attname = p->xml;
+ attnamelen = 0;
+ while(*p->xml!='=' && !IS_WHITE_SPACE(*p->xml) )
+ {
+ attnamelen++; p->xml++;
+ if(p->xml >= p->xmlend)
+ return -1;
+ }
+ while(*(p->xml++) != '=')
+ {
+ if(p->xml >= p->xmlend)
+ return -1;
+ }
+ while(IS_WHITE_SPACE(*p->xml))
+ {
+ p->xml++;
+ if(p->xml >= p->xmlend)
+ return -1;
+ }
+ sep = *p->xml;
+ if(sep=='\'' || sep=='\"')
+ {
+ p->xml++;
+ if(p->xml >= p->xmlend)
+ return -1;
+ attvalue = p->xml;
+ attvaluelen = 0;
+ while(*p->xml != sep)
+ {
+ attvaluelen++; p->xml++;
+ if(p->xml >= p->xmlend)
+ return -1;
+ }
+ }
+ else
+ {
+ attvalue = p->xml;
+ attvaluelen = 0;
+ while( !IS_WHITE_SPACE(*p->xml)
+ && *p->xml != '>' && *p->xml != '/')
+ {
+ attvaluelen++; p->xml++;
+ if(p->xml >= p->xmlend)
+ return -1;
+ }
+ }
+ /*printf("%.*s='%.*s'\n",
+ attnamelen, attname, attvaluelen, attvalue);*/
+ if(p->attfunc)
+ p->attfunc(p->data, attname, attnamelen, attvalue, attvaluelen);
+ }
+ p->xml++;
+ }
+ return -1;
+}
+
+/* parseelt parse the xml stream and
+ * call the callback functions when needed... */
+static void parseelt(struct xmlparser * p)
+{
+ int i;
+ const char * elementname;
+ while(p->xml < (p->xmlend - 1))
+ {
+ if((p->xml)[0]=='<' && (p->xml)[1]!='?')
+ {
+ i = 0; elementname = ++p->xml;
+ while( !IS_WHITE_SPACE(*p->xml)
+ && (*p->xml!='>') && (*p->xml!='/')
+ )
+ {
+ i++; p->xml++;
+ if (p->xml >= p->xmlend)
+ return;
+ /* to ignore namespace : */
+ if(*p->xml==':')
+ {
+ i = 0;
+ elementname = ++p->xml;
+ }
+ }
+ if(i>0)
+ {
+ if(p->starteltfunc)
+ p->starteltfunc(p->data, elementname, i);
+ if(parseatt(p))
+ return;
+ if(*p->xml!='/')
+ {
+ const char * data;
+ i = 0; data = ++p->xml;
+ if (p->xml >= p->xmlend)
+ return;
+ while( IS_WHITE_SPACE(*p->xml) )
+ {
+ p->xml++;
+ if (p->xml >= p->xmlend)
+ return;
+ }
+ while(*p->xml!='<')
+ {
+ i++; p->xml++;
+ if (p->xml >= p->xmlend)
+ return;
+ }
+ if(i>0 && p->datafunc)
+ p->datafunc(p->data, data, i);
+ }
+ }
+ else if(*p->xml == '/')
+ {
+ i = 0; elementname = ++p->xml;
+ if (p->xml >= p->xmlend)
+ return;
+ while((*p->xml != '>'))
+ {
+ i++; p->xml++;
+ if (p->xml >= p->xmlend)
+ return;
+ }
+ if(p->endeltfunc)
+ p->endeltfunc(p->data, elementname, i);
+ p->xml++;
+ }
+ }
+ else
+ {
+ p->xml++;
+ }
+ }
+}
+
+/* the parser must be initialized before calling this function */
+void parsexml(struct xmlparser * parser)
+{
+ parser->xml = parser->xmlstart;
+ parser->xmlend = parser->xmlstart + parser->xmlsize;
+ parseelt(parser);
+}
+
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minixml.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minixml.h
new file mode 100644
index 0000000..857c70e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/minixml.h
@@ -0,0 +1,37 @@
+/* $Id: minixml.h,v 1.6 2006/11/30 11:47:21 nanard Exp $ */
+/* minimal xml parser
+ *
+ * Project : miniupnp
+ * Website : http://miniupnp.free.fr/
+ * Author : Thomas Bernard
+ * Copyright (c) 2005 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution.
+ * */
+#ifndef __MINIXML_H__
+#define __MINIXML_H__
+#define IS_WHITE_SPACE(c) ((c==' ') || (c=='\t') || (c=='\r') || (c=='\n'))
+
+/* if a callback function pointer is set to NULL,
+ * the function is not called */
+struct xmlparser {
+ const char *xmlstart;
+ const char *xmlend;
+ const char *xml; /* pointer to current character */
+ int xmlsize;
+ void * data;
+ void (*starteltfunc) (void *, const char *, int);
+ void (*endeltfunc) (void *, const char *, int);
+ void (*datafunc) (void *, const char *, int);
+ void (*attfunc) (void *, const char *, int, const char *, int);
+};
+
+/* parsexml()
+ * the xmlparser structure must be initialized before the call
+ * the following structure members have to be initialized :
+ * xmlstart, xmlsize, data, *func
+ * xml is for internal usage, xmlend is computed automatically */
+void parsexml(struct xmlparser *);
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnpcommands.c b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnpcommands.c
new file mode 100644
index 0000000..4755292
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnpcommands.c
@@ -0,0 +1,582 @@
+/* $Id: upnpcommands.c,v 1.25 2009/07/09 16:00:42 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas Bernard
+ * Copyright (c) 2005-2009 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution.
+ * */
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "upnpcommands.h"
+#include "miniupnpc.h"
+
+static UNSIGNED_INTEGER
+my_atoui(const char * s)
+{
+ return s ? ((UNSIGNED_INTEGER)STRTOUI(s, NULL, 0)) : 0;
+}
+
+/*
+ * */
+LIBSPEC UNSIGNED_INTEGER
+UPNP_GetTotalBytesSent(const char * controlURL,
+ const char * servicetype)
+{
+ struct NameValueParserData pdata;
+ char buffer[4096];
+ int bufsize = 4096;
+ unsigned int r = 0;
+ char * p;
+ simpleUPnPcommand(-1, controlURL, servicetype, "GetTotalBytesSent", 0, buffer, &bufsize);
+ ParseNameValue(buffer, bufsize, &pdata);
+ /*DisplayNameValueList(buffer, bufsize);*/
+ p = GetValueFromNameValueList(&pdata, "NewTotalBytesSent");
+ r = my_atoui(p);
+ ClearNameValueList(&pdata);
+ return r;
+}
+
+/*
+ * */
+LIBSPEC UNSIGNED_INTEGER
+UPNP_GetTotalBytesReceived(const char * controlURL,
+ const char * servicetype)
+{
+ struct NameValueParserData pdata;
+ char buffer[4096];
+ int bufsize = 4096;
+ unsigned int r = 0;
+ char * p;
+ simpleUPnPcommand(-1, controlURL, servicetype, "GetTotalBytesReceived", 0, buffer, &bufsize);
+ ParseNameValue(buffer, bufsize, &pdata);
+ /*DisplayNameValueList(buffer, bufsize);*/
+ p = GetValueFromNameValueList(&pdata, "NewTotalBytesReceived");
+ r = my_atoui(p);
+ ClearNameValueList(&pdata);
+ return r;
+}
+
+/*
+ * */
+LIBSPEC UNSIGNED_INTEGER
+UPNP_GetTotalPacketsSent(const char * controlURL,
+ const char * servicetype)
+{
+ struct NameValueParserData pdata;
+ char buffer[4096];
+ int bufsize = 4096;
+ unsigned int r = 0;
+ char * p;
+ simpleUPnPcommand(-1, controlURL, servicetype, "GetTotalPacketsSent", 0, buffer, &bufsize);
+ ParseNameValue(buffer, bufsize, &pdata);
+ /*DisplayNameValueList(buffer, bufsize);*/
+ p = GetValueFromNameValueList(&pdata, "NewTotalPacketsSent");
+ r = my_atoui(p);
+ ClearNameValueList(&pdata);
+ return r;
+}
+
+/*
+ * */
+LIBSPEC UNSIGNED_INTEGER
+UPNP_GetTotalPacketsReceived(const char * controlURL,
+ const char * servicetype)
+{
+ struct NameValueParserData pdata;
+ char buffer[4096];
+ int bufsize = 4096;
+ unsigned int r = 0;
+ char * p;
+ simpleUPnPcommand(-1, controlURL, servicetype, "GetTotalPacketsReceived", 0, buffer, &bufsize);
+ ParseNameValue(buffer, bufsize, &pdata);
+ /*DisplayNameValueList(buffer, bufsize);*/
+ p = GetValueFromNameValueList(&pdata, "NewTotalPacketsReceived");
+ r = my_atoui(p);
+ ClearNameValueList(&pdata);
+ return r;
+}
+
+/* UPNP_GetStatusInfo() call the corresponding UPNP method
+ * returns the current status and uptime */
+LIBSPEC int
+UPNP_GetStatusInfo(const char * controlURL,
+ const char * servicetype,
+ char * status,
+ unsigned int * uptime,
+ char * lastconnerror)
+{
+ struct NameValueParserData pdata;
+ char buffer[4096];
+ int bufsize = 4096;
+ char * p;
+ char * up;
+ char * err;
+ int ret = UPNPCOMMAND_UNKNOWN_ERROR;
+
+ if(!status && !uptime)
+ return UPNPCOMMAND_INVALID_ARGS;
+
+ simpleUPnPcommand(-1, controlURL, servicetype, "GetStatusInfo", 0, buffer, &bufsize);
+ ParseNameValue(buffer, bufsize, &pdata);
+ /*DisplayNameValueList(buffer, bufsize);*/
+ up = GetValueFromNameValueList(&pdata, "NewUptime");
+ p = GetValueFromNameValueList(&pdata, "NewConnectionStatus");
+ err = GetValueFromNameValueList(&pdata, "NewLastConnectionError");
+ if(p && up)
+ ret = UPNPCOMMAND_SUCCESS;
+
+ if(status) {
+ if(p){
+ strncpy(status, p, 64 );
+ status[63] = '\0';
+ }else
+ status[0]= '\0';
+ }
+
+ if(uptime) {
+ if(up)
+ sscanf(up,"%u",uptime);
+ else
+ uptime = 0;
+ }
+
+ if(lastconnerror) {
+ if(err) {
+ strncpy(lastconnerror, err, 64 );
+ lastconnerror[63] = '\0';
+ } else
+ lastconnerror[0] = '\0';
+ }
+
+ p = GetValueFromNameValueList(&pdata, "errorCode");
+ if(p) {
+ ret = UPNPCOMMAND_UNKNOWN_ERROR;
+ sscanf(p, "%d", &ret);
+ }
+ ClearNameValueList(&pdata);
+ return ret;
+}
+
+/* UPNP_GetConnectionTypeInfo() call the corresponding UPNP method
+ * returns the connection type */
+LIBSPEC int
+UPNP_GetConnectionTypeInfo(const char * controlURL,
+ const char * servicetype,
+ char * connectionType)
+{
+ struct NameValueParserData pdata;
+ char buffer[4096];
+ int bufsize = 4096;
+ char * p;
+ int ret = UPNPCOMMAND_UNKNOWN_ERROR;
+
+ if(!connectionType)
+ return UPNPCOMMAND_INVALID_ARGS;
+
+ simpleUPnPcommand(-1, controlURL, servicetype,
+ "GetConnectionTypeInfo", 0, buffer, &bufsize);
+ ParseNameValue(buffer, bufsize, &pdata);
+ p = GetValueFromNameValueList(&pdata, "NewConnectionType");
+ /*p = GetValueFromNameValueList(&pdata, "NewPossibleConnectionTypes");*/
+ /* PossibleConnectionTypes will have several values.... */
+ if(p) {
+ strncpy(connectionType, p, 64 );
+ connectionType[63] = '\0';
+ ret = UPNPCOMMAND_SUCCESS;
+ } else
+ connectionType[0] = '\0';
+ p = GetValueFromNameValueList(&pdata, "errorCode");
+ if(p) {
+ ret = UPNPCOMMAND_UNKNOWN_ERROR;
+ sscanf(p, "%d", &ret);
+ }
+ ClearNameValueList(&pdata);
+ return ret;
+}
+
+/* UPNP_GetLinkLayerMaxBitRate() call the corresponding UPNP method.
+ * Returns 2 values: Downloadlink bandwidth and Uplink bandwidth.
+ * One of the values can be null
+ * Note : GetLinkLayerMaxBitRates belongs to WANPPPConnection:1 only
+ * We can use the GetCommonLinkProperties from WANCommonInterfaceConfig:1 */
+LIBSPEC int
+UPNP_GetLinkLayerMaxBitRates(const char * controlURL,
+ const char * servicetype,
+ unsigned int * bitrateDown,
+ unsigned int* bitrateUp)
+{
+ struct NameValueParserData pdata;
+ char buffer[4096];
+ int bufsize = 4096;
+ int ret = UPNPCOMMAND_UNKNOWN_ERROR;
+ char * down;
+ char * up;
+ char * p;
+
+ if(!bitrateDown && !bitrateUp)
+ return UPNPCOMMAND_INVALID_ARGS;
+
+ /* shouldn't we use GetCommonLinkProperties ? */
+ simpleUPnPcommand(-1, controlURL, servicetype,
+ "GetCommonLinkProperties", 0, buffer, &bufsize);
+ /*"GetLinkLayerMaxBitRates", 0, buffer, &bufsize);*/
+ /*DisplayNameValueList(buffer, bufsize);*/
+ ParseNameValue(buffer, bufsize, &pdata);
+ /*down = GetValueFromNameValueList(&pdata, "NewDownstreamMaxBitRate");*/
+ /*up = GetValueFromNameValueList(&pdata, "NewUpstreamMaxBitRate");*/
+ down = GetValueFromNameValueList(&pdata, "NewLayer1DownstreamMaxBitRate");
+ up = GetValueFromNameValueList(&pdata, "NewLayer1UpstreamMaxBitRate");
+ /*GetValueFromNameValueList(&pdata, "NewWANAccessType");*/
+ /*GetValueFromNameValueList(&pdata, "NewPhysicalLinkSatus");*/
+ if(down && up)
+ ret = UPNPCOMMAND_SUCCESS;
+
+ if(bitrateDown) {
+ if(down)
+ sscanf(down,"%u",bitrateDown);
+ else
+ *bitrateDown = 0;
+ }
+
+ if(bitrateUp) {
+ if(up)
+ sscanf(up,"%u",bitrateUp);
+ else
+ *bitrateUp = 0;
+ }
+ p = GetValueFromNameValueList(&pdata, "errorCode");
+ if(p) {
+ ret = UPNPCOMMAND_UNKNOWN_ERROR;
+ sscanf(p, "%d", &ret);
+ }
+ ClearNameValueList(&pdata);
+ return ret;
+}
+
+
+/* UPNP_GetExternalIPAddress() call the corresponding UPNP method.
+ * if the third arg is not null the value is copied to it.
+ * at least 16 bytes must be available
+ *
+ * Return values :
+ * 0 : SUCCESS
+ * NON ZERO : ERROR Either an UPnP error code or an unknown error.
+ *
+ * 402 Invalid Args - See UPnP Device Architecture section on Control.
+ * 501 Action Failed - See UPnP Device Architecture section on Control.
+ */
+LIBSPEC int
+UPNP_GetExternalIPAddress(const char * controlURL,
+ const char * servicetype,
+ char * extIpAdd)
+{
+ struct NameValueParserData pdata;
+ char buffer[4096];
+ int bufsize = 4096;
+ char * p;
+ int ret = UPNPCOMMAND_UNKNOWN_ERROR;
+
+ if(!extIpAdd || !controlURL || !servicetype)
+ return UPNPCOMMAND_INVALID_ARGS;
+
+ simpleUPnPcommand(-1, controlURL, servicetype, "GetExternalIPAddress", 0, buffer, &bufsize);
+ /*DisplayNameValueList(buffer, bufsize);*/
+ ParseNameValue(buffer, bufsize, &pdata);
+ /*printf("external ip = %s\n", GetValueFromNameValueList(&pdata, "NewExternalIPAddress") );*/
+ p = GetValueFromNameValueList(&pdata, "NewExternalIPAddress");
+ if(p) {
+ strncpy(extIpAdd, p, 16 );
+ extIpAdd[15] = '\0';
+ ret = UPNPCOMMAND_SUCCESS;
+ } else
+ extIpAdd[0] = '\0';
+
+ p = GetValueFromNameValueList(&pdata, "errorCode");
+ if(p) {
+ ret = UPNPCOMMAND_UNKNOWN_ERROR;
+ sscanf(p, "%d", &ret);
+ }
+
+ ClearNameValueList(&pdata);
+ return ret;
+}
+
+LIBSPEC int
+UPNP_AddPortMapping(const char * controlURL, const char * servicetype,
+ const char * extPort,
+ const char * inPort,
+ const char * inClient,
+ const char * desc,
+ const char * proto,
+ const char * remoteHost)
+{
+ struct UPNParg * AddPortMappingArgs;
+ char buffer[4096];
+ int bufsize = 4096;
+ struct NameValueParserData pdata;
+ const char * resVal;
+ int ret;
+
+ if(!inPort || !inClient || !proto || !extPort)
+ return UPNPCOMMAND_INVALID_ARGS;
+
+ AddPortMappingArgs = calloc(9, sizeof(struct UPNParg));
+ AddPortMappingArgs[0].elt = "NewRemoteHost";
+ AddPortMappingArgs[0].val = remoteHost;
+ AddPortMappingArgs[1].elt = "NewExternalPort";
+ AddPortMappingArgs[1].val = extPort;
+ AddPortMappingArgs[2].elt = "NewProtocol";
+ AddPortMappingArgs[2].val = proto;
+ AddPortMappingArgs[3].elt = "NewInternalPort";
+ AddPortMappingArgs[3].val = inPort;
+ AddPortMappingArgs[4].elt = "NewInternalClient";
+ AddPortMappingArgs[4].val = inClient;
+ AddPortMappingArgs[5].elt = "NewEnabled";
+ AddPortMappingArgs[5].val = "1";
+ AddPortMappingArgs[6].elt = "NewPortMappingDescription";
+ AddPortMappingArgs[6].val = desc?desc:"libminiupnpc";
+ AddPortMappingArgs[7].elt = "NewLeaseDuration";
+ AddPortMappingArgs[7].val = "0";
+ simpleUPnPcommand(-1, controlURL, servicetype, "AddPortMapping", AddPortMappingArgs, buffer, &bufsize);
+ /*DisplayNameValueList(buffer, bufsize);*/
+ /*buffer[bufsize] = '\0';*/
+ /*puts(buffer);*/
+ ParseNameValue(buffer, bufsize, &pdata);
+ resVal = GetValueFromNameValueList(&pdata, "errorCode");
+ if(resVal) {
+ /*printf("AddPortMapping errorCode = '%s'\n", resVal); */
+ ret = UPNPCOMMAND_UNKNOWN_ERROR;
+ sscanf(resVal, "%d", &ret);
+ } else {
+ ret = UPNPCOMMAND_SUCCESS;
+ }
+ ClearNameValueList(&pdata);
+ free(AddPortMappingArgs);
+ return ret;
+}
+
+LIBSPEC int
+UPNP_DeletePortMapping(const char * controlURL, const char * servicetype,
+ const char * extPort, const char * proto,
+ const char * remoteHost)
+{
+ /*struct NameValueParserData pdata;*/
+ struct UPNParg * DeletePortMappingArgs;
+ char buffer[4096];
+ int bufsize = 4096;
+ struct NameValueParserData pdata;
+ const char * resVal;
+ int ret;
+
+ if(!extPort || !proto)
+ return UPNPCOMMAND_INVALID_ARGS;
+
+ DeletePortMappingArgs = calloc(4, sizeof(struct UPNParg));
+ DeletePortMappingArgs[0].elt = "NewRemoteHost";
+ DeletePortMappingArgs[0].val = remoteHost;
+ DeletePortMappingArgs[1].elt = "NewExternalPort";
+ DeletePortMappingArgs[1].val = extPort;
+ DeletePortMappingArgs[2].elt = "NewProtocol";
+ DeletePortMappingArgs[2].val = proto;
+ simpleUPnPcommand(-1, controlURL, servicetype,
+ "DeletePortMapping",
+ DeletePortMappingArgs, buffer, &bufsize);
+ /*DisplayNameValueList(buffer, bufsize);*/
+ ParseNameValue(buffer, bufsize, &pdata);
+ resVal = GetValueFromNameValueList(&pdata, "errorCode");
+ if(resVal) {
+ ret = UPNPCOMMAND_UNKNOWN_ERROR;
+ sscanf(resVal, "%d", &ret);
+ } else {
+ ret = UPNPCOMMAND_SUCCESS;
+ }
+ ClearNameValueList(&pdata);
+ free(DeletePortMappingArgs);
+ return ret;
+}
+
+LIBSPEC int
+UPNP_GetGenericPortMappingEntry(const char * controlURL,
+ const char * servicetype,
+ const char * index,
+ char * extPort,
+ char * intClient,
+ char * intPort,
+ char * protocol,
+ char * desc,
+ char * enabled,
+ char * rHost,
+ char * duration)
+{
+ struct NameValueParserData pdata;
+ struct UPNParg * GetPortMappingArgs;
+ char buffer[4096];
+ int bufsize = 4096;
+ char * p;
+ int r = UPNPCOMMAND_UNKNOWN_ERROR;
+ if(!index)
+ return UPNPCOMMAND_INVALID_ARGS;
+ intClient[0] = '\0';
+ intPort[0] = '\0';
+ GetPortMappingArgs = calloc(2, sizeof(struct UPNParg));
+ GetPortMappingArgs[0].elt = "NewPortMappingIndex";
+ GetPortMappingArgs[0].val = index;
+ simpleUPnPcommand(-1, controlURL, servicetype,
+ "GetGenericPortMappingEntry",
+ GetPortMappingArgs, buffer, &bufsize);
+ ParseNameValue(buffer, bufsize, &pdata);
+ p = GetValueFromNameValueList(&pdata, "NewRemoteHost");
+ if(p && rHost)
+ {
+ strncpy(rHost, p, 64);
+ rHost[63] = '\0';
+ }
+ p = GetValueFromNameValueList(&pdata, "NewExternalPort");
+ if(p && extPort)
+ {
+ strncpy(extPort, p, 6);
+ extPort[5] = '\0';
+ r = UPNPCOMMAND_SUCCESS;
+ }
+ p = GetValueFromNameValueList(&pdata, "NewProtocol");
+ if(p && protocol)
+ {
+ strncpy(protocol, p, 4);
+ protocol[3] = '\0';
+ }
+ p = GetValueFromNameValueList(&pdata, "NewInternalClient");
+ if(p && intClient)
+ {
+ strncpy(intClient, p, 16);
+ intClient[15] = '\0';
+ r = 0;
+ }
+ p = GetValueFromNameValueList(&pdata, "NewInternalPort");
+ if(p && intPort)
+ {
+ strncpy(intPort, p, 6);
+ intPort[5] = '\0';
+ }
+ p = GetValueFromNameValueList(&pdata, "NewEnabled");
+ if(p && enabled)
+ {
+ strncpy(enabled, p, 4);
+ enabled[3] = '\0';
+ }
+ p = GetValueFromNameValueList(&pdata, "NewPortMappingDescription");
+ if(p && desc)
+ {
+ strncpy(desc, p, 80);
+ desc[79] = '\0';
+ }
+ p = GetValueFromNameValueList(&pdata, "NewLeaseDuration");
+ if(p && duration)
+ {
+ strncpy(duration, p, 16);
+ duration[15] = '\0';
+ }
+ p = GetValueFromNameValueList(&pdata, "errorCode");
+ if(p) {
+ r = UPNPCOMMAND_UNKNOWN_ERROR;
+ sscanf(p, "%d", &r);
+ }
+ ClearNameValueList(&pdata);
+ free(GetPortMappingArgs);
+ return r;
+}
+
+LIBSPEC int
+UPNP_GetPortMappingNumberOfEntries(const char * controlURL,
+ const char * servicetype,
+ unsigned int * numEntries)
+{
+ struct NameValueParserData pdata;
+ char buffer[4096];
+ int bufsize = 4096;
+ char* p;
+ int ret = UPNPCOMMAND_UNKNOWN_ERROR;
+ simpleUPnPcommand(-1, controlURL, servicetype, "GetPortMappingNumberOfEntries", 0, buffer, &bufsize);
+#ifdef DEBUG
+ DisplayNameValueList(buffer, bufsize);
+#endif
+ ParseNameValue(buffer, bufsize, &pdata);
+
+ p = GetValueFromNameValueList(&pdata, "NewPortMappingNumberOfEntries");
+ if(numEntries && p) {
+ *numEntries = 0;
+ sscanf(p, "%u", numEntries);
+ ret = UPNPCOMMAND_SUCCESS;
+ }
+
+ p = GetValueFromNameValueList(&pdata, "errorCode");
+ if(p) {
+ ret = UPNPCOMMAND_UNKNOWN_ERROR;
+ sscanf(p, "%d", &ret);
+ }
+
+ ClearNameValueList(&pdata);
+ return ret;
+}
+
+/* UPNP_GetSpecificPortMappingEntry retrieves an existing port mapping
+ * the result is returned in the intClient and intPort strings
+ * please provide 16 and 6 bytes of data */
+LIBSPEC int
+UPNP_GetSpecificPortMappingEntry(const char * controlURL,
+ const char * servicetype,
+ const char * extPort,
+ const char * proto,
+ char * intClient,
+ char * intPort)
+{
+ struct NameValueParserData pdata;
+ struct UPNParg * GetPortMappingArgs;
+ char buffer[4096];
+ int bufsize = 4096;
+ char * p;
+ int ret = UPNPCOMMAND_UNKNOWN_ERROR;
+
+ if(!intPort || !intClient || !extPort || !proto)
+ return UPNPCOMMAND_INVALID_ARGS;
+
+ GetPortMappingArgs = calloc(4, sizeof(struct UPNParg));
+ GetPortMappingArgs[0].elt = "NewRemoteHost";
+ GetPortMappingArgs[1].elt = "NewExternalPort";
+ GetPortMappingArgs[1].val = extPort;
+ GetPortMappingArgs[2].elt = "NewProtocol";
+ GetPortMappingArgs[2].val = proto;
+ simpleUPnPcommand(-1, controlURL, servicetype,
+ "GetSpecificPortMappingEntry",
+ GetPortMappingArgs, buffer, &bufsize);
+ /*fd = simpleUPnPcommand(fd, controlURL, data.servicetype, "GetSpecificPortMappingEntry", AddPortMappingArgs, buffer, &bufsize); */
+ /*DisplayNameValueList(buffer, bufsize);*/
+ ParseNameValue(buffer, bufsize, &pdata);
+
+ p = GetValueFromNameValueList(&pdata, "NewInternalClient");
+ if(p) {
+ strncpy(intClient, p, 16);
+ intClient[15] = '\0';
+ ret = UPNPCOMMAND_SUCCESS;
+ } else
+ intClient[0] = '\0';
+
+ p = GetValueFromNameValueList(&pdata, "NewInternalPort");
+ if(p) {
+ strncpy(intPort, p, 6);
+ intPort[5] = '\0';
+ } else
+ intPort[0] = '\0';
+
+ p = GetValueFromNameValueList(&pdata, "errorCode");
+ if(p) {
+ ret = UPNPCOMMAND_UNKNOWN_ERROR;
+ sscanf(p, "%d", &ret);
+ }
+
+ ClearNameValueList(&pdata);
+ free(GetPortMappingArgs);
+ return ret;
+}
+
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnpcommands.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnpcommands.h
new file mode 100644
index 0000000..217c472
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnpcommands.h
@@ -0,0 +1,193 @@
+/* $Id: upnpcommands.h,v 1.17 2009/04/17 21:21:19 nanard Exp $ */
+/* Miniupnp project : http://miniupnp.free.fr/
+ * Author : Thomas Bernard
+ * Copyright (c) 2005-2008 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided within this distribution */
+#ifndef __UPNPCOMMANDS_H__
+#define __UPNPCOMMANDS_H__
+
+#include "upnpreplyparse.h"
+#include "declspec.h"
+
+/* MiniUPnPc return codes : */
+#define UPNPCOMMAND_SUCCESS (0)
+#define UPNPCOMMAND_UNKNOWN_ERROR (-1)
+#define UPNPCOMMAND_INVALID_ARGS (-2)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+#define UNSIGNED_INTEGER unsigned long long
+#define STRTOUI strtoull
+#else
+#define UNSIGNED_INTEGER unsigned int
+#define STRTOUI strtoul
+#endif
+
+LIBSPEC UNSIGNED_INTEGER
+UPNP_GetTotalBytesSent(const char * controlURL,
+ const char * servicetype);
+
+LIBSPEC UNSIGNED_INTEGER
+UPNP_GetTotalBytesReceived(const char * controlURL,
+ const char * servicetype);
+
+LIBSPEC UNSIGNED_INTEGER
+UPNP_GetTotalPacketsSent(const char * controlURL,
+ const char * servicetype);
+
+LIBSPEC UNSIGNED_INTEGER
+UPNP_GetTotalPacketsReceived(const char * controlURL,
+ const char * servicetype);
+
+/* UPNP_GetStatusInfo()
+ * status and lastconnerror are 64 byte buffers
+ * Return values :
+ * UPNPCOMMAND_SUCCESS, UPNPCOMMAND_INVALID_ARGS, UPNPCOMMAND_UNKNOWN_ERROR
+ * or a UPnP Error code */
+LIBSPEC int
+UPNP_GetStatusInfo(const char * controlURL,
+ const char * servicetype,
+ char * status,
+ unsigned int * uptime,
+ char * lastconnerror);
+
+/* UPNP_GetConnectionTypeInfo()
+ * argument connectionType is a 64 character buffer
+ * Return Values :
+ * UPNPCOMMAND_SUCCESS, UPNPCOMMAND_INVALID_ARGS, UPNPCOMMAND_UNKNOWN_ERROR
+ * or a UPnP Error code */
+LIBSPEC int
+UPNP_GetConnectionTypeInfo(const char * controlURL,
+ const char * servicetype,
+ char * connectionType);
+
+/* UPNP_GetExternalIPAddress() call the corresponding UPNP method.
+ * if the third arg is not null the value is copied to it.
+ * at least 16 bytes must be available
+ *
+ * Return values :
+ * 0 : SUCCESS
+ * NON ZERO : ERROR Either an UPnP error code or an unknown error.
+ *
+ * possible UPnP Errors :
+ * 402 Invalid Args - See UPnP Device Architecture section on Control.
+ * 501 Action Failed - See UPnP Device Architecture section on Control. */
+LIBSPEC int
+UPNP_GetExternalIPAddress(const char * controlURL,
+ const char * servicetype,
+ char * extIpAdd);
+
+/* UPNP_GetLinkLayerMaxBitRates()
+ * call WANCommonInterfaceConfig:1#GetCommonLinkProperties
+ *
+ * return values :
+ * UPNPCOMMAND_SUCCESS, UPNPCOMMAND_INVALID_ARGS, UPNPCOMMAND_UNKNOWN_ERROR
+ * or a UPnP Error Code. */
+LIBSPEC int
+UPNP_GetLinkLayerMaxBitRates(const char* controlURL,
+ const char* servicetype,
+ unsigned int * bitrateDown,
+ unsigned int * bitrateUp);
+
+/* UPNP_AddPortMapping()
+ * if desc is NULL, it will be defaulted to "libminiupnpc"
+ * remoteHost is usually NULL because IGD don't support it.
+ *
+ * Return values :
+ * 0 : SUCCESS
+ * NON ZERO : ERROR. Either an UPnP error code or an unknown error.
+ *
+ * List of possible UPnP errors for AddPortMapping :
+ * errorCode errorDescription (short) - Description (long)
+ * 402 Invalid Args - See UPnP Device Architecture section on Control.
+ * 501 Action Failed - See UPnP Device Architecture section on Control.
+ * 715 WildCardNotPermittedInSrcIP - The source IP address cannot be
+ * wild-carded
+ * 716 WildCardNotPermittedInExtPort - The external port cannot be wild-carded
+ * 718 ConflictInMappingEntry - The port mapping entry specified conflicts
+ * with a mapping assigned previously to another client
+ * 724 SamePortValuesRequired - Internal and External port values
+ * must be the same
+ * 725 OnlyPermanentLeasesSupported - The NAT implementation only supports
+ * permanent lease times on port mappings
+ * 726 RemoteHostOnlySupportsWildcard - RemoteHost must be a wildcard
+ * and cannot be a specific IP address or DNS name
+ * 727 ExternalPortOnlySupportsWildcard - ExternalPort must be a wildcard and
+ * cannot be a specific port value */
+LIBSPEC int
+UPNP_AddPortMapping(const char * controlURL, const char * servicetype,
+ const char * extPort,
+ const char * inPort,
+ const char * inClient,
+ const char * desc,
+ const char * proto,
+ const char * remoteHost);
+
+/* UPNP_DeletePortMapping()
+ * Use same argument values as what was used for AddPortMapping().
+ * remoteHost is usually NULL because IGD don't support it.
+ * Return Values :
+ * 0 : SUCCESS
+ * NON ZERO : error. Either an UPnP error code or an undefined error.
+ *
+ * List of possible UPnP errors for DeletePortMapping :
+ * 402 Invalid Args - See UPnP Device Architecture section on Control.
+ * 714 NoSuchEntryInArray - The specified value does not exist in the array */
+LIBSPEC int
+UPNP_DeletePortMapping(const char * controlURL, const char * servicetype,
+ const char * extPort, const char * proto,
+ const char * remoteHost);
+
+/* UPNP_GetPortMappingNumberOfEntries()
+ * not supported by all routers */
+LIBSPEC int
+UPNP_GetPortMappingNumberOfEntries(const char* controlURL, const char* servicetype, unsigned int * num);
+
+/* UPNP_GetSpecificPortMappingEntry retrieves an existing port mapping
+ * the result is returned in the intClient and intPort strings
+ * please provide 16 and 6 bytes of data
+ *
+ * return value :
+ * UPNPCOMMAND_SUCCESS, UPNPCOMMAND_INVALID_ARGS, UPNPCOMMAND_UNKNOWN_ERROR
+ * or a UPnP Error Code. */
+LIBSPEC int
+UPNP_GetSpecificPortMappingEntry(const char * controlURL,
+ const char * servicetype,
+ const char * extPort,
+ const char * proto,
+ char * intClient,
+ char * intPort);
+
+/* UPNP_GetGenericPortMappingEntry()
+ *
+ * return value :
+ * UPNPCOMMAND_SUCCESS, UPNPCOMMAND_INVALID_ARGS, UPNPCOMMAND_UNKNOWN_ERROR
+ * or a UPnP Error Code.
+ *
+ * Possible UPNP Error codes :
+ * 402 Invalid Args - See UPnP Device Architecture section on Control.
+ * 713 SpecifiedArrayIndexInvalid - The specified array index is out of bounds
+ */
+LIBSPEC int
+UPNP_GetGenericPortMappingEntry(const char * controlURL,
+ const char * servicetype,
+ const char * index,
+ char * extPort,
+ char * intClient,
+ char * intPort,
+ char * protocol,
+ char * desc,
+ char * enabled,
+ char * rHost,
+ char * duration);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnperrors.c b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnperrors.c
new file mode 100644
index 0000000..8a05349
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnperrors.c
@@ -0,0 +1,66 @@
+/* $Id: upnperrors.c,v 1.3 2008/04/27 17:21:51 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas BERNARD
+ * copyright (c) 2007 Thomas Bernard
+ * All Right reserved.
+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * This software is subjet to the conditions detailed in the
+ * provided LICENCE file. */
+#include <string.h>
+#include "upnperrors.h"
+#include "upnpcommands.h"
+
+const char * strupnperror(int err)
+{
+ const char * s = NULL;
+ switch(err) {
+ case UPNPCOMMAND_SUCCESS:
+ s = "Success";
+ break;
+ case UPNPCOMMAND_UNKNOWN_ERROR:
+ s = "Miniupnpc Unknown Error";
+ break;
+ case UPNPCOMMAND_INVALID_ARGS:
+ s = "Miniupnpc Invalid Arguments";
+ break;
+ case 401:
+ s = "Invalid Action";
+ break;
+ case 402:
+ s = "Invalid Args";
+ break;
+ case 501:
+ s = "Action Failed";
+ break;
+ case 713:
+ s = "SpecifiedArrayIndexInvalid";
+ break;
+ case 714:
+ s = "NoSuchEntryInArray";
+ break;
+ case 715:
+ s = "WildCardNotPermittedInSrcIP";
+ break;
+ case 716:
+ s = "WildCardNotPermittedInExtPort";
+ break;
+ case 718:
+ s = "ConflictInMappingEntry";
+ break;
+ case 724:
+ s = "SamePortValuesRequired";
+ break;
+ case 725:
+ s = "OnlyPermanentLeasesSupported";
+ break;
+ case 726:
+ s = "RemoteHostOnlySupportsWildcard";
+ break;
+ case 727:
+ s = "ExternalPortOnlySupportsWildcard";
+ break;
+ default:
+ s = NULL;
+ }
+ return s;
+}
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnperrors.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnperrors.h
new file mode 100644
index 0000000..2c544c9
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnperrors.h
@@ -0,0 +1,26 @@
+/* $Id: upnperrors.h,v 1.2 2008/07/02 23:31:15 nanard Exp $ */
+/* (c) 2007 Thomas Bernard
+ * All rights reserved.
+ * MiniUPnP Project.
+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * This software is subjet to the conditions detailed in the
+ * provided LICENCE file. */
+#ifndef __UPNPERRORS_H__
+#define __UPNPERRORS_H__
+
+#include "declspec.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* strupnperror()
+ * Return a string description of the UPnP error code
+ * or NULL for undefinded errors */
+LIBSPEC const char * strupnperror(int err);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnpreplyparse.c b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnpreplyparse.c
new file mode 100644
index 0000000..c72b4c8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnpreplyparse.c
@@ -0,0 +1,127 @@
+/* $Id: upnpreplyparse.c,v 1.10 2008/02/21 13:05:27 nanard Exp $ */
+/* MiniUPnP project
+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * (c) 2006 Thomas Bernard
+ * This software is subject to the conditions detailed
+ * in the LICENCE file provided within the distribution */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "upnpreplyparse.h"
+#include "minixml.h"
+
+static void
+NameValueParserStartElt(void * d, const char * name, int l)
+{
+ struct NameValueParserData * data = (struct NameValueParserData *)d;
+ if(l>63)
+ l = 63;
+ memcpy(data->curelt, name, l);
+ data->curelt[l] = '\0';
+}
+
+static void
+NameValueParserGetData(void * d, const char * datas, int l)
+{
+ struct NameValueParserData * data = (struct NameValueParserData *)d;
+ struct NameValue * nv;
+ nv = malloc(sizeof(struct NameValue));
+ if(l>63)
+ l = 63;
+ strncpy(nv->name, data->curelt, 64);
+ nv->name[63] = '\0';
+ memcpy(nv->value, datas, l);
+ nv->value[l] = '\0';
+ LIST_INSERT_HEAD( &(data->head), nv, entries);
+}
+
+void
+ParseNameValue(const char * buffer, int bufsize,
+ struct NameValueParserData * data)
+{
+ struct xmlparser parser;
+ LIST_INIT(&(data->head));
+ /* init xmlparser object */
+ parser.xmlstart = buffer;
+ parser.xmlsize = bufsize;
+ parser.data = data;
+ parser.starteltfunc = NameValueParserStartElt;
+ parser.endeltfunc = 0;
+ parser.datafunc = NameValueParserGetData;
+ parser.attfunc = 0;
+ parsexml(&parser);
+}
+
+void
+ClearNameValueList(struct NameValueParserData * pdata)
+{
+ struct NameValue * nv;
+ while((nv = pdata->head.lh_first) != NULL)
+ {
+ LIST_REMOVE(nv, entries);
+ free(nv);
+ }
+}
+
+char *
+GetValueFromNameValueList(struct NameValueParserData * pdata,
+ const char * Name)
+{
+ struct NameValue * nv;
+ char * p = NULL;
+ for(nv = pdata->head.lh_first;
+ (nv != NULL) && (p == NULL);
+ nv = nv->entries.le_next)
+ {
+ if(strcmp(nv->name, Name) == 0)
+ p = nv->value;
+ }
+ return p;
+}
+
+#if 0
+/* useless now that minixml ignores namespaces by itself */
+char *
+GetValueFromNameValueListIgnoreNS(struct NameValueParserData * pdata,
+ const char * Name)
+{
+ struct NameValue * nv;
+ char * p = NULL;
+ char * pname;
+ for(nv = pdata->head.lh_first;
+ (nv != NULL) && (p == NULL);
+ nv = nv->entries.le_next)
+ {
+ pname = strrchr(nv->name, ':');
+ if(pname)
+ pname++;
+ else
+ pname = nv->name;
+ if(strcmp(pname, Name)==0)
+ p = nv->value;
+ }
+ return p;
+}
+#endif
+
+/* debug all-in-one function
+ * do parsing then display to stdout */
+#ifdef DEBUG
+void
+DisplayNameValueList(char * buffer, int bufsize)
+{
+ struct NameValueParserData pdata;
+ struct NameValue * nv;
+ ParseNameValue(buffer, bufsize, &pdata);
+ for(nv = pdata.head.lh_first;
+ nv != NULL;
+ nv = nv->entries.le_next)
+ {
+ printf("%s = %s\n", nv->name, nv->value);
+ }
+ ClearNameValueList(&pdata);
+}
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnpreplyparse.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnpreplyparse.h
new file mode 100644
index 0000000..fb7d453
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/miniupnpc/upnpreplyparse.h
@@ -0,0 +1,62 @@
+/* $Id: upnpreplyparse.h,v 1.10 2009/07/09 16:01:50 nanard Exp $ */
+/* MiniUPnP project
+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * (c) 2006-2009 Thomas Bernard
+ * This software is subject to the conditions detailed
+ * in the LICENCE file provided within the distribution */
+
+#ifndef __UPNPREPLYPARSE_H__
+#define __UPNPREPLYPARSE_H__
+
+#if defined(NO_SYS_QUEUE_H) || defined(WIN32) || defined(__HAIKU__)
+#include "bsdqueue.h"
+#else
+#include <sys/queue.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct NameValue {
+ LIST_ENTRY(NameValue) entries;
+ char name[64];
+ char value[64];
+};
+
+struct NameValueParserData {
+ LIST_HEAD(listhead, NameValue) head;
+ char curelt[64];
+};
+
+/* ParseNameValue() */
+void
+ParseNameValue(const char * buffer, int bufsize,
+ struct NameValueParserData * data);
+
+/* ClearNameValueList() */
+void
+ClearNameValueList(struct NameValueParserData * pdata);
+
+/* GetValueFromNameValueList() */
+char *
+GetValueFromNameValueList(struct NameValueParserData * pdata,
+ const char * Name);
+
+/* GetValueFromNameValueListIgnoreNS() */
+char *
+GetValueFromNameValueListIgnoreNS(struct NameValueParserData * pdata,
+ const char * Name);
+
+/* DisplayNameValueList() */
+#ifdef DEBUG
+void
+DisplayNameValueList(char * buffer, int bufsize);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/CMakeLists.txt
new file mode 100644
index 0000000..7ef4dc4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/CMakeLists.txt
@@ -0,0 +1,22 @@
+##
+## $Id: CMakeLists.txt 3645 2009-03-28 22:27:44Z coderman $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+add_subdirectory(ts2po)
+add_subdirectory(po2ts)
+
+if (WIN32)
+ add_subdirectory(po2nsh)
+ add_subdirectory(nsh2po EXCLUDE_FROM_ALL)
+ add_subdirectory(po2wxl)
+ add_subdirectory(wixtool)
+endif(WIN32)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/nsh2po/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/nsh2po/CMakeLists.txt
new file mode 100644
index 0000000..27cae29
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/nsh2po/CMakeLists.txt
@@ -0,0 +1,46 @@
+##
+## $Id: CMakeLists.txt 3840 2009-06-11 17:57:53Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+## Define this version of nsh2po
+set(VERSION "0.1")
+
+## Include the source and binary directories so it can find out configured
+## header file
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+## nsh2po source files
+set(nsh2po_SRCS
+ nsh2po.cpp
+)
+
+## Set some of the properties used in the .po header
+set(NSH2PO_PROJECT_ID "Vidalia")
+set(NSH2PO_CONTACT_ADDR "translations at vidalia-project.net")
+set(NSH2PO_LANGUAGE_TEAM "translations at vidalia-project.net")
+
+## Create and populate config.h
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/nsh2po_config.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/nsh2po_config.h
+)
+
+## Create the nsh2po executable
+add_executable(nsh2po ${nsh2po_SRCS})
+
+## Link the executable with the appropriate Qt libraries
+target_link_libraries(nsh2po
+ ${QT_QTCORE_LIBRARY}
+)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/nsh2po/nsh2po.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/nsh2po/nsh2po.cpp
new file mode 100644
index 0000000..9e6ddf4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/nsh2po/nsh2po.cpp
@@ -0,0 +1,352 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#include <QHash>
+#include <QFile>
+#include <QTextStream>
+#include <QTextCodec>
+#include <QDateTime>
+#include <QStringList>
+#include <stdlib.h>
+
+#include "nsh2po_config.h"
+
+
+/** Parse the context name from <b>str</b>, where the context name is of the
+ * form DQUOTE ContextName DQUOTE. */
+QString
+parse_message_context(const QString &str)
+{
+ QString out = str.trimmed();
+ out = out.replace("\"", "");
+ return out;
+}
+
+/** Parse the context name from <b>str</b>, where <b>str</b> is of the
+ * form ContextName#Number. This is the format used by translate-toolkit. */
+QString
+parse_message_context_lame(const QString &str)
+{
+ if (str.contains("#"))
+ return str.section("#", 0, 0);
+ return QString();
+}
+
+/** Parse the PO-formatted message string from <b>msg</b>. */
+QString
+parse_message_string(const QString &msg)
+{
+ QString out = msg.trimmed();
+
+ if (out.startsWith("\""))
+ out = out.remove(0, 1);
+ if (out.endsWith("\""))
+ out.chop(1);
+ out.replace("\\\"", "\"");
+ out.replace("\\r\\n", "\\n");
+ return out;
+}
+
+/** Parse the NSIS-formatted LangString message from <b>msg</b>. */
+QString
+parse_nsh_langstring(const QString &msg)
+{
+ QString out = msg.trimmed();
+
+ if (out.startsWith("\""))
+ out = out.remove(0, 1);
+ if (out.endsWith("\""))
+ out.chop(1);
+ out.replace("$\\n", "\\n");
+ out.replace("$\\r", "");
+ out.replace("\\r", "");
+ return out;
+}
+
+/** Return the current time (in UTC) in the format YYYY-MM-DD HH:MM+0000. */
+QString
+create_po_timestamp()
+{
+ QDateTime now = QDateTime::currentDateTime().toUTC();
+ return now.toString("yyyy-MM-dd hh:mm+0000");
+}
+
+/** Return a header to be placed at the top of the .po file. */
+QString
+create_po_header(const QString &charset)
+{
+ QString header;
+ QString tstamp = create_po_timestamp();
+
+ header.append("msgid \"\"\n");
+ header.append("msgstr \"\"\n");
+ header.append("\"Project-Id-Version: "NSH2PO_PROJECT_ID"\\n\"\n");
+ header.append("\"Report-Msgid-Bugs-To: "NSH2PO_CONTACT_ADDR"\\n\"\n");
+ header.append(QString("\"POT-Creation-Date: %1\\n\"\n").arg(tstamp));
+ header.append("\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n");
+ header.append("\"Last-Translator: \\n\"\n");
+ header.append("\"Language-Team: "NSH2PO_LANGUAGE_TEAM"\\n\"\n");
+ header.append("\"MIME-Version: 1.0\\n\"\n");
+ header.append(QString("\"Content-Type: text/plain; "
+ "charset=%1\\n\"\n").arg(charset));
+ header.append("\"Content-Transfer-Encoding: 8bit\\n\"\n");
+ header.append("\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n\"\n");
+ header.append("\"X-Generator: Vidalia nsh2po "NSH2PO_VERSION"\\n\"\n");
+ header.append("\n");
+
+ return header;
+}
+
+/** Read and return the next non-empty line from <b>stream</b>. */
+QString
+read_next_line(QTextStream *stream)
+{
+ Q_ASSERT(stream);
+ stream->skipWhiteSpace();
+ return stream->readLine();
+}
+
+/** Skip past the header portion of the POT file and any leading whitespace.
+ * The next line read from <b>po</b> will be the first non-header line in the
+ * document. */
+void
+skip_pot_header(QTextStream *pot)
+{
+ QString line;
+ /* Skip any leading whitespace before the header */
+ pot->skipWhiteSpace();
+ /* Read to the first empty line */
+ line = pot->readLine();
+ while (!pot->atEnd() && !line.isEmpty())
+ line = pot->readLine();
+}
+
+/** Parse a PO template file for (context,source string) pairs, which are
+ * be stored in <b>out</b> using <i>msgctxt</i> as the key and <i>msgid</i>
+ * as the value. Return true on success, or false on failure and set
+ * <b>errmsg</b>. */
+bool
+parse_po_template(QTextStream *pot, QHash<QString,QString> *out,
+ QString *errmsg)
+{
+ QString line, msgctxt, msgid;
+
+ skip_pot_header(pot);
+ line = read_next_line(pot);
+ while (!pot->atEnd()) {
+ if (!line.startsWith("#:") && !line.startsWith("msgctxt")) {
+ /* Skip to the start of the next message entry */
+ line = read_next_line(pot);
+ continue;
+ }
+
+ if (line.startsWith("#:")) {
+ /* Context was specified with the stupid overloaded "#:" syntax.*/
+ msgctxt = line.section(" ", 1);
+ msgctxt = parse_message_context_lame(msgctxt);
+ line = read_next_line(pot);
+ continue;
+ }
+
+ if (line.startsWith("msgctxt ")) {
+ /* A context specified on a "msgctxt" line takes precedence over a
+ * context specified using the overload "#:" notation. */
+ msgctxt = line.section(" ", 1);
+ msgctxt = parse_message_context(msgctxt);
+ line = read_next_line(pot);
+ }
+
+ if (!line.startsWith("msgid ")) {
+ *errmsg = "expected 'msgid' line";
+ return false;
+ }
+ msgid = line.section(" ", 1);
+
+ line = read_next_line(pot);
+ while (line.startsWith("\"")) {
+ /* This msgid line had multiple parts to it */
+ msgid.append(line);
+ line = read_next_line(pot);
+ }
+ msgid = parse_message_string(msgid);
+
+ out->insert(msgctxt, msgid);
+ }
+
+ return true;
+}
+
+/** Read an NSIS-formatted file containing LangString entries from <b>nsh</b>.
+ * If a LangString entry has a corresponding entry in <b>pot</b>, then the
+ * message entry is PO-formatted and appended to <b>po</b>. Return true on
+ * success, or false on failure and <b>errmsg</b> will be set. */
+int
+nsh2po(QTextStream *nsh, const QString &charset,
+ const QHash<QString,QString> &pot, QString *po, QString *errmsg)
+{
+ QString line, msgctxt, msgid, msgstr;
+ QStringList parts;
+ QHash<QString,QString> langStrings;
+ int idx, n_strings;
+
+ *po = create_po_header(charset);
+
+ /* Parse the translated strings from the NSH file */
+ while (!nsh->atEnd()) {
+ line = read_next_line(nsh);
+ if (!line.startsWith("LangString "))
+ continue;
+
+ parts = line.split(" ");
+ if (parts.size() > 3)
+ msgctxt = parts.at(1);
+ else
+ continue; /* Not properly formatted */
+
+ idx = line.indexOf("\"");
+ if (idx > 0)
+ msgstr = parse_nsh_langstring(line.mid(idx));
+ langStrings.insert(msgctxt, msgstr);
+ }
+
+ /* Format the PO file based on the template. */
+ n_strings = 0;
+ foreach (QString msgctxt, pot.keys()) {
+ msgid = pot.value(msgctxt);
+ if (langStrings.contains(msgctxt)) {
+ msgstr = langStrings.value(msgctxt);
+ n_strings++;
+ } else {
+ msgstr = msgid;
+ }
+
+ po->append(QString("msgctxt \"%1\"\n").arg(msgctxt));
+ po->append(QString("msgid \"%1\"\n").arg(msgid));
+ po->append(QString("msgstr \"%1\"\n").arg(msgstr));
+ po->append("\n");
+ }
+ return n_strings;
+}
+
+/** Write <b>po</b> to <b>poFileName</b> using <b>codec</b>. Return true on
+ * success. On failure, return false and set <b>errmsg</b> to the reason for
+ * failure. */
+bool
+write_po_output(const char *poFileName, const QString &po, QTextCodec *codec,
+ QString *errmsg)
+{
+ QFile poFile(poFileName);
+ if (!poFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+ *errmsg = QString("Unable to open '%1' for writing.").arg(poFileName);
+ return false;
+ }
+
+ QTextStream out(&poFile);
+ out.setCodec(codec);
+ out << po;
+ return true;
+}
+
+/** Display application usage and exit. */
+void
+print_usage_and_exit()
+{
+ QTextStream error(stderr);
+ error << "usage: nsh2po [-q] -t <template.pot> -i <infile.nsh> "
+ "-o <outfile.po> [-c <encoding>]\n";
+ error << " -q (optional) Quiet mode (errors are still displayed)\n";
+ error << " -t <template.pot> PO template file\n";
+ error << " -i <infile.ts> Input .ts file\n";
+ error << " -o <outfile.po> Output .po file\n";
+ error << " -c <encoding> Text encoding (default: utf-8)\n";
+ error.flush();
+ exit(1);
+}
+
+int
+main(int argc, char *argv[])
+{
+ QTextStream error(stderr);
+ QString po, errorMessage;
+ char *outFileName;
+ QFile potFile, nshFile;
+ QTextStream pot, nsh;
+ QTextCodec *codec = QTextCodec::codecForName("utf-8");
+ bool quiet = false;
+
+ /* Check for the correct number of input parameters. */
+ if (argc < 7 || argc > 10)
+ print_usage_and_exit();
+ for (int i = 1; i < argc; i++) {
+ QString arg(argv[i]);
+ if (!arg.compare("-q", Qt::CaseInsensitive)) {
+ quiet = true;
+ } else if (!arg.compare("-t", Qt::CaseInsensitive) && ++i < argc) {
+ /* Open the input PO template file */
+ potFile.setFileName(argv[i]);
+ if (!potFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ error << QString("Couldn't open '%1' for reading: ").arg(argv[i])
+ << potFile.errorString();
+ return 1;
+ }
+ pot.setDevice(&potFile);
+ } else if (!arg.compare("-i", Qt::CaseInsensitive) && ++i < argc) {
+ /* Open the input NSH file */
+ nshFile.setFileName(argv[i]);
+ if (!nshFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ error << QString("Couldn't open '%1' for reading: ").arg(argv[i])
+ << nshFile.errorString();
+ return 1;
+ }
+ nsh.setDevice(&nshFile);
+ } else if (!arg.compare("-o", Qt::CaseInsensitive) && ++i < argc) {
+ outFileName = argv[i];
+ } else if (!arg.compare("-c", Qt::CaseInsensitive) && ++i < argc) {
+ /* Set the text encoding used for input and output */
+ codec = QTextCodec::codecForName(argv[i]);
+ if (!codec) {
+ error << "Invalid text encoding specified.\n";
+ return 1;
+ }
+ } else
+ print_usage_and_exit();
+ }
+ pot.setCodec(codec);
+ nsh.setCodec(codec);
+
+ /* Parse the template for the source strings */
+ QHash<QString,QString> poTemplate;
+ if (!parse_po_template(&pot, &poTemplate, &errorMessage)) {
+ error << QString("Failed to parse PO template: %1\n").arg(errorMessage);
+ return 1;
+ }
+
+ /* Parse the nsh for the translated strings */
+ int n_strings = nsh2po(&nsh, QString(codec->name()), poTemplate,
+ &po, &errorMessage);
+ if (n_strings < 0) {
+ error << QString("Conversion failed: %1\n").arg(errorMessage);
+ return 2;
+ }
+
+ /* Write the formatted PO output */
+ if (!write_po_output(outFileName, po, codec, &errorMessage)) {
+ error << QString("Failed to write PO output: %1\n").arg(errorMessage);
+ return 3;
+ }
+
+ if (!quiet) {
+ QTextStream out(stdout);
+ out << QString("Wrote %1 strings to '%2'.\n").arg(n_strings)
+ .arg(outFileName);
+ }
+ return 0;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/nsh2po/nsh2po_config.h.in b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/nsh2po/nsh2po_config.h.in
new file mode 100644
index 0000000..2e3e68b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/nsh2po/nsh2po_config.h.in
@@ -0,0 +1,23 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#ifndef _NSH2PO_CONFIG_H
+#define _NSH2PO_CONFIG_H
+
+#define NSH2PO_VERSION "@VERSION@"
+
+#define NSH2PO_PROJECT_ID "@NSH2PO_PROJECT_ID@"
+
+#define NSH2PO_CONTACT_ADDR "@NSH2PO_CONTACT_ADDR@"
+
+#define NSH2PO_LANGUAGE_TEAM "@NSH2PO_LANGUAGE_TEAM@"
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2nsh/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2nsh/CMakeLists.txt
new file mode 100644
index 0000000..4d0f99b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2nsh/CMakeLists.txt
@@ -0,0 +1,29 @@
+##
+## $Id: CMakeLists.txt 3870 2009-06-17 18:11:27Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+## po2nsh source files
+set(po2nsh_SRCS
+ po2nsh.cpp
+)
+
+## Create the po2nsh executable
+add_executable(po2nsh ${po2nsh_SRCS})
+
+## Link the executable with the appropriate Qt libraries
+target_link_libraries(po2nsh
+ ${QT_QTCORE_LIBRARY}
+)
+
+## Remember the location of po2nsh so we can use it in custom commands
+get_target_property(PO2NSH_EXECUTABLE po2nsh LOCATION)
+set(VIDALIA_PO2NSH_EXECUTABLE ${PO2NSH_EXECUTABLE}
+ CACHE STRING "Location of Vidalia's po2nsh converter." FORCE)
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2nsh/po2nsh.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2nsh/po2nsh.cpp
new file mode 100644
index 0000000..979d00a
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2nsh/po2nsh.cpp
@@ -0,0 +1,257 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#include <QHash>
+#include <QFile>
+#include <QTextStream>
+#include <QTextCodec>
+#include <stdlib.h>
+
+
+/** Parse the context name from <b>str</b>, where the context name is of the
+ * form DQUOTE ContextName DQUOTE. */
+QString
+parse_message_context(const QString &str)
+{
+ QString out = str.trimmed();
+ out = out.replace("\"", "");
+ return out;
+}
+
+/** Parse the context name from <b>str</b>, where <b>str</b> is of the
+ * form ContextName#Number. This is the format used by translate-toolkit. */
+QString
+parse_message_context_lame(const QString &str)
+{
+ if (str.contains("#"))
+ return str.section("#", 0, 0);
+ return QString();
+}
+
+/** Parse the PO-formatted message string from <b>msg</b>. If <b>msg</b> is a
+ * multiline string, the extra double quotes will be replaced with newlines
+ * appropriately. */
+QString
+parse_message_string(const QString &msg)
+{
+ QString out = msg.trimmed();
+
+ out.replace("\"\n\"", "");
+ if (out.startsWith("\""))
+ out = out.remove(0, 1);
+ if (out.endsWith("\""))
+ out.chop(1);
+ out.replace("\\\"", "\"");
+ out.replace("\\n", "\\r\\n");
+ out.replace("$\\r\\n", "$\\r$\\n");
+ return out;
+}
+
+/** Read and return the next non-empty line from <b>stream</b>. */
+QString
+read_next_line(QTextStream *stream)
+{
+ stream->skipWhiteSpace();
+ return stream->readLine().append("\n");
+}
+
+/** Skip past the header portion of the PO file and any leading whitespace.
+ * The next line read from <b>po</b> will be the first non-header line in the
+ * document. */
+void
+skip_po_header(QTextStream *po)
+{
+ QString line;
+ /* Skip any leading whitespace before the header */
+ po->skipWhiteSpace();
+ /* Read to the first empty line */
+ line = po->readLine();
+ while (!po->atEnd() && !line.isEmpty())
+ line = po->readLine();
+}
+
+/** Convert <b>po</b> from the PO format to a NSIS-formatted .nsh document.
+ * <b>nsh</b> will be set to the resulting .nsh document. Return the number of
+ * converted strings on success, or -1 on error and <b>errorMessage</b> will
+ * be set. */
+int
+po2nsh(QTextStream *po, QString *nsh, const QString &language,
+ QString *errorMessage)
+{
+ QString line;
+ QString msgctxt, msgid, msgstr;
+ QHash<QString,QString> header;
+ QTextCodec *codec;
+ int n_strings = 0;
+
+ Q_ASSERT(po);
+ Q_ASSERT(nsh);
+ Q_ASSERT(errorMessage);
+
+ skip_po_header(po);
+ line = read_next_line(po);
+ while (!po->atEnd()) {
+ /* Ignore all "#" lines except "#:" */
+ while (line.startsWith("#")) {
+ if (line.startsWith("#:")) {
+ /* Context was specified with the stupid overloaded "#:" syntax.*/
+ msgctxt = line.section(" ", 1);
+ msgctxt = parse_message_context_lame(msgctxt);
+ }
+ line = read_next_line(po);
+ }
+
+ /* A context specified on a "msgctxt" line takes precedence over a context
+ * specified using the overload "#:" notation. */
+ if (line.startsWith("msgctxt ")) {
+ msgctxt = line.section(" ", 1);
+ msgctxt = parse_message_context(msgctxt);
+ line = read_next_line(po);
+ }
+
+ /* Parse the (possibly multiline) message source string */
+ if (!line.startsWith("msgid ")) {
+ *errorMessage = "expected 'msgid' line";
+ return -1;
+ }
+ msgid = line.section(" ", 1);
+
+ line = read_next_line(po);
+ while (line.startsWith("\"")) {
+ msgid.append(line);
+ line = read_next_line(po);
+ }
+ msgid = parse_message_string(msgid);
+
+ /* Parse the (possibly multiline) translated string */
+ if (!line.startsWith("msgstr ")) {
+ *errorMessage = "expected 'msgstr' line";
+ return -1;
+ }
+ msgstr = line.section(" ", 1);
+
+ line = read_next_line(po);
+ while (line.startsWith("\"")) {
+ msgstr.append(line);
+ line = read_next_line(po);
+ }
+ msgstr = parse_message_string(msgstr);
+
+ /* Add the message translation to the .nsh document */
+ nsh->append(QString("LangString "));
+ nsh->append(msgctxt);
+ nsh->append(QString(" ${LANG_%1} ").arg(language));
+ if (msgstr.isEmpty())
+ nsh->append("\"" + msgid + "\"");
+ else
+ nsh->append("\"" + msgstr + "\"");
+ nsh->append("\n");
+
+ n_strings++;
+ }
+ return n_strings;
+}
+
+/** Display application usage and exit. */
+void
+print_usage_and_exit()
+{
+ QTextStream error(stderr);
+ error << "usage: po2nsh [-q] -i <infile.po> -o <outfile.nsh> "
+ "-l <language> [-f <from-encoding>] [-t <to-encoding>]\n";
+ error << " -q (optional) Quiet mode (errors are still displayed)\n";
+ error << " -i <infile.po> Input .po file\n";
+ error << " -o <outfile.nsh> Output .nsh file\n";
+ error << " -l <language> NSIS language table name\n";
+ error << " -f <from-encoding> .po file encoding (default: utf-8)\n";
+ error << " -t <to-encoding> .nsh file encoding (default: iso-8859-1)\n";
+ error.flush();
+ exit(1);
+}
+
+int
+main(int argc, char *argv[])
+{
+ QTextStream error(stderr);
+ QString language, errorMessage;
+ char *infile, *outfile;
+ bool quiet = false;
+ QTextCodec *from_codec = QTextCodec::codecForName("utf-8");
+ QTextCodec *to_codec = QTextCodec::codecForName("iso-8859-1");
+
+ /* Check for the correct number of input parameters. */
+ if (argc < 7 || argc > 12)
+ print_usage_and_exit();
+ for (int i = 1; i < argc; i++) {
+ QString arg(argv[i]);
+ if (!arg.compare("-q", Qt::CaseInsensitive))
+ quiet = true;
+ else if (!arg.compare("-i", Qt::CaseInsensitive) && ++i < argc)
+ infile = argv[i];
+ else if (!arg.compare("-o", Qt::CaseInsensitive) && ++i < argc)
+ outfile = argv[i];
+ else if (!arg.compare("-l", Qt::CaseInsensitive) && ++i < argc)
+ language = QString(argv[i]).toUpper();
+ else if (!arg.compare("-f", Qt::CaseInsensitive) && ++i < argc) {
+ from_codec = QTextCodec::codecForName(argv[i]);
+ if (!from_codec) {
+ error << "Invalid input encoding: " << argv[i] << "\n";
+ return 1;
+ }
+ } else if (!arg.compare("-t", Qt::CaseInsensitive) && ++i < argc) {
+ to_codec = QTextCodec::codecForName(argv[i]);
+ if (!to_codec) {
+ error << "Invalid output encoding: " << argv[i] << "\n";
+ return 1;
+ }
+ } else
+ print_usage_and_exit();
+ }
+
+ /* Open the input PO file for reading. */
+ QFile poFile(infile);
+ if (!poFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ error << QString("Unable to open '%1' for reading: %2\n").arg(infile)
+ .arg(poFile.errorString());
+ return 2;
+ }
+
+ QString nsh;
+ QTextStream po(&poFile);
+ po.setCodec(from_codec);
+ int n_strings = po2nsh(&po, &nsh, language, &errorMessage);
+ if (n_strings < 0) {
+ error << QString("Unable to convert '%1': %2\n").arg(infile)
+ .arg(errorMessage);
+ return 3;
+ }
+
+ /* Open the NSH file for writing. */
+ QFile nshFile(outfile);
+ if (!nshFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+ error << QString("Unable to open '%1' for writing: %2\n").arg(outfile)
+ .arg(nshFile.errorString());
+ return 4;
+ }
+
+ /* Finally write the .nsh output. */
+ QTextStream out(&nshFile);
+ out.setCodec(to_codec);
+ out << nsh;
+
+ if (!quiet) {
+ QTextStream results(stdout);
+ results << QString("Converted %1 strings from %2 to %3.\n").arg(n_strings)
+ .arg(infile)
+ .arg(outfile);
+ }
+ return 0;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2ts/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2ts/CMakeLists.txt
new file mode 100644
index 0000000..45a9766
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2ts/CMakeLists.txt
@@ -0,0 +1,32 @@
+##
+## $Id: CMakeLists.txt 4030 2009-08-12 04:51:23Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+## po2ts source files
+set(po2ts_SRCS
+ po2ts.cpp
+)
+
+## Create the po2ts executable
+add_executable(po2ts ${po2ts_SRCS})
+
+## Link the executable with the appropriate Qt libraries
+target_link_libraries(po2ts
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTCORE_LIB_DEPENDENCIES}
+ ${QT_QTXML_LIBRARY}
+)
+
+## Remember the location of po2ts so we can use it in custom commands
+get_target_property(PO2TS_EXECUTABLE po2ts LOCATION)
+set(VIDALIA_PO2TS_EXECUTABLE ${PO2TS_EXECUTABLE}
+ CACHE STRING "Location of Vidalia's po2ts converter." FORCE)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2ts/po2ts.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2ts/po2ts.cpp
new file mode 100644
index 0000000..6d401eb
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2ts/po2ts.cpp
@@ -0,0 +1,316 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#include <QHash>
+#include <QFile>
+#include <QDomDocument>
+#include <QTextStream>
+#include <QTextCodec>
+#include <stdlib.h>
+
+#define TS_DOCTYPE "TS"
+#define TS_ELEMENT_ROOT "TS"
+#define TS_ELEMENT_CONTEXT "context"
+#define TS_ELEMENT_NAME "name"
+#define TS_ELEMENT_MESSAGE "message"
+#define TS_ELEMENT_SOURCE "source"
+#define TS_ELEMENT_TRANSLATION "translation"
+#define TS_ATTR_TRANSLATION_TYPE "type"
+#define TS_ATTR_VERSION "version"
+
+
+/** Create a new context element with the name <b>contextName</b>. */
+QDomElement
+new_context_element(QDomDocument *ts, const QString &contextName)
+{
+ QDomElement context, name;
+
+ /* Create a <name> element */
+ name = ts->createElement(TS_ELEMENT_NAME);
+ name.appendChild(ts->createTextNode(contextName));
+
+ /* Create a <context> element and add the <name> element as a child */
+ context = ts->createElement(TS_ELEMENT_CONTEXT);
+ context.appendChild(name);
+ return context;
+}
+
+/** Create a new message element using the source string <b>msgid</b> and the
+ * translation <b>msgstr</b>. */
+QDomElement
+new_message_element(QDomDocument *ts,
+ const QString &msgid, const QString &msgstr)
+{
+ QDomElement message, source, translation;
+
+ /* Create and set the <source> element */
+ source = ts->createElement(TS_ELEMENT_SOURCE);
+ source.appendChild(ts->createTextNode(msgid));
+
+ /* Create and set the <translation> element */
+ translation = ts->createElement(TS_ELEMENT_TRANSLATION);
+ if (!msgstr.isEmpty())
+ translation.appendChild(ts->createTextNode(msgstr));
+ else
+ translation.setAttribute(TS_ATTR_TRANSLATION_TYPE, "unfinished");
+
+ /* Create a <message> element and add the <source> and <translation>
+ * elements as children */
+ message = ts->createElement(TS_ELEMENT_MESSAGE);
+ message.appendChild(source);
+ message.appendChild(translation);
+
+ return message;
+}
+
+/** Create a new TS document of the appropriate doctype and with a TS root
+ * element. */
+QDomDocument
+new_ts_document()
+{
+ QDomDocument ts(TS_DOCTYPE);
+
+ QDomElement root = ts.createElement(TS_ELEMENT_ROOT);
+ root.setAttribute(TS_ATTR_VERSION, "1.1");
+ ts.appendChild(root);
+
+ return ts;
+}
+
+/** Parse the context name from <b>str</b>, where the context name is of the
+ * form DQUOTE ContextName DQUOTE. */
+QString
+parse_message_context(const QString &str)
+{
+ QString out = str.trimmed();
+ out = out.replace("\"", "");
+ return out;
+}
+
+/** Parse the context name from <b>str</b>, where <b>str</b> is of the
+ * form ContextName#Number. This is the format used by translate-toolkit. */
+QString
+parse_message_context_lame(const QString &str)
+{
+ if (str.contains("#"))
+ return str.section("#", 0, 0);
+ return QString();
+}
+
+/** Parse the PO-formatted message string from <b>msg</b>. If <b>msg</b> is a
+ * multiline string, the extra double quotes will be replaced with newlines
+ * appropriately. */
+QString
+parse_message_string(const QString &msg)
+{
+ QString out = msg.trimmed();
+
+ out.replace("\"\n\"", "");
+ if (out.startsWith("\""))
+ out = out.remove(0, 1);
+ if (out.endsWith("\""))
+ out.chop(1);
+ out.replace("\\\"", "\"");
+ return out;
+}
+
+/** Read and return the next non-empty line from <b>stream</b>. */
+QString
+read_next_line(QTextStream *stream)
+{
+ stream->skipWhiteSpace();
+ return stream->readLine().append("\n");
+}
+
+/** Skip past the header portion of the PO file and any leading whitespace.
+ * The next line read from <b>po</b> will be the first non-header line in the
+ * document. */
+void
+skip_po_header(QTextStream *po)
+{
+ QString line;
+ /* Skip any leading whitespace before the header */
+ po->skipWhiteSpace();
+ /* Read to the first empty line */
+ line = po->readLine();
+ while (!po->atEnd() && !line.isEmpty())
+ line = po->readLine();
+}
+
+/** Convert <b>po</b> from the PO format to a TS-formatted XML document.
+ * <b>ts</b> will be set to the resulting TS document. Return the number of
+ * converted strings on success, or -1 on error and <b>errorMessage</b> will
+ * be set. */
+int
+po2ts(QTextStream *po, QDomDocument *ts, QString *errorMessage)
+{
+ QString line;
+ QString msgctxt, msgid, msgstr;
+ QHash<QString,QDomElement> contextElements;
+ QDomElement contextElement, msgElement, transElement;
+ int n_strings = 0;
+
+ Q_ASSERT(po);
+ Q_ASSERT(ts);
+ Q_ASSERT(errorMessage);
+
+ *ts = new_ts_document();
+
+ skip_po_header(po);
+ line = read_next_line(po);
+ while (!po->atEnd()) {
+ /* Ignore all "#" lines except "#:" */
+ while (line.startsWith("#")) {
+ if (line.startsWith("#:")) {
+ /* Context was specified with the stupid overloaded "#:" syntax.*/
+ msgctxt = line.section(" ", 1);
+ msgctxt = parse_message_context_lame(msgctxt);
+ }
+ line = read_next_line(po);
+ }
+
+ /* A context specified on a "msgctxt" line takes precedence over a context
+ * specified using the overload "#:" notation. */
+ if (line.startsWith("msgctxt ")) {
+ msgctxt = line.section(" ", 1);
+ msgctxt = parse_message_context(msgctxt);
+ line = read_next_line(po);
+ }
+
+ /* Parse the (possibly multiline) message source string */
+ if (!line.startsWith("msgid ")) {
+ *errorMessage = "expected 'msgid' line";
+ return -1;
+ }
+ msgid = line.section(" ", 1);
+
+ line = read_next_line(po);
+ while (line.startsWith("\"")) {
+ msgid.append(line);
+ line = read_next_line(po);
+ }
+ msgid = parse_message_string(msgid);
+
+ /* Parse the (possibly multiline) translated string */
+ if (!line.startsWith("msgstr ")) {
+ *errorMessage = "expected 'msgstr' line";
+ return -1;
+ }
+ msgstr = line.section(" ", 1);
+
+ line = read_next_line(po);
+ while (line.startsWith("\"")) {
+ msgstr.append(line);
+ line = read_next_line(po);
+ }
+ msgstr = parse_message_string(msgstr);
+
+ /* Add the message and translation to the .ts document */
+ if (contextElements.contains(msgctxt)) {
+ contextElement = contextElements.value(msgctxt);
+ } else {
+ contextElement = new_context_element(ts, msgctxt);
+ ts->documentElement().appendChild(contextElement);
+ contextElements.insert(msgctxt, contextElement);
+ }
+ contextElement.appendChild(new_message_element(ts, msgid, msgstr));
+
+ n_strings++;
+ }
+ return n_strings;
+}
+
+/** Display application usage and exit. */
+void
+print_usage_and_exit()
+{
+ QTextStream error(stderr);
+ error << "usage: po2ts [-q] -i <infile.po> -o <outfile.ts> "
+ "[-c <encoding>]\n";
+ error << " -q (optional) Quiet mode (errors are still displayed)\n";
+ error << " -i <infile.po> Input .po file\n";
+ error << " -o <outfile.ts> Output .ts file\n";
+ error << " -c <encoding> Text encoding (default: utf-8)\n";
+ error.flush();
+ exit(1);
+}
+
+int
+main(int argc, char *argv[])
+{
+ QTextStream error(stderr);
+ QString errorMessage;
+ char *infile, *outfile;
+ QTextCodec *codec = QTextCodec::codecForName("utf-8");
+ bool quiet = false;
+
+ /* Check for the correct number of input parameters. */
+ if (argc < 5 || argc > 8)
+ print_usage_and_exit();
+ for (int i = 1; i < argc; i++) {
+ QString arg(argv[i]);
+ if (!arg.compare("-q", Qt::CaseInsensitive))
+ quiet = true;
+ else if (!arg.compare("-i", Qt::CaseInsensitive) && ++i < argc)
+ infile = argv[i];
+ else if (!arg.compare("-o", Qt::CaseInsensitive) && ++i < argc)
+ outfile = argv[i];
+ else if (!arg.compare("-c", Qt::CaseInsensitive) && ++i < argc) {
+ codec = QTextCodec::codecForName(argv[i]);
+ if (!codec) {
+ error << "Invalid text encoding specified\n";
+ return 1;
+ }
+ } else
+ print_usage_and_exit();
+ }
+
+ /* Open the input PO file for reading. */
+ QFile poFile(infile);
+ if (!poFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ error << QString("Unable to open '%1' for reading: %2\n").arg(infile)
+ .arg(poFile.errorString());
+ return 2;
+ }
+
+ QDomDocument ts;
+ QTextStream po(&poFile);
+ po.setCodec(codec);
+ int n_strings = po2ts(&po, &ts, &errorMessage);
+ if (n_strings < 0) {
+ error << QString("Unable to convert '%1': %2\n").arg(infile)
+ .arg(errorMessage);
+ return 3;
+ }
+
+ /* Open the TS file for writing. */
+ QFile tsFile(outfile);
+ if (!tsFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+ error << QString("Unable to open '%1' for writing: %2\n").arg(outfile)
+ .arg(tsFile.errorString());
+ return 4;
+ }
+
+ /* Write the .ts output. */
+ QTextStream out(&tsFile);
+ out.setCodec(codec);
+ out << QString("<?xml version=\"1.0\" encoding=\"%1\"?>\n")
+ .arg(QString(codec->name()));
+ out << ts.toString(4);
+
+ if (!quiet) {
+ QTextStream results(stdout);
+ results << QString("Converted %1 strings from %2 to %3.\n").arg(n_strings)
+ .arg(infile)
+ .arg(outfile);
+ }
+ return 0;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2wxl/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2wxl/CMakeLists.txt
new file mode 100644
index 0000000..f2a85f8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2wxl/CMakeLists.txt
@@ -0,0 +1,31 @@
+##
+## $Id: CMakeLists.txt 3840 2009-06-11 17:57:53Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+## po2wxl source files
+set(po2wxl_SRCS
+ po2wxl.cpp
+)
+
+## Create the po2wxl executable
+add_executable(po2wxl ${po2wxl_SRCS})
+
+## Link the executable with the appropriate Qt libraries
+target_link_libraries(po2wxl
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTXML_LIBRARY}
+)
+
+## Remember the location of po2wxl so we can use it in custom commands
+get_target_property(PO2WXL_EXECUTABLE po2wxl LOCATION)
+set(VIDALIA_PO2WXL_EXECUTABLE ${PO2WXL_EXECUTABLE}
+ CACHE STRING "Location of Vidalia's po2wxl converter." FORCE)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2wxl/po2wxl.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2wxl/po2wxl.cpp
new file mode 100644
index 0000000..33a23a6
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/po2wxl/po2wxl.cpp
@@ -0,0 +1,343 @@
+/*
+** $Id: po2wxl.cpp 3679 2009-04-08 05:04:15Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#include <QFile>
+#include <QDomDocument>
+#include <QTextStream>
+#include <QTextCodec>
+#include <stdlib.h>
+
+#define WXL_NAMESPACE "http://schemas.microsoft.com/wix/2006/localization"
+#define WXL_ELEMENT_ROOT "WixLocalization"
+#define WXL_ELEMENT_MESSAGE "String"
+#define WXL_ATTR_MESSAGE_ID "Id"
+#define WXL_ATTR_LANGUAGE "LCID"
+#define WXL_ATTR_TRANSLATION_TYPE "Culture"
+#define WXL_ATTR_OVERRIDABLE "Overridable"
+
+/** We need to provide an element with the LCID for this locale
+ * that is used in the WiX Product definition. */
+QString
+culture_lcid(const QString &culture)
+{
+ /* For now character encoding focused, not generally locale / dialect aware. */
+ QString lcid = "0";
+ if(!culture.compare("en", Qt::CaseInsensitive))
+ lcid = "1033";
+ else if(!culture.compare("cs", Qt::CaseInsensitive))
+ lcid = "1029";
+ else if(!culture.compare("de", Qt::CaseInsensitive))
+ lcid = "1031";
+ else if(!culture.compare("es", Qt::CaseInsensitive))
+ lcid = "1034";
+ else if(!culture.compare("fa", Qt::CaseInsensitive))
+ lcid = "1065";
+ else if(!culture.compare("fi", Qt::CaseInsensitive))
+ lcid = "1035";
+ else if(!culture.compare("fr", Qt::CaseInsensitive))
+ lcid = "1036";
+ else if(!culture.compare("he", Qt::CaseInsensitive))
+ lcid = "1037";
+ else if(!culture.compare("it", Qt::CaseInsensitive))
+ lcid = "1040";
+ else if(!culture.compare("nl", Qt::CaseInsensitive))
+ lcid = "1043";
+ else if(!culture.compare("pl", Qt::CaseInsensitive))
+ lcid = "1045";
+ else if(!culture.compare("pt", Qt::CaseInsensitive))
+ lcid = "1046";
+ else if(!culture.compare("ro", Qt::CaseInsensitive))
+ lcid = "1048";
+ else if(!culture.compare("ru", Qt::CaseInsensitive))
+ lcid = "1049";
+ else if(!culture.compare("sv", Qt::CaseInsensitive))
+ lcid = "1053";
+ return lcid;
+}
+
+/** Create a new message string element using the source string <b>msgid</b>
+ * and the translation <b>msgstr</b> and assign identifier attribute. */
+QDomElement
+new_message_element(QDomDocument *wxl, const QString &strid,
+ const QString &msgid, const QString &msgstr)
+{
+ QDomElement message;
+
+ message = wxl->createElement(WXL_ELEMENT_MESSAGE);
+ message.setAttribute(WXL_ATTR_MESSAGE_ID, strid);
+
+ /* Always allow localized string to be dynamic. This is required for
+ * multi-language packages to link correctly.
+ */
+ message.setAttribute(WXL_ATTR_OVERRIDABLE, "yes");
+ if (!msgstr.isEmpty())
+ message.appendChild(wxl->createTextNode(msgstr));
+ else
+ message.appendChild(wxl->createTextNode(msgid));
+
+ return message;
+}
+
+/** Create a new WXL document of the appropriate doctype and root
+ * element with the Microsoft style culture name for locale. */
+QDomDocument
+new_wxl_document(const QString &culture)
+{
+ QDomDocument wxl;
+
+ QDomElement root = wxl.createElementNS(WXL_NAMESPACE, WXL_ELEMENT_ROOT);
+ root.setAttribute(WXL_ATTR_TRANSLATION_TYPE, culture);
+ wxl.appendChild(root);
+
+ return wxl;
+}
+
+/** Parse the context name from <b>str</b>, where the context name is of the
+ * form DQUOTE ContextName DQUOTE. */
+QString
+parse_message_context(const QString &str)
+{
+ QString out = str.trimmed();
+ out = out.replace("\"", "");
+ return out;
+}
+
+/** Parse the context name from <b>str</b>, where <b>str</b> is of the
+ * form ContextName#Number. This is the format used by translate-toolkit. */
+QString
+parse_message_context_lame(const QString &str)
+{
+ if (str.contains("#"))
+ return str.section("#", 0, 0);
+ return QString();
+}
+
+/** Parse the PO-formatted message string from <b>msg</b>. If <b>msg</b> is a
+ * multiline string, the extra double quotes will be replaced with newlines
+ * appropriately. */
+QString
+parse_message_string(const QString &msg)
+{
+ QString out = msg.trimmed();
+
+ out.replace("\"\n\"", "\n");
+ if (out.startsWith("\""))
+ out = out.remove(0, 1);
+ if (out.endsWith("\""))
+ out.chop(1);
+ out.replace("\\\"", "\"");
+
+ /* convert NSIS style vars to Properties; avoid QRegExp if possible. */
+ int lind, rind;
+ while ( ((lind = out.indexOf("${")) >= 0) &&
+ ((rind = out.indexOf("}", lind)) > lind) ) {
+ out.replace(lind, 2, "[");
+ out.replace(--rind, 1, "]");
+ }
+ return out;
+}
+
+/** Read and return the next non-empty line from <b>stream</b>. */
+QString
+read_next_line(QTextStream *stream)
+{
+ stream->skipWhiteSpace();
+ return stream->readLine().append("\n");
+}
+
+/** Skip past the header portion of the PO file and any leading whitespace.
+ * The next line read from <b>po</b> will be the first non-header line in the
+ * document. */
+void
+skip_po_header(QTextStream *po)
+{
+ QString line;
+ /* Skip any leading whitespace before the header */
+ po->skipWhiteSpace();
+ /* Read to the first empty line */
+ line = po->readLine();
+ while (!po->atEnd() && !line.isEmpty())
+ line = po->readLine();
+}
+
+/** Convert <b>po</b> from the PO format to a WXL-formatted XML document.
+ * <b>wxl</b> will be set to the resulting WXL document. Return the number of
+ * converted strings on success, or -1 on error and <b>errorMessage</b> will
+ * be set. */
+int
+po2wxl(const QString& culture, QTextStream *po, QDomDocument *wxl,
+ QString *errorMessage)
+{
+ QString line;
+ QString msgctxt, msgid, msgstr;
+ QDomElement msgElement;
+ int n_strings = 0;
+
+ Q_ASSERT(po);
+ Q_ASSERT(wxl);
+ Q_ASSERT(errorMessage);
+
+ *wxl = new_wxl_document(culture);
+
+ /* Set the LCID to Language code for use as !(loc.LCID) in Product. */
+ QString lcid = culture_lcid(culture);
+ wxl->documentElement().appendChild(
+ new_message_element(wxl, WXL_ATTR_LANGUAGE, lcid, lcid));
+
+ skip_po_header(po);
+ line = read_next_line(po);
+ while (!po->atEnd()) {
+ /* Ignore all "#" lines except "#:" */
+ while (line.startsWith("#")) {
+ if (line.startsWith("#:")) {
+ /* Context was specified with the stupid overloaded "#:" syntax.*/
+ msgctxt = line.section(" ", 1);
+ msgctxt = parse_message_context_lame(msgctxt);
+ }
+ line = read_next_line(po);
+ }
+
+ /* A context specified on a "msgctxt" line takes precedence over a context
+ * specified using the overload "#:" notation. */
+ if (line.startsWith("msgctxt ")) {
+ msgctxt = line.section(" ", 1);
+ msgctxt = parse_message_context(msgctxt);
+ line = read_next_line(po);
+ }
+
+ /* Parse the (possibly multiline) message source string */
+ if (!line.startsWith("msgid ")) {
+ *errorMessage = "expected 'msgid' line";
+ return -1;
+ }
+ msgid = line.section(" ", 1);
+
+ line = read_next_line(po);
+ while (line.startsWith("\"")) {
+ msgid.append(line);
+ line = read_next_line(po);
+ }
+ msgid = parse_message_string(msgid);
+
+ /* Parse the (possibly multiline) translated string */
+ if (!line.startsWith("msgstr ")) {
+ *errorMessage = "expected 'msgstr' line";
+ return -1;
+ }
+ msgstr = line.section(" ", 1);
+
+ line = read_next_line(po);
+ while (line.startsWith("\"")) {
+ msgstr.append(line);
+ line = read_next_line(po);
+ }
+ msgstr = parse_message_string(msgstr);
+
+ /* Add the message and translation to the .wxl document */
+ wxl->documentElement().appendChild(
+ new_message_element(wxl, msgctxt, msgid, msgstr));
+
+ n_strings++;
+ }
+ return n_strings;
+}
+
+/** Display application usage and exit. */
+void
+print_usage_and_exit()
+{
+ QTextStream error(stderr);
+ error << "usage: po2wxl [-q] -n <culture name> -i <infile.po> -o <outfile.wxl> "
+ "[-c <encoding>]\n";
+ error << " -q (optional) Quiet mode (errors are still displayed)\n";
+ error << " -n <culture> Culture name for translation\n";
+ error << " -i <infile.po> Input .po file\n";
+ error << " -o <outfile.wxl> Output .wxl file\n";
+ error << " -c <encoding> Text encoding (default: utf-8)\n";
+ error.flush();
+ exit(1);
+}
+
+int
+main(int argc, char *argv[])
+{
+ QTextStream error(stderr);
+ QString culture, errorMessage;
+ char *infile, *outfile;
+ QTextCodec *codec = QTextCodec::codecForName("utf-8");
+ bool quiet = false;
+
+ /* Check for the correct number of input parameters. */
+ if (argc < 5 || argc > 9)
+ print_usage_and_exit();
+ for (int i = 1; i < argc; i++) {
+ QString arg(argv[i]);
+ if (!arg.compare("-q", Qt::CaseInsensitive))
+ quiet = true;
+ else if (!arg.compare("-n", Qt::CaseInsensitive) && ++i < argc)
+ culture = argv[i];
+ else if (!arg.compare("-i", Qt::CaseInsensitive) && ++i < argc)
+ infile = argv[i];
+ else if (!arg.compare("-o", Qt::CaseInsensitive) && ++i < argc)
+ outfile = argv[i];
+ else if (!arg.compare("-c", Qt::CaseInsensitive) && ++i < argc) {
+ codec = QTextCodec::codecForName(argv[i]);
+ if (!codec) {
+ error << "Invalid text encoding specified\n";
+ return 1;
+ }
+ } else
+ print_usage_and_exit();
+ }
+
+ /* Open the input PO file for reading. */
+ QFile poFile(infile);
+ if (!poFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ error << QString("Unable to open '%1' for reading: %2\n").arg(infile)
+ .arg(poFile.errorString());
+ return 2;
+ }
+
+ QDomDocument wxl;
+ QTextStream po(&poFile);
+ po.setCodec(codec);
+ int n_strings = po2wxl(culture, &po, &wxl, &errorMessage);
+ if (n_strings < 0) {
+ error << QString("Unable to convert '%1': %2\n").arg(infile)
+ .arg(errorMessage);
+ return 3;
+ }
+
+ /* Open the WXL file for writing. */
+ QFile wxlFile(outfile);
+ if (!wxlFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+ error << QString("Unable to open '%1' for writing: %2\n").arg(outfile)
+ .arg(wxlFile.errorString());
+ return 4;
+ }
+
+ /* Write the .wxl output. */
+ QTextStream out(&wxlFile);
+ out.setCodec(codec);
+ out << QString("<?xml version=\"1.0\" encoding=\"%1\"?>\n")
+ .arg(QString(codec->name()));
+ out << wxl.toString(4);
+
+ if (!quiet) {
+ QTextStream results(stdout);
+ results << QString("Converted %1 strings from %2 to %3.\n").arg(n_strings)
+ .arg(infile)
+ .arg(outfile);
+ }
+ return 0;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/ts2po/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/ts2po/CMakeLists.txt
new file mode 100644
index 0000000..705625a
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/ts2po/CMakeLists.txt
@@ -0,0 +1,53 @@
+##
+## $Id: CMakeLists.txt 4030 2009-08-12 04:51:23Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+## Define this version of ts2po
+set(VERSION "0.2")
+
+## Include the source and binary directories so it can find out configured
+## header file
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+## ts2po source files
+set(ts2po_SRCS
+ ts2po.cpp
+)
+
+## Set some of the properties used in the .po header
+set(TS2PO_PROJECT_ID "Vidalia")
+set(TS2PO_CONTACT_ADDR "translations at vidalia-project.net")
+set(TS2PO_LANGUAGE_TEAM "translations at vidalia-project.net")
+
+## Create and populate config.h
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/ts2po_config.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/ts2po_config.h
+)
+
+## Create the ts2po executable
+add_executable(ts2po ${ts2po_SRCS})
+
+## Link the executable with the appropriate Qt libraries
+target_link_libraries(ts2po
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTCORE_LIB_DEPENDENCIES}
+ ${QT_QTXML_LIBRARY}
+)
+
+## Remember the location of ts2po so we can use it in custom commands
+get_target_property(TS2PO_EXECUTABLE ts2po LOCATION)
+set(VIDALIA_TS2PO_EXECUTABLE ${TS2PO_EXECUTABLE}
+ CACHE STRING "Location of Vidalia's ts2po converter." FORCE)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/ts2po/ts2po.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/ts2po/ts2po.cpp
new file mode 100644
index 0000000..f225dac
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/ts2po/ts2po.cpp
@@ -0,0 +1,270 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#include <QFile>
+#include <QFileInfo>
+#include <QDomDocument>
+#include <QTextStream>
+#include <QTextCodec>
+#include <QDateTime>
+#include <stdlib.h>
+
+#include "ts2po_config.h"
+
+#define TS_DOCTYPE "TS"
+#define TS_ELEMENT_CONTEXT "context"
+#define TS_ELEMENT_NAME "name"
+#define TS_ELEMENT_MESSAGE "message"
+#define TS_ELEMENT_SOURCE "source"
+#define TS_ELEMENT_TRANSLATION "translation"
+#define TS_ELEMENT_LOCATION "location"
+#define TS_ATTR_FILENAME "filename"
+#define TS_ATTR_LINE "line"
+
+
+/** Return the current time (in UTC) in the format YYYY-MM-DD HH:MM+0000. */
+QString
+create_po_timestamp()
+{
+ QDateTime now = QDateTime::currentDateTime().toUTC();
+ return now.toString("yyyy-MM-dd hh:mm+0000");
+}
+
+/** Return a header to be placed at the top of the .po file. The header will
+ * include <b>encoding</b> in the Content-Type header line. */
+QString
+create_po_header(const QString &encoding)
+{
+ QString header;
+ QString tstamp = create_po_timestamp();
+
+ header.append("msgid \"\"\n");
+ header.append("msgstr \"\"\n");
+ header.append("\"Project-Id-Version: "TS2PO_PROJECT_ID"\\n\"\n");
+ header.append("\"Report-Msgid-Bugs-To: "TS2PO_CONTACT_ADDR"\\n\"\n");
+ header.append(QString("\"POT-Creation-Date: %1\\n\"\n").arg(tstamp));
+ header.append("\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n");
+ header.append("\"Last-Translator: \\n\"\n");
+ header.append("\"Language-Team: "TS2PO_LANGUAGE_TEAM"\\n\"\n");
+ header.append("\"MIME-Version: 1.0\\n\"\n");
+ header.append("\"Content-Type: text/plain; ");
+ header.append(QString("charset=%1\\n\"\n").arg(encoding));
+ header.append("\"Content-Transfer-Encoding: 8bit\\n\"\n");
+ header.append("\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n\"\n");
+ header.append("\"X-Generator: Vidalia ts2po "TS2PO_VERSION"\\n\"\n");
+ header.append("\n");
+
+ return header;
+}
+
+/** Parse the filename from the relative or absolute path given in
+ * <b>filePath</b>. */
+QString
+parse_filename(const QString &filePath)
+{
+ QFileInfo file(filePath);
+ return file.fileName();
+}
+
+/** Convert the messages in <b>context</b> to PO format. The output will be
+ * appended to <b>po</b>. Returns the number of source messages converted on
+ * success, or -1 on error and <b>errorMessage</b> will be set. */
+int
+convert_context(const QDomElement &context, QString *po, QString *errorMessage)
+{
+ QString msgctxt, msgid, msgstr;
+ QString filename, line;
+ QDomElement location, source, translation;
+ int n = 0;
+
+ Q_ASSERT(po);
+ Q_ASSERT(errorMessage);
+
+ QDomElement name = context.firstChildElement(TS_ELEMENT_NAME);
+ if (name.isNull()) {
+ *errorMessage = QString("context element with no name (line %1)")
+ .arg(context.lineNumber());
+ return -1;
+ }
+ msgctxt = name.text();
+
+ QDomElement msg = context.firstChildElement(TS_ELEMENT_MESSAGE);
+ while (!msg.isNull()) {
+ /* Extract the <source> tags */
+ source = msg.firstChildElement(TS_ELEMENT_SOURCE);
+ if (source.isNull()) {
+ *errorMessage = QString("message element with no source string "
+ "(line %1)").arg(msg.lineNumber());
+ return -1;
+ }
+ msgid = source.text().trimmed();
+ msgid.replace("\r", "");
+ msgid.replace("\"", "\\\"");
+ msgid.replace("\n", "\\n\"\n\"");
+
+ /* Extract the <translation> tags */
+ translation = msg.firstChildElement(TS_ELEMENT_TRANSLATION);
+ msgstr = translation.text().trimmed();
+ msgstr.replace("\r", "");
+ msgstr.replace("\"", "\\\"");
+ msgstr.replace("\n", "\\n\"\n\"");
+
+ /* Try to extract the <location> tags (optional) */
+ location = msg.firstChildElement(TS_ELEMENT_LOCATION);
+ filename = parse_filename(location.attribute(TS_ATTR_FILENAME));
+ line = location.attribute(TS_ATTR_LINE);
+
+ /* Format the .po entry for this string */
+ if (!filename.isEmpty() && !line.isEmpty())
+ (*po).append(QString("#: %1:%2\n").arg(filename).arg(line));
+ (*po).append(QString("msgctxt \"%1\"\n").arg(msgctxt));
+ (*po).append(QString("msgid \"%1\"\n").arg(msgid));
+ (*po).append(QString("msgstr \"%1\"\n").arg(msgstr));
+ (*po).append("\n");
+
+ /* Find the next source message in the current context */
+ msg = msg.nextSiblingElement(TS_ELEMENT_MESSAGE);
+ n++;
+ }
+ return n;
+}
+
+/** Convert the TS-formatted document in <b>ts</b> to a PO-formatted document.
+ * The output will be written to <b>po</b>, including a file header that
+ * specifies <b>encoding</b> as the character set. Returns the number of strings
+ * converted on success, or -1 on error and <b>errorMessage</b> will be set. */
+int
+ts2po(const QDomDocument *ts, QString *po, const QString &encoding,
+ QString *errorMessage)
+{
+ int n_strings = 0;
+ QString context;
+
+ Q_ASSERT(ts);
+ Q_ASSERT(po);
+ Q_ASSERT(errorMessage);
+
+ /* Get the document root and check that it's valid */
+ QDomElement root = ts->documentElement();
+ if (root.tagName() != TS_DOCTYPE)
+ return -1;
+
+ /* Start with the PO header */
+ *po = create_po_header(encoding);
+
+ /* Iterate through all of the translation contexts and build up the PO file
+ * output. */
+ QDomElement child = root.firstChildElement(TS_ELEMENT_CONTEXT);
+ while (!child.isNull()) {
+ QString context;
+
+ /* Convert the current .ts context to .po */
+ int n = convert_context(child, &context, errorMessage);
+ if (n < 0)
+ return -1;
+
+ /* Add it to the output file */
+ (*po).append(context);
+ n_strings += n;
+
+ /* Move to the next context */
+ child = child.nextSiblingElement(TS_ELEMENT_CONTEXT);
+ }
+ return n_strings;
+}
+
+/** Display application usage and exit. */
+void
+print_usage_and_exit()
+{
+ QTextStream error(stderr);
+ error << "usage: ts2po [-q] -i <infile.ts> -o <outfile.po> "
+ "[-c <encoding>]\n";
+ error << " -q (optional) Quiet mode (errors are still displayed)\n";
+ error << " -i <infile.ts> Input .ts file\n";
+ error << " -o <outfile.po> Output .po file\n";
+ error << " -c <encoding> Text encoding (default: utf-8)\n";
+ error.flush();
+ exit(1);
+}
+
+int
+main(int argc, char *argv[])
+{
+ QTextStream error(stderr);
+ QString errorMessage;
+ char *infile, *outfile;
+ QTextCodec *codec = QTextCodec::codecForName("utf-8");
+ bool quiet = false;
+
+ /* Check for the correct number of input parameters. */
+ if (argc < 5 || argc > 8)
+ print_usage_and_exit();
+ for (int i = 1; i < argc; i++) {
+ QString arg(argv[i]);
+ if (!arg.compare("-q", Qt::CaseInsensitive))
+ quiet = true;
+ else if (!arg.compare("-i", Qt::CaseInsensitive) && ++i < argc)
+ infile = argv[i];
+ else if (!arg.compare("-o", Qt::CaseInsensitive) && ++i < argc)
+ outfile = argv[i];
+ else if (!arg.compare("-c", Qt::CaseInsensitive) && ++i < argc) {
+ codec = QTextCodec::codecForName(argv[i]);
+ if (!codec) {
+ error << "Invalid text encoding specified.\n";
+ return 1;
+ }
+ } else
+ print_usage_and_exit();
+ }
+
+ /* Read and parse the input .ts file. */
+ QDomDocument ts;
+ QFile tsFile(infile);
+ if (!ts.setContent(&tsFile, true, &errorMessage)) {
+ error << QString("Unable to parse '%1': %2\n").arg(infile)
+ .arg(errorMessage);
+ return 1;
+ }
+
+ /* Try to open the output .po file for writing. */
+ QFile poFile(outfile);
+ if (!poFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+ error << QString("Unable to open '%1' for writing: %2\n")
+ .arg(outfile)
+ .arg(tsFile.errorString());
+ return 2;
+ }
+
+ /* Convert the input .ts file to a .po formatted file. */
+ QString po;
+ int n_strings = ts2po(&ts, &po, QString(codec->name()), &errorMessage);
+ if (n_strings < 0) {
+ error << QString("Unable to convert '%1' to '%2': %3\n").arg(infile)
+ .arg(outfile)
+ .arg(errorMessage);
+ return 3;
+ }
+
+ /* Write the .po output. */
+ QTextStream out(&poFile);
+ out.setCodec(codec);
+ out << po;
+ poFile.close();
+
+ if (!quiet) {
+ QTextStream results(stdout);
+ results << QString("Converted %1 strings from %2 to %3.\n").arg(n_strings)
+ .arg(infile)
+ .arg(outfile);
+ }
+ return 0;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/ts2po/ts2po_config.h.in b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/ts2po/ts2po_config.h.in
new file mode 100644
index 0000000..55f8828
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/ts2po/ts2po_config.h.in
@@ -0,0 +1,23 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#ifndef _TS2PO_CONFIG_H
+#define _TS2PO_CONFIG_H
+
+#define TS2PO_VERSION "@VERSION@"
+
+#define TS2PO_PROJECT_ID "@TS2PO_PROJECT_ID@"
+
+#define TS2PO_CONTACT_ADDR "@TS2PO_CONTACT_ADDR@"
+
+#define TS2PO_LANGUAGE_TEAM "@TS2PO_LANGUAGE_TEAM@"
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/wixtool/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/wixtool/CMakeLists.txt
new file mode 100644
index 0000000..759e86c
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/wixtool/CMakeLists.txt
@@ -0,0 +1,27 @@
+##
+## $Id: CMakeLists.txt 3840 2009-06-11 17:57:53Z edmanm $
+##
+## Copyright (C) 2009 The Tor Project, Inc.
+## See LICENSE file for terms; may be used according
+## Vidalia or Tor license constraints. (dual license)
+##
+
+## wixtool source files
+set(wixtool_SRCS
+ wixtool.cpp
+)
+
+## Create the wixtool executable
+add_executable(wixtool ${wixtool_SRCS})
+
+## Link the executable with the appropriate Qt libraries
+target_link_libraries(wixtool
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTXML_LIBRARY}
+)
+
+## Remember location so we can use it in custom commands
+get_target_property(WIXTOOL_EXECUTABLE wixtool LOCATION)
+set(VIDALIA_WIXTOOL_EXECUTABLE ${WIXTOOL_EXECUTABLE}
+ CACHE STRING "Location of Vidalia's wixtool program." FORCE)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/wixtool/wixtool.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/wixtool/wixtool.cpp
new file mode 100644
index 0000000..deec9ba
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/tools/wixtool/wixtool.cpp
@@ -0,0 +1,710 @@
+/*
+** $Id: wixtool.cpp 3810 2009-06-01 07:00:35Z edmanm $
+**
+** Copyright (C) 2009 The Tor Project, Inc.
+** See LICENSE file for terms; may be used according
+** Vidalia or Tor license constraints. (dual license)
+*/
+
+#include <QFile>
+#include <QDomDocument>
+#include <QTextStream>
+#include <QTextCodec>
+#include <QStringList>
+#include <stdlib.h>
+
+#define WIX_ATTR_ID "Id"
+#define WIX_ATTR_DIRACTION "uninstall"
+#define WIX_ATTR_REGACTION "createAndRemoveOnUninstall"
+#define WIX_ATTR_VALUE "Value"
+#define WIX_ATTR_KEY "KeyPath"
+#define WIX_ATTR_GUID "Guid"
+#define WIX_ATTR_NAME "Name"
+#define WIX_ATTR_REG_TYPE "Type"
+#define WIX_ATTR_REG_NAME "Name"
+#define WIX_ATTR_REG_ROOT "Root"
+#define WIX_ATTR_REG_KEYPATH "Key"
+#define WIX_ATTR_REG_ACTION "Action"
+#define WIX_REG_KEY_TYPE "integer"
+#define WIX_TAG_FILE "File"
+#define WIX_TAG_DIR "Directory"
+#define WIX_TAG_FEATURE "Feature"
+#define WIX_TAG_COMPONENT "Component"
+#define WIX_TAG_COMPONENT_REF "ComponentRef"
+#define WIX_TAG_CREATEDIR "CreateFolder"
+#define WIX_TAG_REMOVEDIR "RemoveFolder"
+#define WIX_TAG_REGKEY "RegistryKey"
+#define WIX_TAG_REGVAL "RegistryValue"
+
+typedef void (*TraverseCallback)(void *cbdata, QDomElement e);
+
+/* Splice command takes an element or sub tree from one
+ * document and inserts it into another. This is useful for
+ * expanding placeholder elements with their desired content
+ * for example.
+ * If an element name is not unique the conventional WiX Id
+ * attribute can be used to identify the specific element.
+ */
+typedef struct s_SpliceData {
+ QString dtag;
+ QString did;
+ QDomElement splice;
+} SpliceData;
+
+/* Replace operates on tags by name or Id like Splice but
+ * only makes modifications to individual elements. Replace
+ * can also remove elements. (replace with null)
+ */
+typedef struct s_ReplaceData {
+ QString dtag;
+ QString did;
+ QString dprop;
+ QString newtag;
+ QString newprop;
+ QString newpropval;
+} ReplaceData;
+
+/* Add operates on tags by name or Id as usual.
+ */
+typedef struct s_AddData {
+ QString dtag;
+ QString did;
+ QString newtag;
+ QString newprop;
+ QString newpropval;
+} AddData;
+
+/* In order to support local per user installation some basic
+ * constrains must apply to every component included in a
+ * package. This includes using a key path for each component
+ * via registry keys and placing all application data under the
+ * local user profile folder.
+ * This utility will navigate the components and convert any
+ * keys to registry key paths and create folders in the deployment
+ * hierarchy as required.
+ */
+typedef struct s_UserLocalData {
+ QString keypath;
+ QString featureid;
+ QStringList newcomps;
+} UserLocalData;
+
+
+/* Note that we must walk the tree ourselves as locate by ID
+ * nor suitable select by classification is available in the
+ * Qt API.
+ */
+bool
+do_walkdoc(QDomNode n,
+ TraverseCallback cb,
+ void * cbdata,
+ QString *errorMessage)
+{
+ QTextStream error(stderr);
+ if ( !n.isNull() ) {
+ if ( n.isElement() ) {
+ QDomElement e = n.toElement();
+ (*cb)(cbdata, e);
+ }
+ if ( n.hasChildNodes() ) {
+ QDomNodeList subnodes = n.childNodes();
+ int i = 0;
+ while (i < subnodes.count()) {
+ do_walkdoc(subnodes.item(i++), cb, cbdata, errorMessage);
+ }
+ }
+ }
+ return true;
+}
+
+bool
+walkdoc(QDomDocument *doc,
+ TraverseCallback cb,
+ void * cbdata,
+ QString *errorMessage)
+{
+ QTextStream error(stderr);
+ QDomNode n = doc->documentElement();
+ do_walkdoc(n, cb, cbdata, errorMessage);
+ return true;
+}
+
+void
+splicefunc(void *cbdata,
+ QDomElement e)
+{
+ SpliceData *d = reinterpret_cast<SpliceData *>(cbdata);
+ QString eid = e.attribute(WIX_ATTR_ID);
+
+ if (e.tagName().compare(d->dtag) == 0) {
+ /* if a specific Id is set, verify it too. */
+ if (d->did.isEmpty() ||
+ (eid.size() && !eid.compare(d->did)) ) {
+
+ /* expected behavior is to graft children of the splice under target.
+ * if we're only given a single element graft it instead.
+ */
+ if (d->splice.hasChildNodes()) {
+ QDomNodeList subnodes = d->splice.childNodes();
+ int i = 0;
+ while (i < subnodes.count()) {
+ e.appendChild(e.ownerDocument().importNode(subnodes.item(i++), true));
+ }
+ }
+ else {
+ e.appendChild(e.ownerDocument().importNode(d->splice, true));
+ }
+ }
+ }
+}
+
+/** Make modifications to requested documents.
+ * returns false on error and <b>errorMessage</b> will be set.
+ */
+bool
+docsplice(QDomDocument *doc,
+ QString arguments,
+ QString *errorMessage)
+{
+ Q_ASSERT(doc);
+ Q_ASSERT(errorMessage);
+ SpliceData cbdata;
+
+ QStringList spliceinfo = arguments.split("=");
+ if (spliceinfo.count() != 2) {
+ *errorMessage = "Invalid argument for splice command: " + arguments;
+ return false;
+ }
+ if (spliceinfo[0].contains(':')) {
+ /* Id syntax */
+ QStringList destinfo = spliceinfo[0].split(":");
+ cbdata.dtag = destinfo[0];
+ cbdata.did = destinfo[1];
+ }
+ else {
+ cbdata.dtag = spliceinfo[0];
+ }
+
+ QStringList srcinfo = spliceinfo[1].split(":");
+ if (srcinfo.count() < 2) {
+ *errorMessage = "Invalid source argument for splice command: " + arguments;
+ return false;
+ }
+ QFile spliceFile(srcinfo[0]);
+ if (!spliceFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ *errorMessage = QString("Unable to open '%1' for reading: %2\n")
+ .arg(srcinfo[0]).arg(spliceFile.errorString());
+ return false;
+ }
+ QTextStream sfiletxt(&spliceFile);
+ QDomDocument sdoc;
+ QString parseError;
+ int badline, badcol;
+ if (!sdoc.setContent (sfiletxt.readAll(), false, &parseError, &badline, &badcol)) {
+ *errorMessage = QString("Error parsing splice document '%1' at line %2 and column %3: %4")
+ .arg(srcinfo[0]).arg(badline).arg(badcol).arg(parseError);
+ return false;
+ }
+
+ QDomNodeList elist = sdoc.elementsByTagName(srcinfo[1]);
+ if (elist.count() == 0) {
+ *errorMessage = QString("Unable to locate splice element '%1' in document.\n").arg(srcinfo[1]);
+ return false;
+ }
+ if (srcinfo.count() == 3) {
+ /* Id syntax for source elem */
+ for (int i=0; i < elist.count(); i++) {
+ QString eid = elist.item(i).toElement().attribute(WIX_ATTR_ID);
+ if (eid.size() && !eid.compare(srcinfo[2])) {
+ cbdata.splice = elist.item(i).toElement();
+ }
+ }
+ }
+ else {
+ /* without an Id the tag name should be unique. */
+ cbdata.splice = elist.item(0).toElement();
+ }
+ return walkdoc(doc, &splicefunc, &cbdata, errorMessage);
+}
+
+void
+replacefunc(void *cbdata,
+ QDomElement e)
+{
+ ReplaceData *d = reinterpret_cast<ReplaceData *>(cbdata);
+ QString eid = e.attribute(WIX_ATTR_ID);
+
+ if (e.tagName().compare(d->dtag) == 0) {
+ /* if a specific Id is set, verify it too. */
+ if (d->did.isEmpty() ||
+ (eid.size() && !eid.compare(d->did)) ) {
+
+ /* no destination means remove node from tree */
+ if (d->newtag.isNull()) {
+ QDomNode parent = e.parentNode();
+ parent.removeChild(e);
+ }
+ else {
+ if (d->newtag.compare(e.tagName())) {
+ e.setTagName (d->newtag);
+ }
+ if (d->newprop.isNull()) {
+ /* clear all attributes (except Id if present) */
+ QDomNamedNodeMap attrs = e.attributes();
+ for (int i = 0; i < attrs.count(); i++) {
+ if (attrs.item(i).nodeName().compare(WIX_ATTR_ID)) {
+ e.removeAttribute(attrs.item(i).nodeName());
+ }
+ }
+ }
+ else {
+ /* only modify / clear a specific property */
+ QDomNode prop = e.attributeNode(d->newprop);
+ if (!prop.isNull()) {
+ e.setAttribute(d->newprop, d->newpropval);
+ }
+ }
+ }
+ }
+ }
+}
+
+/** Make modifications to requested documents.
+ * returns false on error and <b>errorMessage</b> will be set.
+ */
+bool
+docreplace(QDomDocument *doc,
+ QString arguments,
+ QString *errorMessage)
+{
+ Q_ASSERT(doc);
+ Q_ASSERT(errorMessage);
+ ReplaceData cbdata;
+
+ QStringList replaceinfo = arguments.split("=");
+ if (replaceinfo.count() < 1) {
+ *errorMessage = "Invalid argument for replace command: " + arguments;
+ return false;
+ }
+ if (replaceinfo[0].contains(':')) {
+ /* Id syntax */
+ QStringList destinfo = replaceinfo[0].split(":");
+ cbdata.dtag = destinfo[0];
+ cbdata.did = destinfo[1];
+ if (destinfo.count() >= 3) {
+ cbdata.dprop = destinfo[2];
+ }
+ }
+ else {
+ cbdata.dtag = replaceinfo[0];
+ }
+ if (replaceinfo.count() > 1) {
+ QStringList srcinfo = replaceinfo[1].split(":");
+ if (srcinfo.count() < 1) {
+ *errorMessage = "Invalid target argument for replace command: " + arguments;
+ return false;
+ }
+ if (srcinfo.count() >= 1) {
+ if (srcinfo[0].length()) cbdata.newtag = srcinfo[0];
+ }
+ if (srcinfo.count() >= 2) {
+ if (srcinfo[1].length()) cbdata.newprop = srcinfo[1];
+ }
+ if (srcinfo.count() >= 3) {
+ if (srcinfo[2].length()) cbdata.newpropval = srcinfo[2];
+ }
+ }
+ return walkdoc(doc, &replacefunc, &cbdata, errorMessage);
+}
+
+void
+addfunc(void *cbdata,
+ QDomElement e)
+{
+ AddData *d = reinterpret_cast<AddData *>(cbdata);
+ QString eid = e.attribute(WIX_ATTR_ID);
+
+ if (e.tagName().compare(d->dtag) == 0) {
+ /* if a specific Id is set, verify it too. */
+ if (d->did.isEmpty() ||
+ (eid.size() && !eid.compare(d->did)) ) {
+ if (d->newtag.compare(d->dtag)) {
+ QDomElement ne = e.ownerDocument().createElement(d->newtag);
+ if (!d->newprop.isNull()) {
+ ne.setAttribute(d->newprop, d->newpropval);
+ }
+ e.appendChild(ne);
+ }
+ else {
+ e.setAttribute(d->newprop, d->newpropval);
+ }
+ }
+ }
+}
+
+/** Make modifications to requested documents.
+ * returns false on error and <b>errorMessage</b> will be set.
+ */
+bool
+docadd(QDomDocument *doc,
+ QString arguments,
+ QString *errorMessage)
+{
+ Q_ASSERT(doc);
+ Q_ASSERT(errorMessage);
+ AddData cbdata;
+
+ QStringList addinfo = arguments.split("=");
+ if (addinfo.count() < 1) {
+ *errorMessage = "Invalid argument for add command: " + arguments;
+ return false;
+ }
+ if (addinfo[0].contains(':')) {
+ /* Id syntax */
+ QStringList destinfo = addinfo[0].split(":");
+ cbdata.dtag = destinfo[0];
+ cbdata.did = destinfo[1];
+ }
+ else {
+ cbdata.dtag = addinfo[0];
+ }
+ if (addinfo.count() > 1) {
+ QStringList srcinfo = addinfo[1].split(":");
+ if (srcinfo.count() < 1) {
+ *errorMessage = "Invalid target argument for add command: " + arguments;
+ return false;
+ }
+ if (srcinfo.count() >= 1) {
+ if (srcinfo[0].length()) cbdata.newtag = srcinfo[0];
+ }
+ if (srcinfo.count() >= 2) {
+ if (srcinfo[1].length()) cbdata.newprop = srcinfo[1];
+ }
+ if (srcinfo.count() >= 3) {
+ if (srcinfo[2].length()) cbdata.newpropval = srcinfo[2];
+ }
+ }
+ return walkdoc(doc, &addfunc, &cbdata, errorMessage);
+}
+
+void
+createRegLocalComponent(QDomElement e,
+ QString dirName,
+ QString keyPath)
+{
+ QDomElement nrk = e.ownerDocument().createElement(WIX_TAG_REGKEY);
+ QDomElement nrv = e.ownerDocument().createElement(WIX_TAG_REGVAL);
+ nrk.setAttribute(WIX_ATTR_REG_ROOT, "HKCU");
+ nrk.setAttribute(WIX_ATTR_REG_ACTION, "createAndRemoveOnUninstall");
+ nrk.setAttribute(WIX_ATTR_REG_KEYPATH, keyPath);
+ nrv.setAttribute(WIX_ATTR_REG_TYPE, WIX_REG_KEY_TYPE);
+ nrv.setAttribute(WIX_ATTR_REG_NAME, dirName);
+ nrv.setAttribute(WIX_ATTR_VALUE, "1");
+ nrv.setAttribute(WIX_ATTR_KEY, "yes");
+ nrk.appendChild(nrv);
+ e.appendChild(nrk);
+}
+
+void
+createDirMgmtComponent(QDomElement e,
+ QString dirName)
+{
+ QDomElement nce;
+ /* An empty dir might produce a createdir, so only add if not present. */
+ if (e.elementsByTagName(WIX_TAG_CREATEDIR).count() == 0) {
+ nce = e.ownerDocument().createElement(WIX_TAG_CREATEDIR);
+ e.appendChild(nce);
+ }
+ nce = e.ownerDocument().createElement(WIX_TAG_REMOVEDIR);
+ nce.setAttribute("On", WIX_ATTR_DIRACTION);
+ nce.setAttribute(WIX_ATTR_ID, QString("Remove").append(dirName));
+ e.appendChild(nce);
+}
+
+void
+userlocalfunc(void *cbdata,
+ QDomElement e)
+{
+ UserLocalData *ulinfo = reinterpret_cast<UserLocalData *>(cbdata);
+ QString eid = e.attribute(WIX_ATTR_ID);
+
+ if (e.tagName().compare(WIX_TAG_FILE) == 0) {
+ e.removeAttribute(WIX_ATTR_KEY);
+ }
+ else if (e.tagName().compare(WIX_TAG_COMPONENT) == 0) {
+ /* If the WiX tools get confused we need to remove KeyPath attrs
+ * on any component elements after creation or merging.
+ * Empty directories with a CreateFolder and nothing else will do this.
+ */
+ e.removeAttribute(WIX_ATTR_KEY);
+ }
+ else if (e.tagName().compare(WIX_TAG_FEATURE) == 0) {
+ /* be sure to remove any default feature names; changed added above. */
+ QDomNodeList cnl = e.elementsByTagName(WIX_TAG_COMPONENT_REF);
+ for (int i = 0; i < cnl.count(); i++) {
+ QDomElement cre = cnl.item(i).toElement();
+ if (cre.attribute(WIX_ATTR_ID).compare(WIX_TAG_COMPONENT) == 0) {
+ e.removeChild(cre);
+ }
+ }
+ if (ulinfo->featureid.compare(e.attribute(WIX_ATTR_ID)) == 0) {
+ /* this is the target feature element for the new components, if any. */
+ QDomElement ne;
+ for (int i = 0; i < ulinfo->newcomps.count(); i++) {
+ QString currid = ulinfo->newcomps[i];
+ ne = e.ownerDocument().createElement(WIX_TAG_COMPONENT_REF);
+ ne.setAttribute(WIX_ATTR_ID, currid);
+ e.appendChild(ne);
+ }
+ }
+ }
+ else if (e.tagName().compare(WIX_TAG_DIR) == 0) {
+ QString dirName = e.attribute(WIX_ATTR_NAME);
+ QString dirId = e.attribute(WIX_ATTR_ID);
+ /* find all child components for this dir and see if it contains:
+ * create/remove folder elements, a registry element
+ */
+ if ( e.hasChildNodes() ) {
+ QDomElement fc;
+ bool hasComponent = false;
+ bool hasRegKey;
+ QDomNodeList subnodes = e.childNodes();
+ for (int i = 0; i < subnodes.count(); i++) {
+ hasRegKey = false;
+ if (subnodes.item(i).isElement()) {
+ QDomElement ce = subnodes.item(i).toElement();
+ if (ce.tagName().compare(WIX_TAG_COMPONENT) == 0) {
+ if (!hasComponent) {
+ hasComponent = true;
+ fc = ce;
+ if (ce.attribute(WIX_ATTR_ID).compare(WIX_TAG_COMPONENT) == 0) {
+ /* Fix default named components before adding registry elements. */
+ ce.setAttribute(WIX_ATTR_ID, QString("DCOMP").append(dirName));
+ ulinfo->newcomps.append(ce.attribute(WIX_ATTR_ID));
+ }
+ if (ce.elementsByTagName(WIX_TAG_REMOVEDIR).count() == 0) {
+ createDirMgmtComponent(ce, ce.attribute(WIX_ATTR_ID));
+ }
+ }
+ QDomNodeList compnodes = ce.childNodes();
+ for (int j = 0; j < compnodes.count(); j++) {
+ if (compnodes.item(j).isElement()) {
+ QDomElement compe = compnodes.item(j).toElement();
+ if (compe.tagName().compare(WIX_TAG_REGKEY) == 0) {
+ hasRegKey = true;
+ }
+ }
+ }
+ if (!hasRegKey) {
+ createRegLocalComponent(ce, QString("RK").append(ce.attribute(WIX_ATTR_ID)), ulinfo->keypath);
+ }
+ }
+ }
+ }
+ if (!hasComponent) {
+ /* Certain system directories must be ignored; we don't manage them. */
+ if (dirId.compare("LocalAppDataFolder") &&
+ dirId.compare("AppDataFolder") &&
+ dirId.compare("CommonAppDataFolder") &&
+ dirId.compare("CommonFilesFolder") &&
+ dirId.compare("DesktopFolder") &&
+ dirId.compare("PersonalFolder") &&
+ dirId.compare("ProgramFilesFolder") &&
+ dirId.compare("ProgramMenuFolder") &&
+ dirId.compare("StartMenuFolder") &&
+ dirId.compare("StartupFolder") &&
+ dirId.compare("SystemFolder") &&
+ dirId.compare("TempFolder") &&
+ dirId.compare("WindowsFolder") ) {
+ /* if there is no component under this dir parent then we
+ * must create a component for the sole purpose of dir
+ * creation with the requisite registry key path.
+ */
+ QDomElement ne = e.ownerDocument().createElement(WIX_TAG_COMPONENT);
+ QString compId = QString("ULDirComp_").append(dirName);
+ ne.setAttribute(WIX_ATTR_GUID, "*");
+ ne.setAttribute(WIX_ATTR_ID, compId);
+ e.appendChild(ne);
+ createDirMgmtComponent(ne, dirName);
+ createRegLocalComponent(ne, QString("DRK").append(dirName), ulinfo->keypath);
+ ulinfo->newcomps.append(compId);
+ }
+ }
+ }
+ }
+}
+
+/** Make modifications to requested documents.
+ * returns false on error and <b>errorMessage</b> will be set.
+ */
+bool
+docuserlocal(QDomDocument *doc,
+ QString argument,
+ QString *errorMessage)
+{
+ Q_ASSERT(doc);
+ Q_ASSERT(errorMessage);
+ UserLocalData cbdata;
+
+ QStringList ulinfo = argument.split(":");
+ if (ulinfo.count() < 2) {
+ *errorMessage = "Invalid argument for userlocal command: " + argument;
+ return false;
+ }
+ cbdata.keypath = ulinfo[0];
+ cbdata.featureid = ulinfo[1];
+ return walkdoc(doc, &userlocalfunc, &cbdata, errorMessage);
+}
+
+/** Display application usage and exit. */
+void
+print_usage_and_exit()
+{
+ QTextStream error(stderr);
+ error << "usage: wixtool <command> [-q] -i <infile> -o <outfile> <Arg0> [... <ArgN>]" << endl;
+ error << " command one of: " << endl;
+ error << " splice Splice children from one document into another." << endl;
+ error << " replace Replace elements or attributes in a document." << endl;
+ error << " add Add elements or attributes into a document." << endl;
+ error << " userlocal Convert File elements into per-user local elements." << endl;
+ error << " -i <infile> Input or template file" << endl;
+ error << " -o <outfile> Output file" << endl;
+ error << endl;
+ error << " splice args: desttagname[:Id]=file:basetag[:Id]" << endl;
+ error << " Splice children of basetag in file under desttagname" << endl;
+ error << endl;
+ error << " replace args: tagname[:Id]:property=newtagname[:Id]:property:value" << endl;
+ error << " If newtagname is empty the element is deleted" << endl;
+ error << " If newproperty is empty the property is deleted" << endl;
+ error << endl;
+ error << " add args: desttagname[:Id]=newtagname[:Id]:property:value" << endl;
+ error << " Add properties or child elements to target" << endl;
+ error << " If newtagname is empty only properties added to dest" << endl;
+ error << endl;
+ error << " userlocal arg: <registry key path>:<dest feature id>" << endl;
+ error << " Convert KeyPath File elements into the per user local idiom" << endl;
+ error << " with corresponding Create/RemoveDir and RegistryKey elements." << endl;
+ error << endl;
+ error << " NOTE: text content within an element is not accessible." << endl;
+ error << " Use the Value= attribute syntax if necessary." << endl;
+ error << " The optional :Id syntax restricts matching to elements with" << endl;
+ error << " the Id attribute set to the value indicated." << endl;
+ error.flush();
+ exit(1);
+}
+
+int
+main(int argc, char *argv[])
+{
+ QTextStream error(stderr);
+ QString command, errorMessage;
+ char *infile = 0, *outfile = 0;
+ QTextCodec *codec = QTextCodec::codecForName("utf-8");
+ bool quiet = false;
+ QStringList commandargs;
+
+ /* Check for the correct number of input parameters. */
+ if (argc < 6)
+ print_usage_and_exit();
+
+ /* Verify command is supported. */
+ command = argv[1];
+ if ( command.compare("splice", Qt::CaseInsensitive) &&
+ command.compare("replace", Qt::CaseInsensitive) &&
+ command.compare("add", Qt::CaseInsensitive) &&
+ command.compare("userlocal", Qt::CaseInsensitive) ) {
+ print_usage_and_exit();
+ }
+
+ /* Gather remaining arguments. */
+ for (int i = 2; i < argc; i++) {
+ QString arg(argv[i]);
+ if (!arg.compare("-q", Qt::CaseInsensitive))
+ quiet = true;
+ else if (!arg.compare("-i", Qt::CaseInsensitive) && ++i < argc)
+ infile = argv[i];
+ else if (!arg.compare("-o", Qt::CaseInsensitive) && ++i < argc)
+ outfile = argv[i];
+ else if (infile && outfile) {
+ commandargs.append(arg);
+ }
+ }
+ if ( !infile || !outfile || !commandargs.count() ) {
+ print_usage_and_exit();
+ }
+
+ /* Open the source document for reading. */
+ QFile srcFile(infile);
+ QTextStream sfiletxt(&srcFile);
+ sfiletxt.setCodec(codec);
+ if (!srcFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ error << QString("Unable to open '%1' for reading: %2\n").arg(infile)
+ .arg(srcFile.errorString());
+ return 2;
+ }
+
+ /* Make sure the outfile does not exist before we use it. */
+ if (QFile::exists(outfile)) {
+ if (!QFile::remove(outfile)) {
+ error << QString("Unable to truncate outfile '%1'\n").arg(outfile);
+ return 2;
+ }
+ }
+
+ QDomDocument doc;
+ QString parseError;
+ int badline, badcol;
+ if (!doc.setContent (sfiletxt.readAll(), false, &parseError, &badline, &badcol)) {
+ error << QString("Error parsing source document '%1' at line %2 and column %3: %4")
+ .arg(infile).arg(badline).arg(badcol).arg(parseError);
+ return 3;
+ }
+
+ if (!command.compare("userlocal", Qt::CaseInsensitive)) {
+ if (!docuserlocal(&doc, commandargs[0], &errorMessage)) {
+ error << QString("Unable to convert document components to user local: %1\n")
+ .arg(errorMessage);
+ return 4;
+ }
+ }
+ else {
+ for (int i = 0; i < commandargs.count(); i++) {
+ if (!command.compare("splice", Qt::CaseInsensitive)) {
+ if (!docsplice(&doc, commandargs[i], &errorMessage)) {
+ error << QString("Unable to process splice command '%1': %2\n")
+ .arg(commandargs[i]).arg(errorMessage);
+ return 4;
+ }
+ }
+ else if (!command.compare("replace", Qt::CaseInsensitive)) {
+ if (!docreplace(&doc, commandargs[i], &errorMessage)) {
+ error << QString("Unable to process replace command '%1': %2\n")
+ .arg(commandargs[i]).arg(errorMessage);
+ return 4;
+ }
+ }
+ else if (!command.compare("add", Qt::CaseInsensitive)) {
+ if (!docadd(&doc, commandargs[i], &errorMessage)) {
+ error << QString("Unable to process add command '%1': %2\n")
+ .arg(commandargs[i]).arg(errorMessage);
+ return 4;
+ }
+ }
+ }
+ }
+
+ /* Open the output file for writing. */
+ QFile docFile(outfile);
+ if (!docFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+ error << QString("Unable to open '%1' for writing: %2\n").arg(outfile)
+ .arg(docFile.errorString());
+ return 5;
+ }
+
+ /* Write the .wxl output. */
+ QTextStream out(&docFile);
+ out << doc.toString(4);
+
+ return 0;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/AddressMap.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/AddressMap.cpp
new file mode 100644
index 0000000..f3ad3b8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/AddressMap.cpp
@@ -0,0 +1,105 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 AddressMap.cpp
+** \version $Id: bandwidthevent.h 1563 2006-12-26 06:06:04Z edmanm $
+** \brief Stores a list of address mappings and their expiration times
+*/
+
+#include "tcglobal.h"
+#include "AddressMap.h"
+
+#include <QStringList>
+
+
+/** Format of expiry times in address map events. */
+#define DATE_FMT "\"yyyy-MM-dd HH:mm:ss\""
+
+
+/** Adds a new address mapping from the address <b>from</b> to the address
+ * <b>to</b>, that expires at <b>expires</b>. */
+void
+AddressMap::add(const QString &from, const QString &to,
+ const QDateTime &expires)
+{
+ tc::debug("New address mapping: %1 -> %2 (expires %3)").arg(from)
+ .arg(to)
+ .arg(expires.isValid() ? expires.toString(DATE_FMT)
+ : "never");
+ insert(from, AddressMapEntry(to, expires));
+}
+
+/** Adds a new address mapping by parsing the fields in <b>mapping</b>, which
+ * should be formatted as follows:
+ *
+ * Address SP Address SP Expiry
+ * Expiry = DQUOTE ISOTime DQUOTE / "NEVER"
+ */
+void
+AddressMap::add(const QString &mapping)
+{
+ QStringList parts = mapping.split(" ");
+ if (parts.size() >= 2) {
+ QDateTime expires;
+ if (parts.size() >= 4 && parts.at(2) != "NEVER") {
+ expires = QDateTime::fromString(parts.at(2) + " " + parts.at(3),
+ DATE_FMT);
+
+ /* Tor gives us the expiry time in UTC, but we will do subsequent
+ * comparisons based on local time. So do the proper conversion now. */
+ expires.setTimeSpec(Qt::UTC);
+ expires = expires.toLocalTime();
+ }
+ add(parts.at(0), parts.at(1), expires);
+ }
+}
+
+/** Returns true if <b>entry</b> is expired; false otherwise. */
+bool
+AddressMap::isExpired(const AddressMapEntry &entry) const
+{
+ if (entry.second.isValid())
+ return (entry.second < QDateTime::currentDateTime());
+ return false; /* No expiry time == valid forever */
+}
+
+/** Returns true if there exists a mapping for <b>addr</b> and that mapping is
+ * not expired. */
+bool
+AddressMap::isMapped(const QString &addr) const
+{
+ return (contains(addr) && !isExpired(value(addr)));
+}
+
+/** Returns the address to which <b>addr</b> is currently mapped. If there is
+ * no mapping for <b>addr</b> (or the mapping is expired), then an empty
+ * string is returned. */
+QString
+AddressMap::mappedTo(const QString &addr) const
+{
+ AddressMapEntry entry = value(addr);
+ return (isExpired(entry) ? QString() : entry.first);
+}
+
+/** Returns the reverse of this address map by swapping each address in the
+ * address map with its mapped address. The expiration times are unaltered. */
+AddressMap
+AddressMap::reverse() const
+{
+ AddressMap reverseMap;
+ foreach (QString from, keys()) {
+ /* Flip the "from" and the "to" addresses and retain the expiry time. */
+ AddressMapEntry entry = value(from);
+ reverseMap.add(entry.first, from, entry.second);
+ }
+ return reverseMap;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/AddressMap.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/AddressMap.h
new file mode 100644
index 0000000..b590278
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/AddressMap.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.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 AddressMap.h
+** \version $Id: bandwidthevent.h 1563 2006-12-26 06:06:04Z edmanm $
+** \brief Stores a list of address mappings and their expiration times
+*/
+
+#ifndef _ADDRESSMAP_H
+#define _ADDRESSMAP_H
+
+#include <QHash>
+#include <QDateTime>
+#include <QPair>
+
+/** Defines a type that pairs a mapping's target address with an expiration
+ * time for that mapping. */
+typedef QPair<QString, QDateTime> AddressMapEntry;
+
+
+class AddressMap : public QHash<QString, AddressMapEntry>
+{
+public:
+ /** Types of address mappings. */
+ enum AddressMapType {
+ AddressMapAll, /**< All address mapping types. */
+ AddressMapConfig, /**< Address mappings set in the torrc. */
+ AddressMapCache, /**< Address mappings cached by Tor. */
+ AddressMapControl /**< Address mappings set by a controller. */
+ };
+
+ /** Constructor. Creates an empty table for storing address mappinsgs. */
+ AddressMap()
+ : QHash<QString, AddressMapEntry>() {}
+
+ /** Adds a new address mapping or updates an existing one for the address
+ * specified by <b>from</b>. The mapping will remain valid until the date in
+ * <b>expires</b>. */
+ void add(const QString &from, const QString &to, const QDateTime &expires);
+ /** Adds a new address mapping or updates an existing one based on fields
+ * parsed from <b>mapping</b>. */
+ void add(const QString &mapping);
+
+ /** Returns true if the address map table contains a mapping for <b>addr</b>
+ * that is not expired. */
+ bool isMapped(const QString &addr) const;
+
+ /** Returns the address to which <b>addr</b> is currently mapped. If there
+ * is no mapping for <b>addr</b> (or the mapping is expired), then an
+ * empty string is returned. */
+ QString mappedTo(const QString &addr) const;
+
+ /** Returns the reverse of this address map. */
+ AddressMap reverse() const;
+
+private:
+ /** Returns true if <b>entry</b> is expired; false otherwise. */
+ bool isExpired(const AddressMapEntry &entry) const;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/BootstrapStatus.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/BootstrapStatus.cpp
new file mode 100644
index 0000000..b43fba4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/BootstrapStatus.cpp
@@ -0,0 +1,97 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 BootstrapStatus.cpp
+** \version $Id: BootstrapStatus.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Describes the Tor software's current bootstrapping status
+*/
+
+#include "BootstrapStatus.h"
+
+
+BootstrapStatus::BootstrapStatus()
+{
+ _severity = tc::UnrecognizedSeverity;
+ _reason = tc::UnrecognizedReason;
+ _status = UnrecognizedStatus;
+ _action = UnrecognizedRecommendation;
+ _percentComplete = -1;
+}
+
+/** Constructor. */
+BootstrapStatus::BootstrapStatus(tc::Severity severity, Status status,
+ int percentComplete,
+ const QString &description,
+ const QString &warning,
+ tc::ConnectionStatusReason reason,
+ Recommendation action)
+{
+ _severity = severity;
+ _status = status;
+ _percentComplete = qBound(0, percentComplete, 100);
+ _description = description;
+ _warning = warning;
+ _reason = reason;
+ _action = action;
+}
+
+/** Converts a string TAG value to a BootstrapStatus enum value. */
+BootstrapStatus::Status
+BootstrapStatus::statusFromString(const QString &str)
+{
+ if (!str.compare("CONN_DIR", Qt::CaseInsensitive))
+ return ConnectingToDirMirror;
+ if (!str.compare("HANDSHAKE_DIR", Qt::CaseInsensitive))
+ return HandshakingWithDirMirror;
+ if (!str.compare("ONEHOP_CREATE", Qt::CaseInsensitive))
+ return CreatingOneHopCircuit;
+ if (!str.compare("REQUESTING_STATUS", Qt::CaseInsensitive))
+ return RequestingNetworkStatus;
+ if (!str.compare("LOADING_STATUS", Qt::CaseInsensitive))
+ return LoadingNetworkStatus;
+ if (!str.compare("LOADING_KEYS", Qt::CaseInsensitive))
+ return LoadingAuthorityCertificates;
+ if (!str.compare("REQUESTING_DESCRIPTORS", Qt::CaseInsensitive))
+ return RequestingDescriptors;
+ if (!str.compare("LOADING_DESCRIPTORS", Qt::CaseInsensitive))
+ return LoadingDescriptors;
+ if (!str.compare("CONN_OR", Qt::CaseInsensitive))
+ return ConnectingToEntryGuard;
+ if (!str.compare("HANDSHAKE_OR", Qt::CaseInsensitive))
+ return HandshakingWithEntryGuard;
+ if (!str.compare("CIRCUIT_CREATE", Qt::CaseInsensitive))
+ return EstablishingCircuit;
+ if (!str.compare("DONE", Qt::CaseInsensitive))
+ return BootstrappingDone;
+ return UnrecognizedStatus;
+}
+
+/** Returns the action that the Tor software recommended be taken in response
+ * to this bootstrap status. */
+BootstrapStatus::Recommendation
+BootstrapStatus::actionFromString(const QString &str)
+{
+ if (!str.compare("WARN", Qt::CaseInsensitive))
+ return RecommendWarn;
+ if (!str.compare("IGNORE", Qt::CaseInsensitive))
+ return RecommendIgnore;
+ return UnrecognizedRecommendation;
+}
+
+/** Returns true if this object represents a valid bootstrap status phase. */
+bool
+BootstrapStatus::isValid() const
+{
+ return (_severity != tc::UnrecognizedSeverity
+ && _status != UnrecognizedStatus
+ && _percentComplete >= 0);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/BootstrapStatus.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/BootstrapStatus.h
new file mode 100644
index 0000000..fad00f6
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/BootstrapStatus.h
@@ -0,0 +1,147 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 BootstrapStatus.h
+** \version $Id: BootstrapStatus.h 4054 2009-08-17 02:25:08Z edmanm $
+** \brief Describes the Tor software's current bootstrap status
+*/
+
+#ifndef _BOOTSTRAPSTATUS_H
+#define _BOOTSTRAPSTATUS_H
+
+#include "tcglobal.h"
+
+#include <QString>
+#include <QMetaType>
+
+
+class BootstrapStatus
+{
+public:
+ /** Currently enumerated bootstrapping states defined by Tor's control
+ * protocol (Tor >= 0.2.1.0-alpha-dev. */
+ enum Status {
+ UnrecognizedStatus,
+ ConnectingToDirMirror,
+ HandshakingWithDirMirror,
+ CreatingOneHopCircuit,
+ RequestingNetworkStatus,
+ LoadingNetworkStatus,
+ LoadingAuthorityCertificates,
+ RequestingDescriptors,
+ LoadingDescriptors,
+ ConnectingToEntryGuard,
+ HandshakingWithEntryGuard,
+ EstablishingCircuit,
+ BootstrappingDone
+ };
+ /** Actions the Tor software might recommend controllers take in response to
+ * a bootstrap status problem event. */
+ enum Recommendation {
+ UnrecognizedRecommendation,
+ RecommendIgnore,
+ RecommendWarn
+ };
+
+ /** Default constructor. */
+ BootstrapStatus();
+
+ /** Constructor. */
+ BootstrapStatus(tc::Severity severity,
+ Status status, int percentComplete,
+ const QString &description,
+ const QString &warning = QString(),
+ tc::ConnectionStatusReason reason = tc::UnrecognizedReason,
+ Recommendation action = UnrecognizedRecommendation);
+
+ /** Returns the severity of this bootstrap status event. */
+ tc::Severity severity() const { return _severity; }
+
+ /** Returns the BootstrapStatus enum value indicated by this bootstrap
+ * status event. */
+ Status status() const { return _status; }
+
+ /** Returns an integer between 0 and 100 representing an estimate of how
+ * much of Tor's bootstrapping process it has completed. */
+ int percentComplete() const { return _percentComplete; }
+
+ /** Returns a description of Tor's current bootstrapping status. */
+ QString description() const { return _description; }
+
+ /** Returns a description of the most recent error Tor encountered while
+ * attempting to bootstrap, if this event's severity is 'warn'. Otherwise,
+ * this returns a default-constructed QString. */
+ QString warning() const { return _warning; }
+
+ /** Returns a ConnectionStatusReason enum value describing the most recent
+ * error Tor encountered while attempting to bootstrap, if this event's
+ * severity is 'warn'. Otherwise, this simply returns
+ * tc::UnrecognizedReason. */
+ tc::ConnectionStatusReason reason() const { return _reason; }
+
+ /** Returns the action that the Tor software recommended be taken in
+ * response to this bootstrap status event. */
+ Recommendation recommendedAction() const { return _action; }
+
+ /** Returns true if this object represents a valid bootstrap status
+ * phase. */
+ bool isValid() const;
+
+ /** Converts a string TAG value to a BootstrapStatus enum value. */
+ static Status statusFromString(const QString &tag);
+ /** Converts a string RECOMMENDATION value to a RecommendAction enum
+ * value. */
+ static Recommendation actionFromString(const QString &str);
+
+private:
+ /** Severity of the current bootstrap status.
+ * \sa severity
+ */
+ tc::Severity _severity;
+
+ /** Current bootstrapping status value.
+ * \sa status
+ */
+ Status _status;
+
+ /** Approximate percentage of Tor's bootstrapping process that is complete.
+ * \sa percentComplete
+ */
+ int _percentComplete;
+
+ /** Description of Tor's current bootstrapping status.
+ * \sa description
+ */
+ QString _description;
+
+ /** Description of the most recent error Tor encountered while attempting to
+ * bootstrap.
+ * \sa warning
+ */
+ QString _warning;
+
+ /** ConnectionStatusReason enum value describing the most recent error Tor
+ * encountered while attempting to bootstrap.
+ * \sa reason
+ */
+ tc::ConnectionStatusReason _reason;
+
+ /** Recommendation enum value describing Tor's suggested response to this
+ * bootstrap status event.
+ * \sa recommendedAction
+ */
+ Recommendation _action;
+};
+
+Q_DECLARE_METATYPE(BootstrapStatus);
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/CMakeLists.txt
new file mode 100644
index 0000000..cbf361b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/CMakeLists.txt
@@ -0,0 +1,58 @@
+##
+## $Id: CMakeLists.txt 4054 2009-08-17 02:25:08Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+
+set(torcontrol_SRCS
+ AddressMap.cpp
+ BootstrapStatus.cpp
+ Circuit.cpp
+ ControlCommand.cpp
+ ControlConnection.cpp
+ ControlReply.cpp
+ ControlSocket.cpp
+ ProtocolInfo.cpp
+ ReplyLine.cpp
+ RouterDescriptor.cpp
+ RouterStatus.cpp
+ SendCommandEvent.cpp
+ Stream.cpp
+ tcglobal.cpp
+ TorControl.cpp
+ TorEvents.cpp
+ TorProcess.cpp
+ TorSignal.cpp
+)
+qt4_wrap_cpp(torcontrol_SRCS
+ ControlConnection.h
+ ControlSocket.h
+ TorControl.h
+ TorEvents.h
+ TorProcess.h
+)
+
+if (WIN32)
+ set(torcontrol_SRCS ${torcontrol_SRCS}
+ TorService.cpp
+ )
+ qt4_wrap_cpp(torcontrol_SRCS
+ TorService.h
+ )
+endif(WIN32)
+
+
+add_library(torcontrol STATIC ${torcontrol_SRCS})
+target_link_libraries(torcontrol
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTNETWORK_LIBRARY}
+ common
+)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/Circuit.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/Circuit.cpp
new file mode 100644
index 0000000..2a619d5
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/Circuit.cpp
@@ -0,0 +1,121 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 Circuit.cpp
+** \version $Id: Circuit.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Object representing a Tor circuit
+*/
+
+#include "tcglobal.h"
+#include "Circuit.h"
+
+#include <QStringList>
+#include <QRegExp>
+
+
+/** Default constructor. */
+Circuit::Circuit()
+{
+ _status = Unknown;
+ _isValid = false;
+}
+
+/** Parses the string given in Tor control protocol format for a circuit. The
+ * format is:
+ *
+ * CircuitID SP CircStatus [SP Path]
+ *
+ * If the status is "LAUNCHED", the Path is empty. Server names in the path
+ * must follow Tor's VERBOSE_NAMES format.
+ */
+Circuit::Circuit(const QString &circuit)
+{
+ QStringList parts = circuit.split(" ", QString::SkipEmptyParts);
+ if (parts.size() >= 2) {
+ /* Get the circuit ID */
+ _circId = parts.at(0);
+ if (! isValidCircuitId(_circId))
+ goto err;
+
+ /* Get the circuit status value */
+ _status = Circuit::toStatus(parts.at(1));
+
+ /* Get the circuit path (list of routers) */
+ if (parts.size() > 2 && parts.at(2).startsWith("$")) {
+ foreach (QString hop, parts.at(2).split(",")) {
+ QStringList parts = hop.split(QRegExp("[=~]"));
+ if (parts.size() != 2)
+ goto err;
+
+ _ids << parts.at(0).mid(1);
+ _names << parts.at(1);
+ }
+ }
+
+ _isValid = true;
+ }
+ return;
+
+err:
+ tc::warn("Improperly formatted circuit: '%1'").arg(circuit);
+ _isValid = false;
+}
+
+/** Returns true iff <b>circId</b> consists of only between 1 and 16
+ * (inclusive) ASCII-encoded letters and numbers. */
+bool
+Circuit::isValidCircuitId(const CircuitId &circId)
+{
+ int length = circId.length();
+ if (length < 1 || length > 16)
+ return false;
+
+ for (int i = 0; i < length; i++) {
+ char c = circId[i].toAscii();
+ if (c < '0' && c > '9' && c < 'A' && c > 'Z' && c < 'a' && c > 'z')
+ return false;
+ }
+ return true;
+}
+
+/** Converts the circuit status string to its proper enum value */
+Circuit::Status
+Circuit::toStatus(const QString &status)
+{
+ if (!status.compare("LAUNCHED", Qt::CaseInsensitive))
+ return Launched;
+ if (!status.compare("BUILT", Qt::CaseInsensitive))
+ return Built;
+ if (!status.compare("EXTENDED", Qt::CaseInsensitive))
+ return Extended;
+ if (!status.compare("FAILED", Qt::CaseInsensitive))
+ return Failed;
+ if (!status.compare("CLOSED", Qt::CaseInsensitive))
+ return Closed;
+ return Unknown;
+}
+
+/** Returns a string representation of the circuit's status. */
+QString
+Circuit::statusString() const
+{
+ QString status;
+ switch (_status) {
+ case Launched: status = tr("New"); break;
+ case Built: status = tr("Open"); break;
+ case Extended: status = tr("Building"); break;
+ case Failed: status = tr("Failed"); break;
+ case Closed: status = tr("Closed"); break;
+ default: status = tr("Unknown"); break;
+ }
+ return status;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/Circuit.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/Circuit.h
new file mode 100644
index 0000000..d8ad4b9
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/Circuit.h
@@ -0,0 +1,85 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 Circuit.h
+** \version $Id: Circuit.h 4054 2009-08-17 02:25:08Z edmanm $
+** \brief Object representing a Tor circuit
+*/
+
+#ifndef _CIRCUIT_H
+#define _CIRCUIT_H
+
+#include <QCoreApplication>
+#include <QStringList>
+#include <QMetaType>
+
+/** Circuit IDs contains 1-16 alphanumeric ASCII characters. */
+typedef QString CircuitId;
+
+
+class Circuit
+{
+ Q_DECLARE_TR_FUNCTIONS(Circuit)
+
+public:
+ /** Circuit status events */
+ enum Status {
+ Unknown, /**< Unknown circuit status */
+ Launched, /**< Circuit ID assigned to new circuit */
+ Built, /**< All hops finished */
+ Extended, /**< Circuit extended by one hop */
+ Failed, /**< Circuit closed (was not built) */
+ Closed /**< Circuit closed (was built) */
+ };
+
+ /** Default constructor. */
+ Circuit();
+ /** Constructor. */
+ Circuit(const CircuitId &circuit);
+
+ /** Returns true if this circuit is valid. */
+ bool isValid() const { return _isValid; }
+
+ /** Returns the ID for this circuit */
+ CircuitId id() const { return _circId; }
+ /** Returns the status of this circuit */
+ Status status() const { return _status; }
+ /** Returns a string representation of the status of this circuit. */
+ QString statusString() const;
+ /** Returns the length of the circuit's path. */
+ uint length() const { return _ids.size(); }
+ /** Returns the circuit's path as an ordered list of router nicknames. */
+ QStringList routerNames() const { return _names; }
+ /** Returns the circuit's path as an ordered list of router fingerprints. */
+ QStringList routerIDs() const { return _ids; }
+
+ /** Converts a string description of a circuit's status to an enum value */
+ static Status toStatus(const QString &strStatus);
+
+ /** Returns true iff <b>circId</b> consists of only between 1 and 16
+ * (inclusive) ASCII-encoded letters and numbers. */
+ static bool isValidCircuitId(const CircuitId &circId);
+
+private:
+ CircuitId _circId; /**< Circuit ID. */
+ Status _status; /**< Circuit status. */
+ QStringList _names; /**< Nicknames of the routers in the circuit. */
+ QStringList _ids; /**< IDs of the routers in the circuit. */
+ bool _isValid;
+};
+
+Q_DECLARE_METATYPE(Circuit);
+
+/** A collection of circuits. */
+typedef QList<Circuit> CircuitList;
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlCommand.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlCommand.cpp
new file mode 100644
index 0000000..1f519ea
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlCommand.cpp
@@ -0,0 +1,124 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 ControlCommand.cpp
+** \version $Id: ControlCommand.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief A command sent to Tor's control interface
+*/
+
+#include "ControlCommand.h"
+
+
+/** Default constructor. */
+ControlCommand::ControlCommand()
+{
+}
+
+/** Creates a command using the specified keyword. */
+ControlCommand::ControlCommand(const QString &keyword)
+{
+ _keyword = keyword;
+}
+
+/** Creates a control command using the specified keyword and argument. */
+ControlCommand::ControlCommand(const QString &keyword, const QString &arg)
+{
+ _keyword = keyword;
+ addArgument(arg);
+}
+
+/** Creates a control command using the specified keyword and list of
+ * arguments. */
+ControlCommand::ControlCommand(const QString &keyword, const QStringList &args)
+{
+ _keyword = keyword;
+ _arguments = args;
+}
+
+/** Sets the keyword for this command. */
+void
+ControlCommand::setKeyword(const QString &keyword)
+{
+ _keyword = keyword;
+}
+
+/** Adds an argument to this command's argument list. */
+void
+ControlCommand::addArgument(const QString &arg)
+{
+ _arguments << arg;
+}
+
+/** Adds all arguments in <b>args</b> to this control command. */
+void
+ControlCommand::addArguments(const QStringList &args)
+{
+ foreach (QString arg, args) {
+ addArgument(arg);
+ }
+}
+
+/** Adds data to the end of this command. */
+void
+ControlCommand::appendData(const QString &data)
+{
+ _data << data;
+}
+
+/** Escapes any special characters in this command. */
+QString
+ControlCommand::escape(const QString &unescaped) const
+{
+ QString str = unescaped;
+ if (str.startsWith(".")) {
+ str.prepend(".");
+ }
+ if (str.endsWith("\r")) {
+ str.append("\n");
+ } else {
+ str.append("\r\n");
+ }
+ return str;
+}
+
+/** Formats a command according to Tor's Control Protocol V1. The proper
+ * format of a command is as follows:
+ *
+ * Command = Keyword Arguments CRLF / "+" Keyword Arguments CRLF Data
+ * Keyword = 1*ALPHA
+ * Arguments = *(SP / VCHAR)
+ */
+QString
+ControlCommand::toString() const
+{
+ int i;
+ QString str;
+
+ /* If this command contains data, then a "+" is prepended to the keyword */
+ if (_data.size() > 0) {
+ str = "+";
+ }
+ str += _keyword + " ";
+
+ /* Append all specified arguments separated by a space */
+ str += _arguments.join(" ");
+
+ /* Append whatever data lines have been specified */
+ if (_data.size() > 0) {
+ str += "\r\n";
+ for (i = 0; i < _data.size(); i++) {
+ str += escape(_data.at(i));
+ }
+ str += ".";
+ }
+ return str.append("\r\n");
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlCommand.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlCommand.h
new file mode 100644
index 0000000..0818f96
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlCommand.h
@@ -0,0 +1,59 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.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 ControlCommand.h
+** \version $Id: ControlCommand.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief A command sent to Tor's control interface
+*/
+
+#ifndef _CONTROLCOMMAND_H
+#define _CONTROLCOMMAND_H
+
+#include <QStringList>
+
+
+class ControlCommand
+{
+public:
+ ControlCommand();
+ ControlCommand(const QString &keyword);
+ ControlCommand(const QString &keyword, const QString &arg);
+ ControlCommand(const QString &keyword, const QStringList &args);
+
+ /** Returns the keyword for this control command. */
+ QString keyword() const { return _keyword; }
+
+ /** Set the keyword for this control command */
+ void setKeyword(const QString &keyword);
+
+ /** Add an argument to this control command */
+ void addArgument(const QString &arg);
+ /** Adds all arguments in <b>args</b> to this control command. */
+ void addArguments(const QStringList &args);
+
+ /** Append a data line for this control command */
+ void appendData(const QString &data);
+
+ /** Format this control command into a format conforming to Tor's v1
+ * protocol specification. */
+ QString toString() const;
+
+private:
+ /** Escape special characters in the supplied string */
+ QString escape(const QString &str) const;
+
+ QString _keyword;
+ QStringList _arguments;
+ QStringList _data;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlConnection.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlConnection.cpp
new file mode 100644
index 0000000..133c3db
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlConnection.cpp
@@ -0,0 +1,375 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 ControlConnection.cpp
+** \version $Id: ControlConnection.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief A connection to Tor's control interface, responsible for sending and
+** receiving commands and events
+*/
+
+#include "ControlConnection.h"
+#include "tcglobal.h"
+#include "stringutil.h"
+
+#include <QCoreApplication>
+#include <QMutexLocker>
+
+/** Maximum number of times we'll try to connect to Tor before giving up.*/
+#define MAX_CONNECT_ATTEMPTS 5
+/** Time to wait between control connection attempts (in milliseconds). */
+#define CONNECT_RETRY_DELAY 2*1000
+
+
+/** Default constructor. */
+ControlConnection::ControlConnection(TorEvents *events)
+{
+ _events = events;
+ _status = Unset;
+ _sock = 0;
+ _sendWaiter = new SendCommandEvent::SendWaiter();
+}
+
+/** Destructor. */
+ControlConnection::~ControlConnection()
+{
+ /* Exit the event loop */
+ exit();
+ /* Wait for the thread to finish */
+ wait();
+ /* Clean up after the send waiter */
+ delete _sendWaiter;
+}
+
+/** Connect to the specified Tor control interface. */
+void
+ControlConnection::connect(const QHostAddress &addr, quint16 port)
+{
+ if (isRunning()) {
+ tc::error("Bug: Tried to call ControlConnection::connect() when the "
+ "control thread is already running.");
+ return;
+ }
+
+ /* Save the destination information */
+ _addr = addr;
+ _port = port;
+ _sock = 0;
+ _connectAttempt = 0;
+ setStatus(Connecting);
+
+ /* Kick off the thread in which the control socket will live */
+ QThread::start();
+}
+
+/** Attempt to establish a connection to Tor's control interface. We will try
+ * a maximum of MAX_CONNECT_ATTEMPTS, waiting CONNECT_RETRY_DELAY between each
+ * attempt, to give slow Tors a chance to finish binding their control port. */
+void
+ControlConnection::connect()
+{
+ _connectAttempt++;
+ tc::debug("Connecting to Tor (Attempt %1 of %2)").arg(_connectAttempt)
+ .arg(MAX_CONNECT_ATTEMPTS);
+
+ _connMutex.lock();
+ _sock->connectToHost(_addr, _port);
+ _connMutex.unlock();
+}
+
+/** Disconnect from Tor's control interface. */
+void
+ControlConnection::disconnect()
+{
+ setStatus(Disconnecting);
+ _connMutex.lock();
+ _sock->disconnectFromHost();
+ _connMutex.unlock();
+}
+
+/** Called when the control socket is connected. This method checks that the
+ * control protocol version of the Tor we connected to is at least V1. */
+void
+ControlConnection::onConnected()
+{
+ setStatus(Connected);
+ emit connected();
+}
+
+/** Called when the control socket is disconnected and stops the control
+ * thread's event loop. */
+void
+ControlConnection::onDisconnected()
+{
+ setStatus(Disconnected);
+ emit disconnected();
+ exit(0);
+}
+
+/** Called when the control socket encounters <b>error</b>. */
+void
+ControlConnection::onError(QAbstractSocket::SocketError error)
+{
+ if (status() == Connecting) {
+ /* If we got a 'connection refused' and we haven't exceeded
+ * MAX_CONNECT_ATTEMPTS, then try to reconnect since Tor is probably
+ * running, but it doesn't have a ControlPort open yet. */
+ if (error == QAbstractSocket::ConnectionRefusedError &&
+ _connectAttempt < MAX_CONNECT_ATTEMPTS) {
+ tc::debug("Control connection refused. Retrying in %1ms.")
+ .arg(CONNECT_RETRY_DELAY);
+ _connectTimer->start(CONNECT_RETRY_DELAY);
+ } else {
+ /* Exceeded maximum number of connect attempts. Give up. */
+ QString errstr = ControlSocket::toString(error);
+ tc::error("Vidalia was unable to connect to Tor: %1").arg(errstr);
+ emit connectFailed(tr("Vidalia was unable to connect to Tor. (%1)")
+ .arg(errstr));
+ setStatus(Disconnected);
+ }
+ } else if (error == QAbstractSocket::RemoteHostClosedError) {
+ /* Tor closed the connection. This is common when we send a 'shutdown' or
+ * 'halt' signal to Tor and doesn't need to be logged as loudly. */
+ tc::warn("Tor closed the control connection.");
+ } else {
+ /* Some other error. */
+ /*XXX We may want to be emitting these so the GUI thread can learn about
+ * them and display an error message. */
+ tc::error("Control socket error: %1").arg(ControlSocket::toString(error));
+ }
+}
+
+/** Cancels a pending control connection to Tor. */
+void
+ControlConnection::cancelConnect()
+{
+ tc::warn("Control connection attempt cancelled.");
+ setStatus(Disconnected);
+ exit(0);
+}
+
+/** Returns true if the control socket is connected to Tor. */
+bool
+ControlConnection::isConnected()
+{
+ return (status() == Connected);
+}
+
+/** Returns the status of the control connection. */
+ControlConnection::Status
+ControlConnection::status()
+{
+ QMutexLocker locker(&_statusMutex);
+ return _status;
+}
+
+/** Returns a string description of the control Status value
+ * <b>status</b>. */
+QString
+ControlConnection::statusString(Status status)
+{
+ QString str;
+ switch (status) {
+ case Unset: str = "Unset"; break;
+ case Disconnected: str = "Disconnected"; break;
+ case Disconnecting: str = "Disconnecting"; break;
+ case Connecting: str = "Connecting"; break;
+ case Connected: str = "Connected"; break;
+ default: str = "unknown";
+ }
+ return str;
+}
+
+/** Sets the control connection 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;
+}
+
+/** Sends a control command to Tor and waits for the reply. */
+bool
+ControlConnection::send(const ControlCommand &cmd,
+ ControlReply &reply, QString *errmsg)
+{
+ 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();
+
+ /* 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();
+ }
+
+ if (!result && errmsg)
+ *errmsg = errstr;
+ return result;
+}
+
+/** Sends a control command to Tor and returns true if the command was sent
+ * successfully. Otherwise, returns false and <b>*errmsg</b> (if supplied)
+ * will be set. */
+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);
+}
+
+/** Called when there is data on the control socket. */
+void
+ControlConnection::onReadyRead()
+{
+ QMutexLocker locker(&_connMutex);
+ ReceiveWaiter *waiter;
+ QString errmsg;
+
+ while (_sock->canReadLine()) {
+ ControlReply reply;
+ if (_sock->readReply(reply, &errmsg)) {
+ if (reply.getStatus() == "650") {
+ /* Asynchronous event message */
+ tc::debug("Control Event: %1").arg(reply.toString());
+
+ if (_events) {
+ _events->handleEvent(reply);
+ }
+ } else {
+ /* 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);
+ }
+ }
+}
+
+/** Main thread implementation. Creates and connects a control socket, then
+ * spins up an event loop. */
+void
+ControlConnection::run()
+{
+ /* Create a new control socket */
+ _connMutex.lock();
+ _sock = new ControlSocket();
+ _connectTimer = new QTimer();
+ _connectTimer->setSingleShot(true);
+
+ QObject::connect(_sock, SIGNAL(readyRead()), this, SLOT(onReadyRead()),
+ Qt::DirectConnection);
+ QObject::connect(_sock, SIGNAL(disconnected()), this, SLOT(onDisconnected()),
+ Qt::DirectConnection);
+ QObject::connect(_sock, SIGNAL(connected()), this, SLOT(onConnected()),
+ Qt::DirectConnection);
+ QObject::connect(_sock, SIGNAL(error(QAbstractSocket::SocketError)),
+ this, SLOT(onError(QAbstractSocket::SocketError)),
+ Qt::DirectConnection);
+ 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();
+}
+
+
+/*
+ * ControlConnection::ReceiveWaiter
+ */
+/** Waits for and gets the reply from a control command. */
+bool
+ControlConnection::ReceiveWaiter::getResult(ControlReply *reply,
+ QString *errmsg)
+{
+ forever {
+ _mutex.lock();
+ if (_status == Waiting) {
+ _waitCond.wait(&_mutex);
+ _mutex.unlock();
+ } else {
+ _mutex.unlock();
+ break;
+ }
+ }
+ if (errmsg) {
+ *errmsg = _errmsg;
+ }
+ *reply = _reply;
+ return (_status == Success);
+}
+
+/** Sets the result and reply from a control command. */
+void
+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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlConnection.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlConnection.h
new file mode 100644
index 0000000..6b7e755
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlConnection.h
@@ -0,0 +1,130 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 ControlConnection.h
+** \version $Id: ControlConnection.h 4054 2009-08-17 02:25:08Z edmanm $
+** \brief A connection to Tor's control interface, responsible for sending and
+** receiving commands and events
+**/
+
+#ifndef _CONTROLCONNECTION_H
+#define _CONTROLCONNECTION_H
+
+#include "ControlSocket.h"
+#include "TorEvents.h"
+#include "SendCommandEvent.h"
+
+#include <QThread>
+#include <QMutex>
+#include <QQueue>
+#include <QWaitCondition>
+#include <QTimer>
+#include <QHostAddress>
+
+
+class ControlConnection : public QThread
+{
+ Q_OBJECT
+
+public:
+ /** Control connection status */
+ enum Status {
+ Unset, /**< Control connection status is not yet set. */
+ Disconnected, /**< Control connection disconnected. */
+ Disconnecting, /**< Control connection is disconnecting. */
+ Connecting, /**< Control connection attempt pending. */
+ Connected /**< Control connection established. */
+ };
+
+ /** Default constructor. */
+ ControlConnection(TorEvents *events = 0);
+ /** Destructor. */
+ ~ControlConnection();
+
+ /** Connect to the specified Tor control interface. */
+ void connect(const QHostAddress &addr, quint16 port);
+ /** Cancels a pending control connection to Tor. */
+ void cancelConnect();
+ /** Disconnect from Tor's control interface. */
+ void disconnect();
+ /** Returns true if the control socket is connected to Tor. */
+ bool isConnected();
+ /** Returns the status of the control connection. */
+ Status status();
+ /** Sends a control command to Tor and waits for the reply. */
+ bool send(const ControlCommand &cmd, ControlReply &reply, QString *errmsg = 0);
+ /** Sends a control command to Tor and does not wait for a reply. */
+ bool send(const ControlCommand &cmd, QString *errmsg = 0);
+
+signals:
+ /** Emitted when a control connection has been established. */
+ void connected();
+ /** Emitted when a control connection has been closed. */
+ void disconnected();
+ /** Emitted when a control connection fails. */
+ void connectFailed(QString errmsg);
+
+private slots:
+ /** Connects to Tor's control interface. */
+ void connect();
+ /** Called when there is data on the control socket. */
+ void onReadyRead();
+ /** Called when the control socket is connected. */
+ void onConnected();
+ /** Called when the control socket is disconnected. */
+ void onDisconnected();
+ /** Called when the control socket encounters an error. */
+ void onError(QAbstractSocket::SocketError error);
+
+private:
+ /** Sets the control connection status. */
+ void setStatus(Status status);
+ /** Returns the string description of <b>status</b>. */
+ QString statusString(Status status);
+ /** Main thread implementation. */
+ void run();
+
+ ControlSocket* _sock; /**< Socket used to communicate with Tor. */
+ TorEvents* _events; /**< Dispatches asynchronous events from Tor. */
+ Status _status; /**< Status of the control connection. */
+ QHostAddress _addr; /**< Address of Tor's control interface. */
+ quint16 _port; /**< Port of Tor's control interface. */
+ QMutex _connMutex; /**< Mutex around the control socket. */
+ QMutex _recvMutex; /**< Mutex around the queue of ReceiveWaiters. */
+ QMutex _statusMutex; /**< Mutex around the connection status value. */
+ int _connectAttempt; /**< How many times we've tried to connect to Tor while
+ waiting for Tor to start. */
+ QTimer* _connectTimer; /**< Timer used to delay connect attempts. */
+
+ /** Private class used to wait for a response to a control command. */
+ class ReceiveWaiter {
+ public:
+ /** Default constructor. */
+ ReceiveWaiter() { _status = Waiting; }
+ /** Waits for and gets the reply from a control command. */
+ bool getResult(ControlReply *reply, QString *errmsg = 0);
+ /** Sets the result and reply from a control command. */
+ void setResult(bool success, const ControlReply &reply,
+ const QString &errmsg = QString());
+ private:
+ /** Status of the receive waiter. */
+ enum ReceiveStatus { Waiting, Failed, Success } _status;
+ ControlReply _reply; /**< Reply to a previous command. */
+ QMutex _mutex; /**< Mutex around the wait condition. */
+ QWaitCondition _waitCond; /**< Waits for a control rpely. */
+ QString _errmsg; /**< Error message if the reply fails. */
+ };
+ QQueue<ReceiveWaiter *> _recvQueue; /**< Objects waiting for a reply. */
+ SendCommandEvent::SendWaiter* _sendWaiter;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlReply.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlReply.cpp
new file mode 100644
index 0000000..c5d971e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlReply.cpp
@@ -0,0 +1,78 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 ControlReply.cpp
+** \version $Id: ControlReply.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief A response from Tor's control interface
+*/
+
+#include "ControlReply.h"
+
+
+/** Default constructor */
+ControlReply::ControlReply()
+{
+}
+
+/** Add a line associated with this reply */
+void
+ControlReply::appendLine(ReplyLine line)
+{
+ _lines << line;
+}
+
+/** Returns the requested line from this reply */
+ReplyLine
+ControlReply::getLine(int idx) const
+{
+ return _lines.at(idx);
+}
+
+/** Returns all lines for this reply */
+QList<ReplyLine>
+ControlReply::getLines() const
+{
+ return _lines;
+}
+
+/** Returns the status of the first line in the reply */
+QString
+ControlReply::getStatus() const
+{
+ return getLine().getStatus();
+}
+
+/** Returns the message of the first line in the reply */
+QString
+ControlReply::getMessage() const
+{
+ return getLine().getMessage();
+}
+
+/** Returns the data for the first line in the reply. */
+QStringList
+ControlReply::getData() const
+{
+ return getLine().getData();
+}
+
+/** Returns the entire contents of the control reply. */
+QString
+ControlReply::toString() const
+{
+ QString str;
+ foreach (ReplyLine line, _lines) {
+ str.append(line.toString());
+ str.append("\n");
+ }
+ return str.trimmed();
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlReply.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlReply.h
new file mode 100644
index 0000000..db9ae24
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlReply.h
@@ -0,0 +1,53 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 ControlReply.h
+** \version $Id: ControlReply.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief A response from Tor's control interface
+*/
+
+#ifndef _CONTROLREPLY_H
+#define _CONTROLREPLY_H
+
+#include "ReplyLine.h"
+
+#include <QStringList>
+
+
+class ControlReply
+{
+public:
+ /** Default constructor */
+ ControlReply();
+
+ /** Add a line associated with this reply */
+ void appendLine(ReplyLine line);
+
+ /** Returns a single line from this reply */
+ ReplyLine getLine(int idx = 0) const;
+ /** Returns all lines for this reply */
+ QList<ReplyLine> getLines() const;
+
+ /** Returns the status of the first line in the reply */
+ QString getStatus() const;
+ /** Returns the messasge of the first line in the reply */
+ QString getMessage() const;
+ /** Returns the data for the first line in the reply. */
+ QStringList getData() const;
+ /** Returns the entire contents of the control reply. */
+ QString toString() const;
+
+private:
+ QList<ReplyLine> _lines;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlSocket.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlSocket.cpp
new file mode 100644
index 0000000..be0f275
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlSocket.cpp
@@ -0,0 +1,218 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 ControlSocket.cpp
+** \version $Id: ControlSocket.cpp 4054 2009-08-17 02:25:08Z edmanm $
+** \brief Socket used to connect to Tor's control interface
+*/
+
+#include "ControlSocket.h"
+#include "SendCommandEvent.h"
+#include "tcglobal.h"
+
+#include "stringutil.h"
+
+/** 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
+
+
+/** Default constructor. */
+ControlSocket::ControlSocket()
+{
+}
+
+/** Returns true if the control socket is connected and ready to send or
+ * receive. */
+bool
+ControlSocket::isConnected()
+{
+ return (isValid() && state() == QAbstractSocket::ConnectedState);
+}
+
+/** Processes custom events sent to this object (e.g. SendCommandEvents) from
+ * other threads. */
+void
+ControlSocket::customEvent(QEvent *event)
+{
+ if (event->type() == QEvent::User) {
+ SendCommandEvent *sce = dynamic_cast<SendCommandEvent *>(event);
+ if (! sce)
+ return;
+
+ QString errmsg;
+ bool result = sendCommand(sce->command(), &errmsg);
+ if (sce->waiter())
+ sce->waiter()->setResult(result, errmsg);
+ sce->accept();
+ }
+}
+
+/** Send a control command to Tor on the control socket, conforming to Tor's
+ * Control Protocol V1:
+ *
+ * Command = Keyword Arguments CRLF / "+" Keyword Arguments CRLF Data
+ * Keyword = 1*ALPHA
+ * Arguments = *(SP / VCHAR)
+ */
+bool
+ControlSocket::sendCommand(ControlCommand cmd, QString *errmsg)
+{
+ if (!isConnected()) {
+ return err(errmsg, tr("Control socket is not connected."));
+ }
+
+ /* Format the control command */
+ QString strCmd = cmd.toString();
+ tc::debug("Control Command: %1").arg(strCmd.trimmed());
+
+ /* Attempt to send the command to Tor */
+ if (write(strCmd.toAscii()) != strCmd.length()) {
+ return err(errmsg, tr("Error sending control command. [%1]")
+ .arg(errorString()));
+ }
+ flush();
+ return true;
+}
+
+/** Reads line data, one chunk at a time, until a newline character is
+ * encountered. */
+bool
+ControlSocket::readLineData(QString &line, QString *errmsg)
+{
+ char buffer[1024]; /* Read in 1024 byte chunks at a time */
+ int bytesRecv = QAbstractSocket::readLine(buffer, 1024);
+ while (bytesRecv != -1) {
+ line.append(buffer);
+ if (buffer[bytesRecv-1] == '\n') {
+ break;
+ }
+ bytesRecv = QAbstractSocket::readLine(buffer, 1024);
+ }
+ if (bytesRecv == -1) {
+ return err(errmsg, errorString());
+ }
+ return true;
+}
+
+/** Reads a line of data from the socket and returns true if successful or
+ * false if an error occurred while waiting for a line of data to become
+ * available. */
+bool
+ControlSocket::readLine(QString &line, QString *errmsg)
+{
+ /* Make sure we have data to read before attempting anything. Note that this
+ * essentially makes our socket a blocking socket */
+ while (!canReadLine()) {
+ if (!isConnected()) {
+ return err(errmsg, tr("Socket disconnected while attempting "
+ "to read a line of data."));
+ }
+ waitForReadyRead(READ_TIMEOUT);
+ }
+ line.clear();
+ return readLineData(line, errmsg);
+}
+
+/** Read a complete reply from the control socket. Replies take the following
+ * form, based on Tor's Control Protocol v1:
+ *
+ * Reply = *(MidReplyLine / DataReplyLine) EndReplyLine
+ *
+ * MidReplyLine = "-" ReplyLine
+ * DataReplyLine = "+" ReplyLine Data
+ * EndReplyLine = SP ReplyLine
+ * ReplyLine = StatusCode [ SP ReplyText ] CRLF
+ * ReplyText = XXXX
+ * StatusCode = XXiX
+ */
+bool
+ControlSocket::readReply(ControlReply &reply, QString *errmsg)
+{
+ QChar c;
+ QString line;
+
+ if (!isConnected()) {
+ return false;
+ }
+
+ /* The implementation below is (loosely) based on the Java control library
+ * from Tor */
+ do {
+ /* Read a line of the response */
+ if (!readLine(line, errmsg)) {
+ return false;
+ }
+
+ if (line.length() < 4) {
+ return err(errmsg, tr("Invalid control reply. [%1]").arg(line));
+ }
+
+ /* Parse the status and message */
+ ReplyLine replyLine(line.mid(0, 3), line.mid(4));
+ c = line.at(3);
+
+ /* If the reply line contains data, then parse out the data up until the
+ * trailing CRLF "." CRLF */
+ if (c == QChar('+') &&
+ !line.startsWith("250+PROTOCOLINFO")) {
+ /* XXX The second condition above is a hack to deal with Tor
+ * 0.2.0.5-alpha that gives a malformed PROTOCOLINFO reply. This
+ * should be removed once that version of Tor is sufficiently dead. */
+ while (true) {
+ if (!readLine(line, errmsg)) {
+ return false;
+ }
+ if (line.trimmed() == ".") {
+ break;
+ }
+ replyLine.appendData(line);
+ }
+ }
+ reply.appendLine(replyLine);
+ } while (c != QChar(' '));
+ return true;
+}
+
+/** Returns the string description of <b>error</b>. */
+QString
+ControlSocket::toString(const QAbstractSocket::SocketError error)
+{
+ QString str;
+ switch (error) {
+ case ConnectionRefusedError:
+ str = "Connection refused by peer."; break;
+ case RemoteHostClosedError:
+ str = "Remote host closed the connection."; break;
+ case HostNotFoundError:
+ str = "Host address not found."; break;
+ case SocketAccessError:
+ str = "Insufficient access privileges."; break;
+ case SocketResourceError:
+ str = "Insufficient resources."; break;
+ case SocketTimeoutError:
+ str = "Socket operation timed out."; break;
+ case DatagramTooLargeError:
+ str = "Datagram size exceeded the operating system limit."; break;
+ case NetworkError:
+ str = "Network error occurred."; break;
+ case AddressInUseError:
+ str = "Specified address already in use."; break;
+ case SocketAddressNotAvailableError:
+ str = "Specified address does not belong to the host."; break;
+ case UnsupportedSocketOperationError:
+ str = "The requested operation is not supported."; break;
+ default:
+ str = "An unidentified error occurred."; break;
+ }
+ return str;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlSocket.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlSocket.h
new file mode 100644
index 0000000..8d8b937
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ControlSocket.h
@@ -0,0 +1,57 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 ControlSocket.h
+** \version $Id: ControlSocket.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Socket used to connect to Tor's control interface
+*/
+
+#ifndef _CONTROLSOCKET_H
+#define _CONTROLSOCKET_H
+
+#include "ControlCommand.h"
+#include "ControlReply.h"
+
+#include <QTcpSocket>
+
+
+class ControlSocket : public QTcpSocket
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. */
+ ControlSocket();
+
+ /** Send a command to Tor */
+ bool sendCommand(ControlCommand cmd, QString *errmsg = 0);
+ /** Read a response from Tor */
+ bool readReply(ControlReply &reply, QString *errmsg = 0);
+
+ /** Returns true if the control socket is connected and ready to send or
+ * receive. */
+ bool isConnected();
+
+ /** Returns the string description of <b>error</b>. */
+ static QString toString(const QAbstractSocket::SocketError error);
+
+protected:
+ /** Processes custom events sent to this object (e.g. SendCommandEvents)
+ * from other threads. */
+ void customEvent(QEvent *event);
+ /** Reads line data off the socket in chunks. */
+ bool readLineData(QString &line, QString *errmsg = 0);
+ /** Reads a line of data from the socket (blocking) */
+ bool readLine(QString &line, QString *errmsg = 0);
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/LogEvent.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/LogEvent.cpp
new file mode 100644
index 0000000..92268fc
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/LogEvent.cpp
@@ -0,0 +1,80 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 LogEvent.cpp
+** \version $Id: LogEvent.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Event dispatched containing a log message from Tor
+*/
+
+#include "LogEvent.h"
+#include "eventtype.h"
+
+
+/** Default constructor */
+LogEvent::LogEvent(Severity severity, QString message)
+: QEvent((QEvent::Type)CustomEventType::LogEvent)
+{
+ _severity = severity;
+ _message = message.trimmed();
+}
+
+/** Converts a string description of a severity to its enum value */
+LogEvent::Severity
+LogEvent::toSeverity(QString strSeverity)
+{
+ Severity s;
+ strSeverity = strSeverity.toUpper();
+ if (strSeverity == "DEBUG") {
+ s = Debug;
+ } else if (strSeverity == "INFO") {
+ s = Info;
+ } else if (strSeverity == "NOTICE") {
+ s = Notice;
+ } else if (strSeverity == "WARN") {
+ s = Warn;
+ } else if (strSeverity == "ERR" || strSeverity == "ERROR") {
+ s = Error;
+ } else {
+ s = Unknown;
+ }
+ return s;
+}
+
+/** Converts a Severity enum value to a string description */
+QString
+LogEvent::severityToString(Severity s)
+{
+ QString str;
+ switch (s) {
+ case Debug: str = tr("Debug"); break;
+ case Info: str = tr("Info"); break;
+ case Notice: str = tr("Notice"); break;
+ case Warn: str = tr("Warning"); break;
+ case Error: str = tr("Error"); break;
+ default: str = tr("Unknown"); break;
+ }
+ return str;
+}
+
+/** Returns the severity of this log event */
+LogEvent::Severity
+LogEvent::severity() const
+{
+ return _severity;
+}
+
+/** Returns the message for this log event */
+QString
+LogEvent::message() const
+{
+ return _message;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/LogEvent.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/LogEvent.h
new file mode 100644
index 0000000..0d41122
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/LogEvent.h
@@ -0,0 +1,59 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.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 LogEvent.h
+** \version $Id: LogEvent.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Event dispatched containing a log message from Tor
+*/
+
+#ifndef _LOGEVENT_H
+#define _LOGEVENT_H
+
+#include <QCoreApplication>
+#include <QString>
+#include <QEvent>
+
+
+class LogEvent : public QEvent
+{
+ Q_DECLARE_TR_FUNCTIONS(LogEvent)
+
+public:
+ /** Log message severity levels */
+ enum Severity {
+ Unknown = 0,
+ Debug = (1u<<4), /**< Debug level log message. */
+ Info = (1u<<3), /**< Info level log message. */
+ Notice = (1u<<2), /**< Notice level log message. */
+ Warn = (1u<<1), /**< Warn level log message. */
+ Error = (1u<<0) /**< Error level log message. */
+ };
+
+ /** Default constructor */
+ LogEvent(Severity severity, QString message);
+
+ /** Converts the string description of a severity to its enum value */
+ static Severity toSeverity(QString strSeverity);
+ /** Converts the Severity enum value to a string description */
+ static QString severityToString(Severity severity);
+
+ /** Returns the severity of this log event */
+ Severity severity() const;
+ /** Returns the message for this log event */
+ QString message() const;
+
+private:
+ Severity _severity;
+ QString _message;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ProtocolInfo.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ProtocolInfo.cpp
new file mode 100644
index 0000000..fe839e2
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ProtocolInfo.cpp
@@ -0,0 +1,36 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 ProtocolInfo.cpp
+** \version $Id: ProtocolInfo.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Container for information in a PROTOCOLINFO reply from Tor
+*/
+
+#include "ProtocolInfo.h"
+
+
+/** Returns true if this ProtocolInfo object contains no data. */
+bool
+ProtocolInfo::isEmpty() const
+{
+ return (_torVersion.isEmpty()
+ && _authMethods.isEmpty()
+ && _cookieAuthFile.isEmpty());
+}
+
+/** Sets the authentication methods Tor currently accepts. <b>methods</b>
+ * should be a comma-delimited list of authentication methods. */
+void
+ProtocolInfo::setAuthMethods(const QString authMethods)
+{
+ _authMethods = authMethods.split(",");
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ProtocolInfo.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ProtocolInfo.h
new file mode 100644
index 0000000..94762b5
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ProtocolInfo.h
@@ -0,0 +1,56 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 ProtocolInfo.h
+** \version $Id: ProtocolInfo.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Container for information in a PROTOCOLINFO reply from Tor
+*/
+
+#ifndef _PROTOCOLINFO_H
+#define _PROTOCOLINFO_H
+
+#include <QStringList>
+
+
+class ProtocolInfo
+{
+public:
+ /** Default constructor. */
+ ProtocolInfo() {}
+
+ /** Returns true if this ProtocolInfo object contains no data. */
+ bool isEmpty() const;
+
+ /** Sets the authentication methods Tor currently accepts. <b>methods</b>
+ * should be a comma-delimited list of authentication methods. */
+ void setAuthMethods(const QString methods);
+ /** Returns the authentication methods Tor currently accepts. */
+ QStringList authMethods() const { return _authMethods; }
+
+ /** Sets the file to which Tor has written its authentication cookie. */
+ void setCookieAuthFile(const QString cookieAuthFile)
+ { _cookieAuthFile = cookieAuthFile; }
+ /** Returns the file to which Tor has written its authentication cookie. */
+ QString cookieAuthFile() const { return _cookieAuthFile; }
+
+ /** Sets the version of Tor to which the controller is connected. */
+ void setTorVersion(const QString torVersion) { _torVersion = torVersion; }
+ /** Returns the version of Tor to which the controller is connected. */
+ QString torVersionString() const { return _torVersion; }
+
+private:
+ QString _torVersion; /**< The Tor version in the PROTOCOLINFO reply. */
+ QString _cookieAuthFile; /**< Tor's authentication cookie file. */
+ QStringList _authMethods; /**< Tor's ccepted authentication methods. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ReplyLine.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ReplyLine.cpp
new file mode 100644
index 0000000..dac79c8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ReplyLine.cpp
@@ -0,0 +1,109 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 ReplyLine.cpp
+** \version $Id: ReplyLine.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Reply from a previous control command sent to Tor
+*/
+
+#include "ReplyLine.h"
+
+
+/** Default constructor */
+ReplyLine::ReplyLine()
+{
+}
+
+/** Constructor */
+ReplyLine::ReplyLine(const QString &status, const QString &msg)
+{
+ _status = status;
+ setMessage(msg);
+}
+
+/** Constructor */
+ReplyLine::ReplyLine(const QString &status, const QString &msg,
+ const QString &data)
+{
+ _status = status;
+ setMessage(msg);
+ appendData(data);
+}
+
+/** Set the status code for this reply line. See Tor Control Protocol V1
+ * specification for a description of status codes. */
+void
+ReplyLine::setStatus(const QString &status)
+{
+ _status = status;
+}
+
+/** Returns the status code for this reply line. */
+QString
+ReplyLine::getStatus() const
+{
+ return _status;
+}
+
+/** Sets the ReplyText message this reply line to <b>msg</b>. */
+void
+ReplyLine::setMessage(const QString &msg)
+{
+ _message = unescape(msg);
+}
+
+/** Returns the ReplyText portion of this reply line. */
+QString
+ReplyLine::getMessage() const
+{
+ return _message;
+}
+
+/** Appends <b>data</b> to this reply line. */
+void
+ReplyLine::appendData(const QString &data)
+{
+ _data << unescape(data);
+}
+
+/** Returns a QStringList of all data lines for this reply line */
+QStringList
+ReplyLine::getData() const
+{
+ return _data;
+}
+
+/** Unescapes special characters in <b>str</b> and returns the unescaped
+ * result. */
+QString
+ReplyLine::unescape(const QString &escaped)
+{
+ QString str = escaped;
+ /* If the line starts with a "." and was escaped, then unescape it */
+ if (str.startsWith("..")) {
+ str.remove(0, 1);
+ }
+
+ /* Trim off trailing whitespace (including \r\n) */
+ return str.trimmed();
+}
+
+QString
+ReplyLine::toString() const
+{
+ QString str = _status + " " + _message;
+ if (!_data.isEmpty()) {
+ str.append("\n");
+ str.append(_data.join("\n"));
+ }
+ return str;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ReplyLine.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ReplyLine.h
new file mode 100644
index 0000000..f544b63
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/ReplyLine.h
@@ -0,0 +1,62 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.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 ReplyLine.h
+** \version $Id: ReplyLine.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Reply from a previous control command sent to Tor
+*/
+
+#ifndef _REPLYLINE_H
+#define _REPLYLINE_H
+
+#include <QStringList>
+
+
+class ReplyLine
+{
+public:
+ ReplyLine();
+ ReplyLine(const QString &status, const QString &message);
+ ReplyLine(const QString &status, const QString &message, const QString &data);
+
+ /** Set the status code to <b>status</b>. */
+ void setStatus(const QString &status);
+ /** Returns the status code for this reply line. */
+ QString getStatus() const;
+
+ /** Sets the ReplyText message this reply line to <b>msg</b>. */
+ void setMessage(const QString &msg);
+ /** Returns the ReplyText portion of this reply line. */
+ QString getMessage() const;
+
+ /** Appends <b>data</b> to this reply line. */
+ void appendData(const QString &data);
+ /** Returns a QStringList of all data lines for this reply line. */
+ QStringList getData() const;
+ /** Returns true if this reply contained a data portion. */
+ bool hasData() const { return _data.size() > 0; }
+
+ /** Returns the entire contents of this reply line, including the status,
+ * message, and any extra data. */
+ QString toString() const;
+
+private:
+ /** Unescapes special characters in <b>str</b> and returns the unescaped
+ * result. */
+ static QString unescape(const QString &escaped);
+
+ QString _status; /**< Response status code. */
+ QString _message; /**< ReplyText portion of this reply line. */
+ QStringList _data; /**< Contents of any DataReplyLines in this line. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/RouterDescriptor.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/RouterDescriptor.cpp
new file mode 100644
index 0000000..51bf6fc
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/RouterDescriptor.cpp
@@ -0,0 +1,83 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 RouterDescriptor.cpp
+** \version $Id: RouterDescriptor.cpp 4144 2009-10-14 21:52:34Z edmanm $
+** \brief Parses a blob of router descriptor text from Tor
+*/
+
+#include "RouterDescriptor.h"
+
+#include <QtGlobal>
+
+
+/** Constructor. Just assigns the ID and determines whether the router is
+ * responsive or not based on the presence of a "!" at the start of the ID.
+ * See tor-spec.txt for details. */
+RouterDescriptor::RouterDescriptor(QStringList descriptor)
+{
+ _status = Online;
+ parseDescriptor(descriptor);
+}
+
+/** Parses this router's descriptor for relevant information. */
+void
+RouterDescriptor::parseDescriptor(QStringList descriptor)
+{
+ foreach (QString line, descriptor) {
+ if (line.startsWith("router ")) {
+ QStringList parts = line.remove(0,qstrlen("router ")).split(" ");
+ _name = parts.at(0);
+ _ip = QHostAddress(parts.at(1));
+ _orPort = (quint16)parts.at(2).toUInt();
+ _dirPort = (quint16)parts.at(4).toUInt();
+ } else if (line.startsWith("platform ")) {
+ _platform = line.remove(0,qstrlen("platform "));
+ } else if (line.startsWith("published ")) {
+ _published = QDateTime::fromString(
+ line.remove(0,qstrlen("published ")),
+ "yyyy-MM-dd HH:mm:ss");
+ _published.setTimeSpec(Qt::UTC);
+ } else if (line.startsWith("opt fingerprint ")) {
+ _fingerprint = line.remove(0,qstrlen("opt fingerprint "));
+ _id = _fingerprint.remove(" ");
+ } else if (line.startsWith("fingerprint ")) {
+ _fingerprint = line.remove(0,qstrlen("fingerprint "));
+ _id = _fingerprint.remove(" ");
+ } else if (line.startsWith("uptime ")) {
+ _uptime = (quint64)line.remove(0,qstrlen("uptime ")).toULongLong();
+ } else if (line.startsWith("bandwidth ")) {
+ QStringList bw = line.remove(0,qstrlen("bandwidth ")).split(" ");
+ _avgBandwidth = (quint64)bw.at(0).toULongLong();
+ _burstBandwidth = (quint64)bw.at(1).toULongLong();
+ _observedBandwidth = (quint64)bw.at(2).toULongLong();
+ } else if (line.startsWith("contact ")) {
+ _contact = line.remove(0,qstrlen("contact "));
+ } else if (line.startsWith("hibernating ")) {
+ if (line.remove(0,qstrlen("hibernating ")).trimmed() == "1") {
+ _status = Hibernating;
+ }
+ }
+ }
+}
+
+/** Returns a string representation of the status of this router. */
+QString
+RouterDescriptor::status()
+{
+ if (_status == Online) {
+ return tr("Online");
+ } else if (_status == Hibernating) {
+ return tr("Hibernating");
+ }
+ return tr("Offline");
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/RouterDescriptor.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/RouterDescriptor.h
new file mode 100644
index 0000000..12b7ec3
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/RouterDescriptor.h
@@ -0,0 +1,112 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 RouterDescriptor.h
+** \version $Id: RouterDescriptor.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Parses a blob of router descriptor text from Tor
+*/
+
+#ifndef _ROUTERDESCRIPTOR_H
+#define _ROUTERDESCRIPTOR_H
+
+#include <QCoreApplication>
+#include <QStringList>
+#include <QDateTime>
+#include <QList>
+#include <QHostAddress>
+
+
+class RouterDescriptor
+{
+ Q_DECLARE_TR_FUNCTIONS(RouterDescriptor)
+
+public:
+ /** Possible router states. */
+ enum RouterStatus {
+ Online, /**< Router is online and reachable. */
+ Hibernating, /**< Router is currently hibernating. */
+ Offline /**< Router is unresponsive. */
+ };
+
+ /** Default constructor. */
+ RouterDescriptor() {}
+ /** Constructor. */
+ RouterDescriptor(QStringList descriptor);
+
+ /** Returns the router's name. */
+ QString name() const { return _name; }
+ /** Returns the router's IP address. */
+ QHostAddress ip() const { return _ip; }
+ /** Returns the router's ORPort. */
+ quint16 orPort() const { return _orPort; }
+ /** Returns the router's DirPort. */
+ quint16 dirPort() const { return _dirPort; }
+ /** Returns the router's ID. */
+ QString id() const { return _id; }
+ /** Returns the platform on which this router is running. */
+ QString platform() const { return _platform; }
+ /** Returns the length of time this router has been up. */
+ quint64 uptime() const { return _uptime; }
+ /** Returns the router's contact information. */
+ QString contact() const { return _contact; }
+ /** Returns the date and time the router was published. */
+ QDateTime published() const { return _published; }
+ /** Returns the fingerprint for this router. */
+ QString fingerprint() const { return _fingerprint; }
+ /** Returns the average bandwidth for this router. */
+ quint64 averageBandwidth() const { return _avgBandwidth; }
+ /** Returns the burst bandwidth for this router. */
+ quint64 burstBandwidth() const { return _burstBandwidth; }
+ /** Returns the observed bandwidth for this router. */
+ quint64 observedBandwidth() const { return _observedBandwidth; }
+ /** Returns true if this router is online and responsive. */
+ bool online() const { return _status == Online; }
+ /** Returns true if this router is unresponsive. */
+ bool offline() const { return _status == Offline; }
+ /** Returns true if this router is hibernating. */
+ bool hibernating() const { return _status == Hibernating; }
+ /** Returns true if the router has neither a nickname or an ID. */
+ bool isEmpty() { return (_id.isEmpty() && _name.isEmpty()); }
+ /** Returns a string representation of the status of this router. */
+ QString status();
+
+ /** Returns geographic location information for this router. Note that this
+ * information is NOT part of the Tor directory protocol, but can be
+ * determined out of band and set using setLocation(). */
+ QString location() const { return _location; }
+ /** Sets geographic location information for this router. */
+ void setLocation(QString location) { _location = location; }
+ /** Sets the descriptors status to Offline if <b>offline</b> is true. */
+ void setOffline(bool offline) { _status = (offline ? Offline : Online); }
+
+private:
+ /** Parses this router's descriptor for relevant information. */
+ void parseDescriptor(QStringList descriptor);
+
+ RouterStatus _status; /**< Availability status of this router. */
+ QString _id; /**< Router's descriptor ID. */
+ QString _name; /**< The router's name. */
+ QString _fingerprint; /**< Router's fingerprint. */
+ QString _platform; /**< Platform on which router is running. */
+ QString _contact; /**< Router operator contact information. */
+ QHostAddress _ip; /**< Router's IP address. */
+ quint16 _orPort; /**< Router's ORPort. */
+ quint16 _dirPort; /**< Router's DirPort. */
+ QDateTime _published; /**< Date router descriptor was published. */
+ quint64 _uptime; /**< Time the router has been online. */
+ quint64 _avgBandwidth; /**< Average bandwidth. */
+ quint64 _burstBandwidth; /**< Burst bandwidth. */
+ quint64 _observedBandwidth; /**< Observed bandwidth. */
+ QString _location; /**< Geographic location information. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/RouterStatus.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/RouterStatus.cpp
new file mode 100644
index 0000000..83c9964
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/RouterStatus.cpp
@@ -0,0 +1,124 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 RouterStatus.cpp
+** \version $Id: RouterStatus.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Parses a blob of router status text from Tor
+*/
+
+#include "RouterStatus.h"
+
+#include "stringutil.h"
+
+/** Defines the time format used when parsing the published date and time from
+ * a router's status. */
+#define TIME_FORMAT "yyyy-MM-dd HH:mm:ss"
+
+
+/** Constructor. Parses <b>status</b> for router status information. The given
+ * string should match the router status entry format from Tor's dir-spec.txt.
+ * The currently recognized lines are:
+ *
+ * "r" SP nickname SP identity SP digest SP publication SP IP SP ORPort
+ * SP DirPort NL
+ * "s" SP Flags NL
+ *
+ * Unrecognized lines are currently ignored.
+ *
+ * */
+RouterStatus::RouterStatus(const QStringList &status)
+{
+ bool ok;
+
+ _valid = false;
+ _flags = 0;
+
+ foreach (QString line, status) {
+ if (line.startsWith("r ")) {
+ QStringList parts = line.split(" ", QString::SkipEmptyParts);
+ if (parts.size() < 9)
+ return;
+
+ /* Nickname */
+ _name = parts.at(1);
+ /* Identity key digest */
+ _id = base16_encode(QByteArray::fromBase64(parts.at(2).toAscii()));
+ if (_id.isEmpty())
+ return;
+ /* Most recent descriptor digest */
+ _digest = base16_encode(QByteArray::fromBase64(parts.at(3).toAscii()));
+ if (_digest.isEmpty())
+ return;
+ /* Most recent publication date */
+ _published = QDateTime::fromString(parts.at(4) + " " + parts.at(5),
+ TIME_FORMAT);
+ if (!_published.isValid())
+ return;
+ /* IP address */
+ _ipAddress = QHostAddress(parts.at(6));
+ if (_ipAddress.isNull())
+ return;
+ /* ORPort */
+ _orPort = parts.at(7).toUInt(&ok);
+ if (!ok)
+ return;
+ /* DirPort */
+ _dirPort = parts.at(8).toUInt(&ok);
+ if (!ok)
+ return;
+
+ _valid = true;
+ } else if (line.startsWith("s ")) {
+ /* Status flags */
+ QStringList flags = line.split(" ", QString::SkipEmptyParts);
+ flags.removeFirst(); /* Remove the "s" */
+
+ foreach (QString flag, flags) {
+ _flags |= flagValue(flag);
+ }
+ }
+ }
+}
+
+/** Returns a Flags enum value for the given router status <b>flag</b>. If
+ * <b>flag</b> is not recognized, then <i>Unknown</i> is returned. */
+RouterStatus::Flag
+RouterStatus::flagValue(const QString &flag)
+{
+ if (!flag.compare("Authority", Qt::CaseInsensitive))
+ return Authority;
+ if (!flag.compare("BadExit", Qt::CaseInsensitive))
+ return BadExit;
+ if (!flag.compare("BadDirectory", Qt::CaseInsensitive))
+ return BadDirectory;
+ if (!flag.compare("Exit", Qt::CaseInsensitive))
+ return Exit;
+ if (!flag.compare("Fast", Qt::CaseInsensitive))
+ return Fast;
+ if (!flag.compare("Guard", Qt::CaseInsensitive))
+ return Guard;
+ if (!flag.compare("HSDir", Qt::CaseInsensitive))
+ return HSDir;
+ if (!flag.compare("Named", Qt::CaseInsensitive))
+ return Named;
+ if (!flag.compare("Running", Qt::CaseInsensitive))
+ return Running;
+ if (!flag.compare("Stable", Qt::CaseInsensitive))
+ return Stable;
+ if (!flag.compare("Valid", Qt::CaseInsensitive))
+ return Valid;
+ if (!flag.compare("V2Dir", Qt::CaseInsensitive))
+ return V2Dir;
+ if (!flag.compare("V3Dir", Qt::CaseInsensitive))
+ return V3Dir;
+ return Unknown; /* Unknown status flag */
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/RouterStatus.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/RouterStatus.h
new file mode 100644
index 0000000..dafffb4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/RouterStatus.h
@@ -0,0 +1,101 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 RouterStatus.h
+** \version $Id: RouterStatus.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Parses a blob of router status text from Tor
+*/
+
+#ifndef _ROUTERSTATUS_H
+#define _ROUTERSTATUS_H
+
+#include <QFlags>
+#include <QStringList>
+#include <QHostAddress>
+#include <QDateTime>
+
+
+class RouterStatus
+{
+public:
+ /** Possible router status flags. */
+ enum Flag {
+ Unknown = 0x0000,
+ Authority = 0x0001,
+ BadExit = 0x0002,
+ BadDirectory = 0x0004,
+ Exit = 0x0008,
+ Fast = 0x0010,
+ Guard = 0x0020,
+ HSDir = 0x0040,
+ Named = 0x0080,
+ Stable = 0x0100,
+ Running = 0x0200,
+ Valid = 0x0400,
+ V2Dir = 0x0800,
+ V3Dir = 0x1000
+ };
+ Q_DECLARE_FLAGS(Flags, Flag)
+
+ /** Constructor. */
+ RouterStatus(const QStringList &status);
+
+ /** Returns the router's hexadecimal-encoded router identity key digest. */
+ QString id() const { return _id; }
+ /** Returns the router's nickname. */
+ QString name() const { return _name; }
+ /** Returns the hexadecimal-encoded digest of the router's most recent
+ * descriptor. */
+ QString descriptorDigest() const { return _digest; }
+ /** Returns the router's most recent IP address. */
+ QHostAddress ipAddress() const { return _ipAddress; }
+ /** Returns the publication time of the router's most recent descriptor. */
+ QDateTime published() const { return _published; }
+ /** Returns the router's OR port number. */
+ quint16 orPort() const { return _orPort; }
+ /** Returns the router's directory port number. */
+ quint16 dirPort() const { return _dirPort; }
+
+ /** Returns an OR-ed field of the router's current status flags. */
+ Flags flags() const { return _flags; }
+ /** Returns true if this router is currently listed as Running. */
+ bool isRunning() const { return (flags() & Running); }
+
+ /** Returns true if this router status object is valid. This method should
+ * be called to verify that the QStringList given in this object's
+ * constructor contained properly formatted router status lines. */
+ bool isValid() const { return _valid; }
+
+private:
+ /** Returns a Flags enum value for the given router status <b>flag</b>. If
+ * <b>flag</b> is not recognized, then <i>Unknown</i> is returned. */
+ Flag flagValue(const QString &flag);
+
+ bool _valid; /**< True if this object is a valid RouterStatus. */
+ QString _name; /**< Router nickname. */
+ QString _id; /**< Hexadecimal-encoded router identity digest. */
+ QString _digest; /**< Hexadecimal-encoded hash of the router's most recent
+ descriptor. */
+ QDateTime _published; /**< The publication time of the router's most recent
+ descriptor. */
+ QHostAddress _ipAddress; /**< Current IP address. */
+ quint16 _orPort; /**< Current OR port. */
+ quint16 _dirPort; /**< Current directory port. */
+ Flags _flags; /**< OR-ed field of the router's current status flags. */
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(RouterStatus::Flags)
+
+/** A collection of RouterStatus objects. */
+typedef QList<RouterStatus> NetworkStatus;
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/SendCommandEvent.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/SendCommandEvent.cpp
new file mode 100644
index 0000000..4bd5e86
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/SendCommandEvent.cpp
@@ -0,0 +1,67 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 SendEommandEvent.cpp
+** \version $Id: SendCommandEvent.cpp 4054 2009-08-17 02:25:08Z edmanm $
+** \brief An event posted to a socket living in another thread, indicating
+** that it should send the given control command.
+*/
+
+#include "SendCommandEvent.h"
+
+#include <QMutexLocker>
+
+
+SendCommandEvent::SendCommandEvent(const ControlCommand &cmd, SendWaiter *w)
+ : QEvent(QEvent::User)
+{
+ _cmd = cmd;
+ _waiter = w;
+}
+
+/** Sets the result of the send operation. */
+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;
+ }
+ }
+ if (errmsg) {
+ *errmsg = _errmsg;
+ }
+ return (_status == Success);
+}
+
+/** Returns the SendWaiter's current SenderStatus value. */
+SendCommandEvent::SendWaiter::SenderStatus
+SendCommandEvent::SendWaiter::status()
+{
+ QMutexLocker locker(&_mutex);
+ return _status;
+}
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/SendCommandEvent.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/SendCommandEvent.h
new file mode 100644
index 0000000..2fe2042
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/SendCommandEvent.h
@@ -0,0 +1,61 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 SendCommandEvent.h
+** \version $Id: SendCommandEvent.h 4054 2009-08-17 02:25:08Z edmanm $
+** \brief An event posted to a socket living in another thread, indicating
+** that it should send the given control command.
+*/
+
+#ifndef _SENDCOMMANDEVENT_H
+#define _SENDCOMMANDEVENT_H
+
+#include "ControlCommand.h"
+
+#include <QEvent>
+#include <QMutex>
+#include <QWaitCondition>
+
+
+class SendCommandEvent : public QEvent {
+public:
+ /** Object used to wait for the result of a send operation. */
+ class SendWaiter {
+ public:
+ /** Status of the send SendWaiter. */
+ enum SenderStatus { Waiting, Failed, Success } _status;
+ /** Default constructor. */
+ SendWaiter() { _status = Waiting; }
+ /** Sets the result of the send operation. */
+ void setResult(bool success, const QString &errmsg = QString());
+ /** Waits for and returns the result of the send operation. */
+ bool getResult(QString *errmsg = 0);
+ /** Returns the SendWaiter's current SenderStatus value. */
+ SenderStatus status();
+ private:
+ QMutex _mutex; /**< Mutex around the wait condition. */
+ QWaitCondition _waitCond; /**< Waits for the send to complete. */
+ QString _errmsg; /**< Error message if the send fails. */
+ };
+
+ /** Constructor. */
+ SendCommandEvent(const ControlCommand &cmd, SendWaiter *w = 0);
+ /** Returns the control command to send to Tor. */
+ ControlCommand command() { return _cmd; }
+ /** Returns a SendWaiter (if any) for the result of this send. */
+ SendWaiter* waiter() { return _waiter; }
+
+private:
+ ControlCommand _cmd; /**< Command to send to Tor. */
+ SendWaiter* _waiter; /**< SendWaiter for the result of this event. */
+};
+
+#endif
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/Stream.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/Stream.cpp
new file mode 100644
index 0000000..fd5bef9
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/Stream.cpp
@@ -0,0 +1,154 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 Stream.cpp
+** \version $Id: Stream.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Object representing a Tor stream
+*/
+
+#include "Stream.h"
+#include "Circuit.h"
+
+#include <QStringList>
+
+
+/** Default constructor. */
+Stream::Stream()
+{
+ _status = Unknown;
+ _port = 0;
+}
+
+/** Constructor */
+Stream::Stream(const StreamId &streamId, Status status,
+ const CircuitId &circuitId, const QString &address,
+ quint16 port)
+{
+ _streamId = streamId;
+ _status = status;
+ _circuitId = circuitId;
+ _address = address;
+ _port = port;
+}
+
+/** Constructor */
+Stream::Stream(const StreamId &streamId, Status status,
+ const CircuitId &circuitId, const QString &target)
+{
+ _streamId = streamId;
+ _status = status;
+ _circuitId = circuitId;
+ _port = 0;
+
+ int i = target.indexOf(":");
+ if (i >= 0)
+ _address = target.mid(0, i);
+ if (i + 1 < target.length())
+ _port = target.mid(i+1).toUInt();
+}
+
+/** Parses the given string for stream information, given in Tor control
+ * protocol format. The format is:
+ *
+ * StreamID SP StreamStatus SP CircID SP Target
+ */
+Stream
+Stream::fromString(const QString &stream)
+{
+ QStringList parts = stream.split(" ", QString::SkipEmptyParts);
+ if (parts.size() >= 4) {
+ /* Get the stream ID */
+ StreamId streamId = parts.at(0);
+ /* Get the stream status value */
+ Stream::Status status = Stream::toStatus(parts.at(1));
+ /* Get the ID of the circuit on which this stream travels */
+ CircuitId circId = parts.at(2);
+ /* Get the target address for this stream */
+ QString target = parts.at(3);
+
+ return Stream(streamId, status, circId, target);
+ }
+ return Stream();
+}
+
+/** Returns true iff <b>streamId</b> consists of only between 1 and 16
+ * (inclusive) ASCII-encoded letters and numbers. */
+bool
+Stream::isValidStreamId(const StreamId &streamId)
+{
+ int length = streamId.length();
+ if (length < 1 || length > 16)
+ 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')
+ return false;
+ }
+ return true;
+}
+
+/** Converts a string description of a stream's status to its enum value */
+Stream::Status
+Stream::toStatus(const QString &strStatus)
+{
+ if (!strStatus.compare("NEW", Qt::CaseInsensitive))
+ return New;
+ if (!strStatus.compare("NEWRESOLVE", Qt::CaseInsensitive))
+ return NewResolve;
+ if (!strStatus.compare("SENTCONNECT", Qt::CaseInsensitive))
+ return SentConnect;
+ if (!strStatus.compare("SENTRESOLVE", Qt::CaseInsensitive))
+ return SentResolve;
+ if (!strStatus.compare("SUCCEEDED", Qt::CaseInsensitive))
+ return Succeeded;
+ if (!strStatus.compare("FAILED", Qt::CaseInsensitive))
+ return Failed;
+ if (!strStatus.compare("CLOSED", Qt::CaseInsensitive))
+ return Closed;
+ if (!strStatus.compare("DETACHED", Qt::CaseInsensitive))
+ return Detached;
+ if (!strStatus.compare("REMAP", Qt::CaseInsensitive))
+ return Remap;
+ return Unknown;
+}
+
+/** Returns a human-understandable string representation of this
+ * stream's status. */
+QString
+Stream::statusString() const
+{
+ QString status;
+ switch (_status) {
+ case New: status = tr("New"); break;
+ case NewResolve:
+ case SentResolve: status = tr("Resolving"); break;
+ case SentConnect: status = tr("Connecting"); break;
+ case Succeeded: status = tr("Open"); break;
+ case Failed: status = tr("Failed"); break;
+ case Closed: status = tr("Closed"); break;
+ case Detached: status = tr("Retrying"); break;
+ case Remap: status = tr("Remapped"); break;
+ default: status = tr("Unknown"); break;
+ }
+ return status;
+}
+
+/** Returns true if all fields in this Stream object are valid. */
+bool
+Stream::isValid() const
+{
+ return (isValidStreamId(_streamId)
+ && Circuit::isValidCircuitId(_circuitId)
+ && (_status != Unknown)
+ && !_address.isEmpty());
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/Stream.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/Stream.h
new file mode 100644
index 0000000..af68d47
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/Stream.h
@@ -0,0 +1,101 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 Stream.h
+** \version $Id: Stream.h 4054 2009-08-17 02:25:08Z edmanm $
+** \brief Object representing a Tor stream
+*/
+
+#ifndef _STREAM_H
+#define _STREAM_H
+
+#include "Circuit.h"
+
+#include <QCoreApplication>
+#include <QString>
+#include <QObject>
+#include <QList>
+#include <QMetaType>
+
+/** Stream IDs contains 1-16 alphanumeric ASCII characters. */
+typedef QString StreamId;
+
+
+class Stream
+{
+ Q_DECLARE_TR_FUNCTIONS(Stream)
+
+public:
+ /** Stream status values */
+ enum Status {
+ Unknown, /**< Unknown status type given */
+ New, /**< New request to connect */
+ NewResolve, /**< New request to resolve an address */
+ SentConnect, /**< Sent a connect cell */
+ SentResolve, /**< Sent a resolve cell */
+ Succeeded, /**< Stream established */
+ Failed, /**< Stream failed */
+ Closed, /**< Stream closed */
+ Detached, /**< Detached from circuit */
+ Remap /**< Address re-mapped to another */
+ };
+
+ /** Default constructor */
+ Stream();
+ /** Constructor */
+ Stream(const StreamId &streamId, Status status, const CircuitId &circuitId,
+ const QString &target);
+ /** Constructor */
+ Stream(const StreamId &streamId, Status status, const CircuitId &circuitId,
+ const QString &address, quint16 port);
+
+ /** Parses the given string for a stream, in Tor control protocol format. */
+ static Stream fromString(const QString &stream);
+ /** Converts a string description of a stream's status to its enum value */
+ static Status toStatus(const QString &strStatus);
+
+ /** Returns true iff the Stream object's fields are all valid. */
+ bool isValid() const;
+
+ /** Returns the ID for this stream. */
+ StreamId id() const { return _streamId; }
+ /** Returns the status for this stream. */
+ Status status() const { return _status; }
+ /** Returns a string representation of this stream's status. */
+ QString statusString() const;
+ /** Returns the ID of the circuit to which this stream is assigned. */
+ CircuitId circuitId() const { return _circuitId; }
+ /** Returns the target address and port for this stream. */
+ QString target() const { return (_address + ":" + QString::number(_port)); }
+ /** Returns the target address for this stream. */
+ QString targetAddress() const { return _address; }
+ /** Returns the target port for this stream. */
+ quint16 targetPort() const { return _port; }
+
+ /** Returns true iff <b>streamId</b> consists of only between 1 and 16
+ * (inclusive) ASCII-encoded letters and numbers. */
+ static bool isValidStreamId(const StreamId &streamId);
+
+private:
+ StreamId _streamId; /**< Unique ID associated with this stream. */
+ CircuitId _circuitId; /**< ID of the circuit carrying this stream. */
+ QString _address; /**< Stream target address. */
+ Status _status; /**< Stream status value. */
+ quint16 _port; /**< Stream target port. */
+};
+
+Q_DECLARE_METATYPE(Stream);
+
+/** A collection of Stream objects. */
+typedef QList<Stream> StreamList;
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorControl.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorControl.cpp
new file mode 100644
index 0000000..191c0f6
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorControl.cpp
@@ -0,0 +1,1053 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 TorControl.cpp
+** \version $Id: TorControl.cpp 4100 2009-09-01 13:54:27Z edmanm $
+** \brief Object for interacting with the Tor process and control interface
+*/
+
+#include "TorControl.h"
+#include "RouterDescriptor.h"
+#include "ProtocolInfo.h"
+#include "RouterStatus.h"
+#include "file.h"
+#include "stringutil.h"
+
+#include <QHostAddress>
+#include <QVariantMap>
+
+
+/** Default constructor */
+TorControl::TorControl()
+{
+#define RELAY_SIGNAL(src, sig) \
+ QObject::connect((src), (sig), this, (sig))
+
+ /* Create a TorEvents object to receive and parse asynchronous events
+ * from Tor's control port, and relay them as external signals from
+ * this TorControl object. */
+ _eventHandler = new TorEvents(this);
+ RELAY_SIGNAL(_eventHandler, SIGNAL(circuitEstablished()));
+ RELAY_SIGNAL(_eventHandler, SIGNAL(dangerousTorVersion(tc::TorVersionStatus,
+ QString, QStringList)));
+ RELAY_SIGNAL(_eventHandler, SIGNAL(addressMapped(QString,QString,QDateTime)));
+ RELAY_SIGNAL(_eventHandler, SIGNAL(bandwidthUpdate(quint64, quint64)));
+ RELAY_SIGNAL(_eventHandler, SIGNAL(circuitStatusChanged(Circuit)));
+ RELAY_SIGNAL(_eventHandler, SIGNAL(streamStatusChanged(Stream)));
+ RELAY_SIGNAL(_eventHandler, SIGNAL(newDescriptors(QStringList)));
+ RELAY_SIGNAL(_eventHandler, SIGNAL(logMessage(tc::Severity, QString)));
+ RELAY_SIGNAL(_eventHandler, SIGNAL(dangerousPort(quint16, bool)));
+ RELAY_SIGNAL(_eventHandler, SIGNAL(socksError(tc::SocksError, QString)));
+ RELAY_SIGNAL(_eventHandler, SIGNAL(bootstrapStatusChanged(BootstrapStatus)));
+ RELAY_SIGNAL(_eventHandler, SIGNAL(clockSkewed(int, QString)));
+ RELAY_SIGNAL(_eventHandler, SIGNAL(bug(QString)));
+ RELAY_SIGNAL(_eventHandler, SIGNAL(dnsHijacked()));
+ RELAY_SIGNAL(_eventHandler, SIGNAL(dnsUseless()));
+ RELAY_SIGNAL(_eventHandler,
+ SIGNAL(externalAddressChanged(QHostAddress, QString)));
+ RELAY_SIGNAL(_eventHandler,
+ SIGNAL(checkingOrPortReachability(QHostAddress, quint16)));
+ RELAY_SIGNAL(_eventHandler,
+ SIGNAL(orPortReachabilityFinished(QHostAddress,quint16,bool)));
+ RELAY_SIGNAL(_eventHandler,
+ SIGNAL(checkingDirPortReachability(QHostAddress, quint16)));
+ RELAY_SIGNAL(_eventHandler,
+ SIGNAL(dirPortReachabilityFinished(QHostAddress,quint16,bool)));
+ RELAY_SIGNAL(_eventHandler,
+ SIGNAL(serverDescriptorRejected(QHostAddress, quint16, QString)));
+ RELAY_SIGNAL(_eventHandler,
+ SIGNAL(serverDescriptorAccepted(QHostAddress, quint16)));
+ RELAY_SIGNAL(_eventHandler, SIGNAL(serverDescriptorAccepted()));
+
+ /* Create an instance of a connection to Tor's control interface and give
+ * it an object to use to handle asynchronous events. */
+ _controlConn = new ControlConnection(_eventHandler);
+ RELAY_SIGNAL(_controlConn, SIGNAL(connected()));
+ RELAY_SIGNAL(_controlConn, SIGNAL(connectFailed(QString)));
+ QObject::connect(_controlConn, SIGNAL(disconnected()),
+ this, SLOT(onDisconnected()));
+
+ /* Create an object used to start and stop a Tor process. */
+ _torProcess = new TorProcess(this);
+ RELAY_SIGNAL(_torProcess, SIGNAL(started()));
+ RELAY_SIGNAL(_torProcess, SIGNAL(startFailed(QString)));
+ QObject::connect(_torProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
+ this, SLOT(onStopped(int, QProcess::ExitStatus)));
+ QObject::connect(_torProcess, SIGNAL(log(QString, QString)),
+ this, SLOT(onLogStdout(QString, QString)));
+
+#if defined(Q_OS_WIN32)
+ _torService = new TorService(this);
+ RELAY_SIGNAL(_torService, SIGNAL(started()));
+ RELAY_SIGNAL(_torService, SIGNAL(startFailed(QString)));
+ QObject::connect(_torService, SIGNAL(finished(int, QProcess::ExitStatus)),
+ this, SLOT(onStopped(int, QProcess::ExitStatus)));
+#endif
+#undef RELAY_SIGNAL
+}
+
+/** Default destructor */
+TorControl::~TorControl()
+{
+ /* Disconnect the control socket */
+ if (isConnected()) {
+ disconnect();
+ }
+ /* If we started our own Tor, stop it now */
+ if (isVidaliaRunningTor()) {
+ stop();
+ }
+ delete _controlConn;
+}
+
+/** Start the Tor process using the executable <b>tor</b> and the list of
+ * arguments in <b>args</b>. */
+void
+TorControl::start(const QString &tor, const QStringList &args)
+{
+ if (isRunning()) {
+ emit started();
+ } else {
+#if defined(Q_OS_WIN32)
+ /* If the Tor service is installed, run that. Otherwise, start a new
+ * Tor process. */
+ if (TorService::isSupported() && _torService->isInstalled())
+ _torService->start();
+ else
+ _torProcess->start(expand_filename(tor), args);
+#else
+ /* Start a new Tor process */
+ _torProcess->start(expand_filename(tor), args);
+#endif
+ }
+}
+
+/** 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);
+ return rc;
+}
+
+/** Emits a signal that the Tor process stopped */
+void
+TorControl::onStopped(int exitCode, QProcess::ExitStatus exitStatus)
+{
+ if (_controlConn->status() == ControlConnection::Connecting)
+ _controlConn->cancelConnect();
+
+ emit stopped();
+ emit stopped(exitCode, exitStatus);
+}
+
+/** 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
+TorControl::isVidaliaRunningTor()
+{
+ return (_torProcess->state() != QProcess::NotRunning);
+}
+
+/** Detect if the Tor process is running. */
+bool
+TorControl::isRunning()
+{
+ return (_torProcess->state() != QProcess::NotRunning
+ || _controlConn->isConnected());
+}
+
+/** Stops reading log messages from the Tor process's stdout. This has no
+ * effect if isVidaliaRunningTor() is false. */
+void
+TorControl::closeTorStdout()
+{
+ if (_torProcess)
+ _torProcess->closeStdout();
+}
+
+/** Called when Tor has printed a log message to stdout. */
+void
+TorControl::onLogStdout(const QString &severity, const QString &message)
+{
+ emit logMessage(tc::severityFromString(severity), message.trimmed());
+}
+
+/** Connect to Tor's control port. The control port to use is determined by
+ * Vidalia's configuration file. */
+void
+TorControl::connect(const QHostAddress &address, quint16 port)
+{
+ _controlConn->connect(address, port);
+}
+
+/** Disconnect from Tor's control port */
+void
+TorControl::disconnect()
+{
+ if (isConnected())
+ _controlConn->disconnect();
+}
+
+/** Emits a signal that the control socket disconnected from Tor */
+void
+TorControl::onDisconnected()
+{
+ if (_torProcess) {
+ /* If we're running a Tor process, then start reading logs from stdout
+ * again, in case our control connection just died but Tor is still
+ * running. In this case, there may be relevant information in the logs. */
+ _torProcess->openStdout();
+ }
+ /* Tor isn't running, so it has no version */
+ _torVersion = QString();
+
+ /* Let interested parties know we lost our control connection */
+ emit disconnected();
+}
+
+/** Check if the control socket is connected */
+bool
+TorControl::isConnected()
+{
+ return _controlConn->isConnected();
+}
+
+/** Send a message to Tor and reads the response. If Vidalia was unable to
+ * send the command to Tor or read its response, false is returned. If the
+ * response was read and the status code is not 250 OK, false is also
+ * returned. */
+bool
+TorControl::send(ControlCommand cmd, ControlReply &reply, QString *errmsg)
+{
+ if (_controlConn->send(cmd, reply, errmsg)) {
+ if (reply.getStatus() == "250") {
+ return true;
+ }
+ if (errmsg) {
+ *errmsg = reply.getMessage();
+ }
+ }
+ return false;
+}
+
+/** Sends a message to Tor and discards the response. */
+bool
+TorControl::send(ControlCommand cmd, QString *errmsg)
+{
+ ControlReply reply;
+ return send(cmd, reply, errmsg);
+}
+
+/** Sends an authentication cookie to Tor. The syntax is:
+ *
+ * "AUTHENTICATE" SP 1*HEXDIG CRLF
+ */
+bool
+TorControl::authenticate(const QByteArray cookie, QString *errmsg)
+{
+ ControlCommand cmd("AUTHENTICATE", base16_encode(cookie));
+ ControlReply reply;
+ QString str;
+
+ if (!send(cmd, reply, &str)) {
+ emit authenticationFailed(str);
+ return err(errmsg, str);
+ }
+ onAuthenticated();
+ return true;
+}
+
+/** Sends an authentication password to Tor. The syntax is:
+ *
+ * "AUTHENTICATE" SP QuotedString CRLF
+ */
+bool
+TorControl::authenticate(const QString &password, QString *errmsg)
+{
+ ControlCommand cmd("AUTHENTICATE", string_escape(password));
+ ControlReply reply;
+ QString str;
+
+ if (!send(cmd, reply, &str)) {
+ emit authenticationFailed(str);
+ return err(errmsg, str);
+ }
+ onAuthenticated();
+ return true;
+}
+
+/** Called when the controller has successfully authenticated to Tor. */
+void
+TorControl::onAuthenticated()
+{
+ /* The version of Tor isn't going to change while we're connected to it, so
+ * save it for later. */
+ getInfo("version", _torVersion);
+ /* We want to use verbose names in events and GETINFO results. */
+ useFeature("VERBOSE_NAMES");
+ /* We want to use extended events in all async events */
+ useFeature("EXTENDED_EVENTS");
+
+ emit authenticated();
+}
+
+/** Sends a PROTOCOLINFO command to Tor and parses the response. */
+ProtocolInfo
+TorControl::protocolInfo(QString *errmsg)
+{
+ ControlCommand cmd("PROTOCOLINFO", "1");
+ ControlReply reply;
+ ProtocolInfo pi;
+ QString msg, topic;
+ QHash<QString,QString> keyvals;
+ int idx;
+ bool ok;
+
+ if (!send(cmd, reply, errmsg))
+ return ProtocolInfo();
+
+ foreach (ReplyLine line, reply.getLines()) {
+ if (line.getStatus() != "250")
+ continue;
+
+ msg = line.getMessage().trimmed();
+ idx = msg.indexOf(" ");
+ topic = msg.mid(0, idx).toUpper();
+
+ if (idx > 0) {
+ keyvals = string_parse_keyvals(msg.mid(idx+1), &ok);
+ if (!ok)
+ continue; /* Ignore malformed lines */
+ } else {
+ keyvals = QHash<QString,QString>();
+ }
+
+ if (topic == "AUTH") {
+ if (keyvals.contains("METHODS"))
+ pi.setAuthMethods(keyvals.value("METHODS"));
+ if (keyvals.contains("COOKIEFILE"))
+ pi.setCookieAuthFile(keyvals.value("COOKIEFILE"));
+ } else if (topic == "VERSION") {
+ if (keyvals.contains("Tor"))
+ pi.setTorVersion(keyvals.value("Tor"));
+ }
+ }
+ return pi;
+}
+
+/** Tells Tor the controller wants to enable <b>feature</b> via the
+ * USEFEATURE control command. Returns true if the given feature was
+ * successfully enabled. */
+bool
+TorControl::useFeature(const QString &feature, QString *errmsg)
+{
+ ControlCommand cmd("USEFEATURE", feature);
+ return send(cmd, errmsg);
+}
+
+BootstrapStatus
+TorControl::bootstrapStatus(QString *errmsg)
+{
+ QString str = getInfo("status/bootstrap-phase").toString();
+ if (!str.isEmpty()) {
+ tc::Severity severity = tc::severityFromString(str.section(' ', 0, 0));
+ QHash<QString,QString> args = string_parse_keyvals(str);
+ return BootstrapStatus(severity,
+ BootstrapStatus::statusFromString(args.value("TAG")),
+ args.value("PROGRESS").toInt(),
+ args.value("SUMMARY"),
+ args.value("WARNING"),
+ tc::connectionStatusReasonFromString(args.value("REASON")),
+ BootstrapStatus::actionFromString(
+ args.value("RECOMMENDATION")));
+ }
+ return BootstrapStatus();
+}
+
+/** Returns true if Tor either has an open circuit or (on Tor >=
+ * 0.2.0.1-alpha) has previously decided it's able to establish a circuit. */
+bool
+TorControl::isCircuitEstablished()
+{
+ /* If Tor is recent enough, we can 'getinfo status/circuit-established' to
+ * see if Tor has an open circuit */
+ if (getTorVersion() >= 0x020001) {
+ QString tmp;
+ if (getInfo("status/circuit-established", tmp))
+ return (tmp == "1");
+ }
+
+ /* Either Tor was too old or our getinfo failed, so try to get a list of all
+ * circuits and check their statuses. */
+ CircuitList circs = getCircuits();
+ foreach (Circuit circ, circs) {
+ if (circ.status() == Circuit::Built)
+ return true;
+ }
+ return false;
+}
+
+/** Sends a GETINFO message to Tor based on the given map of keyvals. The
+ * syntax is:
+ *
+ * "GETINFO" 1*(SP keyword) CRLF
+ */
+bool
+TorControl::getInfo(QHash<QString,QString> &map, QString *errmsg)
+{
+ ControlCommand cmd("GETINFO");
+ ControlReply reply;
+
+ /* Add the keys as arguments to the GETINFO message */
+ foreach (QString key, map.keys()) {
+ cmd.addArgument(key);
+ }
+
+ /* Ask Tor for the specified info values */
+ if (send(cmd, reply, errmsg)) {
+ /* Parse the response for the returned values */
+ foreach (ReplyLine line, reply.getLines()) {
+ /* Split the "key=val" line and map them */
+ QStringList keyval = line.getMessage().split("=");
+ if (keyval.size() == 2) {
+ map.insert(keyval.at(0), keyval.at(1));
+ }
+ }
+ return true;
+ }
+ return false;
+}
+
+/** Sends a GETINFO message to Tor using the given list of <b>keys</b> and
+ * returns a QVariantMap containing the specified keys and their values as
+ * returned by Tor. Returns a default constructed QVariantMap on failure. */
+QVariantMap
+TorControl::getInfo(const QStringList &keys, QString *errmsg)
+{
+ ControlCommand cmd("GETINFO");
+ ControlReply reply;
+ QVariantMap infoMap;
+
+ cmd.addArguments(keys);
+ if (!send(cmd, reply, errmsg))
+ return QVariantMap();
+
+ foreach (ReplyLine line, reply.getLines()) {
+ QString msg = line.getMessage();
+ int index = msg.indexOf("=");
+ QString key = msg.mid(0, index);
+ QStringList val;
+
+ if (index > 0 && index < msg.length()-1)
+ val << msg.mid(index+1);
+ if (line.hasData())
+ val << line.getData();
+
+ if (infoMap.contains(key)) {
+ QStringList values = infoMap.value(key).toStringList();
+ values << val;
+ infoMap.insert(key, values);
+ } else {
+ infoMap.insert(key, val);
+ }
+ }
+ return infoMap;
+}
+
+/** Sends a GETINFO message to Tor with a single <b>key</b> and returns a
+ * QVariant containing the value returned by Tor. Returns a default
+ * constructed QVariant on failure. */
+QVariant
+TorControl::getInfo(const QString &key, QString *errmsg)
+{
+ QVariantMap map = getInfo(QStringList() << key, errmsg);
+ return map.value(key);
+}
+
+/** Overloaded method to send a GETINFO command for a single info value */
+bool
+TorControl::getInfo(QString key, QString &val, QString *errmsg)
+{
+ QHash<QString,QString> map;
+ map.insert(key, "");
+
+ if (getInfo(map, errmsg)) {
+ val = map.value(key);
+ return true;
+ }
+ return false;
+}
+
+/** Sends a signal to Tor */
+bool
+TorControl::signal(TorSignal::Signal sig, QString *errmsg)
+{
+ ControlCommand cmd("SIGNAL");
+ cmd.addArgument(TorSignal::toString(sig));
+
+ if (sig == TorSignal::Shutdown || sig == TorSignal::Halt) {
+ /* Tor closes the connection before giving us a response to any commands
+ * asking it to stop running, so don't try to get a response. */
+ return _controlConn->send(cmd, errmsg);
+ }
+ return send(cmd, errmsg);
+}
+
+/** Returns an address on which Tor is listening for application
+ * requests. If none are available, a null QHostAddress is returned. */
+QHostAddress
+TorControl::getSocksAddress(QString *errmsg)
+{
+ QHostAddress socksAddr;
+
+ /* If SocksPort is 0, then Tor is not accepting any application requests. */
+ if (getSocksPort() == 0) {
+ return QHostAddress::Null;
+ }
+
+ /* Get a list of SocksListenAddress lines and return the first valid IP
+ * address parsed from the list. */
+ QStringList addrList = getSocksAddressList(errmsg);
+ foreach (QString addr, addrList) {
+ addr = addr.mid(0, addr.indexOf(":"));
+ if (socksAddr.setAddress(addr)) {
+ return socksAddr;
+ }
+ }
+ /* Otherwise Tor is listening on its default 127.0.0.1 */
+ return QHostAddress::LocalHost;
+}
+
+/** Returns a (possibly empty) list of all currently configured
+ * SocksListenAddress entries. */
+QStringList
+TorControl::getSocksAddressList(QString *errmsg)
+{
+ QStringList addrList;
+ if (getConf("SocksListenAddress", addrList, errmsg)) {
+ return addrList;
+ }
+ return QStringList();
+}
+
+/** Returns a valid SOCKS port for Tor, or 0 if Tor is not accepting
+ * application requests. */
+quint16
+TorControl::getSocksPort(QString *errmsg)
+{
+ QList<quint16> portList = getSocksPortList(errmsg);
+ if (portList.size() > 0) {
+ return portList.at(0);
+ }
+ return 0;
+}
+
+/** Returns a list of all currently configured SOCKS ports. If Tor is not
+ * accepting any application connections, an empty list will be returned. */
+QList<quint16>
+TorControl::getSocksPortList(QString *errmsg)
+{
+ bool valid;
+ quint16 port, socksPort;
+ QString portString;
+ QList<quint16> portList;
+
+ /* Get the value of the SocksPort configuration variable */
+ if (getConf("SocksPort", portString, errmsg)) {
+ socksPort = (quint16)portString.toUInt(&valid);
+ if (valid) {
+ if (socksPort == 0) {
+ /* A SocksPort of 0 means Tor is not accepting any application
+ * connections. */
+ return QList<quint16>();
+ }
+ }
+ }
+ /* Get a list of SOCKS ports from SocksListenAddress entries */
+ QStringList addrList = getSocksAddressList(errmsg);
+ foreach (QString addr, addrList) {
+ if (addr.contains(":")) {
+ portString = addr.mid(addr.indexOf(":")+1);
+ port = (quint16)portString.toUInt(&valid);
+ if (valid) {
+ portList << port;
+ }
+ }
+ }
+ /* If there were no SocksListenAddress entries, or one or more of them did
+ * not specify a port, then add the value of SocksPort, too */
+ if (!portList.size() || (portList.size() != addrList.size())) {
+ portList << socksPort;
+ }
+ return portList;
+}
+
+/** Reeturns Tor's version as a string. */
+QString
+TorControl::getTorVersionString()
+{
+ return _torVersion;
+}
+
+/** Returns Tor's version as a numeric value. Note that this discards any
+ * version status flag, such as "-alpha" or "-rc". */
+quint32
+TorControl::getTorVersion()
+{
+ static QString versionString;
+ static quint32 version = 0;
+ quint8 major, minor, micro, patch;
+
+ /* Only recompute the version number if the version string changed */
+ if (versionString == _torVersion)
+ return version;
+ versionString = _torVersion;
+
+ /* Split the version string at either "." or "-" characters */
+ QStringList parts = versionString.split(QRegExp("\\.|-|\\ "));
+ if (parts.size() >= 4) {
+ major = (quint8)parts.at(0).toUInt();
+ minor = (quint8)parts.at(1).toUInt();
+ micro = (quint8)parts.at(2).toUInt();
+ patch = (quint8)parts.at(3).toUInt();
+ version = ((major << 24) | (minor << 16) | (micro << 8) | patch);
+ } else {
+ /* Couldn't parse the version string */
+ version = 0;
+ }
+ return version;
+}
+
+/** Sets an event and its handler. If add is true, then the event is added,
+ * otherwise it is removed. If set is true, then the given event will be
+ * registered with Tor. */
+bool
+TorControl::setEvent(TorEvents::Event e, bool add, bool set, QString *errmsg)
+{
+ _events = (add ? (_events | e) : (_events & ~e));
+ if (set && isConnected())
+ return setEvents(errmsg);
+ return true;
+}
+
+/** Register for the events currently in the event list */
+bool
+TorControl::setEvents(QString *errmsg)
+{
+ ControlCommand cmd("SETEVENTS");
+
+ for (TorEvents::Event e = TorEvents::EVENT_MIN; e <= TorEvents::EVENT_MAX;) {
+ if (_events & e)
+ cmd.addArgument(TorEvents::toString(e));
+ e = static_cast<TorEvents::Event>(e << 1);
+ }
+ return send(cmd, 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)
+{
+ ControlCommand cmd("SETCONF");
+
+ /* Add each keyvalue to the argument list */
+ foreach (QString key, map.uniqueKeys()) {
+ /* If a key has multiple values (e.g., a QMultiHash), they are stored
+ * in order from most recently inserted to least recently inserted.
+ * So, walk the list in reverse so that we append the configuration
+ * values to the SETCONF command in the same order they were inserted
+ * into the QHash. */
+ QList<QString> values = map.values(key);
+ for (int i = values.size()-1; i >= 0; i--) {
+ QString value = values.at(i);
+ if (value.length() > 0)
+ cmd.addArgument(key + "=" + string_escape(value));
+ else
+ cmd.addArgument(key);
+ }
+ }
+ return send(cmd, errmsg);
+}
+
+/** Sets a single configuration key to the given value. */
+bool
+TorControl::setConf(QString key, QString value, QString *errmsg)
+{
+ QHash<QString,QString> map;
+ map.insert(key, value);
+ return setConf(map, errmsg);
+}
+
+/** Sets a single configuration string that is formatted <key=escaped value>.*/
+bool
+TorControl::setConf(QString keyAndValue, QString *errmsg)
+{
+ QHash<QString,QString> map;
+ map.insert(keyAndValue, "");
+ return setConf(map, errmsg);
+}
+
+/** Gets values for a set of configuration keys, each of which has a single
+ * value. */
+bool
+TorControl::getConf(QHash<QString,QString> &map, QString *errmsg)
+{
+ QHash<QString,QStringList> multiMap;
+ foreach (QString key, map.keys()) {
+ multiMap.insert(key, QStringList());
+ }
+ if (getConf(multiMap, errmsg)) {
+ foreach (QString key, multiMap.keys()) {
+ if (map.contains(key)) {
+ map.insert(key, multiMap.value(key).join("\n"));
+ }
+ }
+ }
+ return false;
+}
+
+/** Gets a set of configuration keyvalues and stores them in <b>map</b>. */
+bool
+TorControl::getConf(QHash<QString,QStringList> &map, QString *errmsg)
+{
+ ControlCommand cmd("GETCONF");
+ ControlReply reply;
+ QStringList confValue;
+ QString confKey;
+
+ /* Add the keys as arguments to the GETINFO message */
+ foreach (QString key, map.keys()) {
+ cmd.addArgument(key);
+ }
+
+ /* Ask Tor for the specified info values */
+ if (send(cmd, reply, errmsg)) {
+ /* Parse the response for the returned values */
+ foreach (ReplyLine line, reply.getLines()) {
+ /* Split the "key=val" line and map them */
+ QStringList keyval = line.getMessage().split("=");
+ if (keyval.size() == 2) {
+ confKey = keyval.at(0);
+
+ if (map.contains(confKey)) {
+ /* This configuration key has multiple values, so add this one to
+ * the list. */
+ confValue = map.value(confKey);
+ }
+ confValue << keyval.at(1);
+ map.insert(keyval.at(0), confValue);
+ }
+ }
+ return true;
+ }
+ return false;
+}
+
+/** Gets a single configuration value for <b>key</b>. */
+bool
+TorControl::getConf(QString key, QString &value, QString *errmsg)
+{
+ QStringList confValues;
+ if (getConf(key, confValues, errmsg)) {
+ value = confValues.join("\n");
+ return true;
+ }
+ return false;
+}
+
+/** Gets a list of configuration values for <b>key</b>. */
+bool
+TorControl::getConf(QString key, QStringList &value, QString *errmsg)
+{
+ QHash<QString,QStringList> map;
+ map.insert(key, QStringList());
+
+ if (getConf(map, errmsg)) {
+ value = map.value(key);
+ return true;
+ }
+ return false;
+}
+
+/** Sends a GETICONF message to Tor using the given list of <b>keys</b> and
+ * returns a QVariantMap containing the specified keys and their values as
+ * returned by Tor. Returns a default constructed QVariantMap on failure. */
+QVariantMap
+TorControl::getConf(const QStringList &keys, QString *errmsg)
+{
+ ControlCommand cmd("GETCONF");
+ ControlReply reply;
+ QVariantMap confMap;
+
+ cmd.addArguments(keys);
+ if (!send(cmd, reply, errmsg))
+ return QVariantMap();
+
+ foreach (ReplyLine line, reply.getLines()) {
+ QString msg = line.getMessage();
+ int index = msg.indexOf("=");
+ QString key = msg.mid(0, index);
+ QString val;
+
+ if (index > 0 && index < msg.length()-1)
+ val = msg.mid(index+1);
+
+ if (confMap.contains(key)) {
+ QStringList values = confMap.value(key).toStringList();
+ values << val;
+ confMap.insert(key, values);
+ } else {
+ confMap.insert(key, val);
+ }
+ }
+ return confMap;
+}
+
+/** Sends a GETCONF message to Tor with a single <b>key</b> and returns a
+ * QVariant containing the value returned by Tor. Returns a default
+ * constructed QVariant on failure. */
+QVariant
+TorControl::getConf(const QString &key, QString *errmsg)
+{
+ QVariantMap map = getConf(QStringList() << key, errmsg);
+ return map.value(key);
+}
+
+/** Sends a GETCONF message to Tor with the single key and returns a QString
+ * containing the value returned by Tor */
+QString
+TorControl::getHiddenServiceConf(const QString &key, QString *errmsg)
+{
+ ControlCommand cmd("GETCONF");
+ ControlReply reply;
+ QVariantMap confMap;
+
+ cmd.addArgument(key);
+ if (!send(cmd, reply, errmsg))
+ return "";
+
+ return reply.toString();
+}
+
+/** Asks Tor to save the current configuration to its torrc. */
+bool
+TorControl::saveConf(QString *errmsg)
+{
+ ControlCommand cmd("SAVECONF");
+ return send(cmd, errmsg);
+}
+
+/** Tells Tor to reset the given configuration keys back to defaults. */
+bool
+TorControl::resetConf(QStringList keys, QString *errmsg)
+{
+ ControlCommand cmd("RESETCONF");
+
+ /* Add each key to the argument list */
+ foreach (QString key, keys) {
+ cmd.addArgument(key);
+ }
+ return send(cmd, errmsg);
+}
+
+/** Tells Tor to reset a single given configuration key back to its default
+ * value. */
+bool
+TorControl::resetConf(QString key, QString *errmsg)
+{
+ return resetConf(QStringList() << key, errmsg);
+}
+
+/** Returns an unparsed router descriptor for the router whose fingerprint
+ * matches <b>id</b>. The returned text can later be parsed by the
+ * RouterDescriptor class. If <b>id</b> is invalid, then an empty
+ * QStringList is returned. */
+QStringList
+TorControl::getRouterDescriptorText(const QString &id, QString *errmsg)
+{
+ return getInfo("desc/id/" + id, errmsg).toStringList();
+}
+
+/** Returns the descriptor for the router whose fingerprint matches
+ * <b>id</b>. If <b>id</b> is invalid or the router's descriptor cannot
+ * be parsed, then an invalid RouterDescriptor is returned. */
+RouterDescriptor
+TorControl::getRouterDescriptor(const QString &id, QString *errmsg)
+{
+ return RouterDescriptor(getRouterDescriptorText(id, errmsg));
+}
+
+/** Returns the status of the router whose fingerprint matches <b>id</b>. If
+ * <b>id</b> is invalid or the router's status cannot be parsed, then an
+ * invalid RouterStatus is returned. */
+RouterStatus
+TorControl::getRouterStatus(const QString &id, QString *errmsg)
+{
+ QStringList status = getInfo("ns/id/" + id, errmsg).toStringList();
+ return RouterStatus(status);
+}
+
+/** Returns a RouterStatus object for every known router in the network. If
+ * the network status document cannot be parsed, then an empty NetworkStatus
+ * is returned. */
+NetworkStatus
+TorControl::getNetworkStatus(QString *errmsg)
+{
+ QStringList networkStatusLines = getInfo("ns/all", errmsg).toStringList();
+ QList<RouterStatus> networkStatus;
+ int len = networkStatusLines.size();
+ int i = 0;
+
+ while (i < len) {
+ /* Extract the "r", "s", and whatever other status lines */
+ QStringList routerStatusLines;
+ do {
+ routerStatusLines << networkStatusLines.at(i);
+ } while (++i < len && ! networkStatusLines.at(i).startsWith("r "));
+
+ /* Create a new RouterStatus object and add it to the network status, if
+ * it's valid. */
+ RouterStatus routerStatus(routerStatusLines);
+ if (routerStatus.isValid())
+ networkStatus << routerStatus;
+ }
+ return networkStatus;
+}
+
+/** Returns the annotations for the router whose fingerprint matches
+ * <b>id</b>. If <b>id</b> is invalid or the router's annotations cannot be
+ * parsed, then an empty DescriptorAnnotations is returned and <b>errmsg</b>
+ * is set if it's not NULL. (Tor >= 0.2.0.13-alpha only) */
+DescriptorAnnotations
+TorControl::getDescriptorAnnotations(const QString &id, QString *errmsg)
+{
+ QStringList lines = getInfo("desc-annotations/id/"+id, errmsg).toStringList();
+ DescriptorAnnotations annotations;
+ QString key, value;
+
+ foreach (QString line, lines) {
+ int idx = line.indexOf(" ");
+
+ /* Extract the annotation key */
+ key = line.mid(0, idx);
+ if (key.startsWith("@"))
+ key = key.remove(0, 1);
+
+ /* Extract the annotation value (if present) */
+ if (idx > 0 && idx < line.length()-1)
+ annotations.insert(key, line.mid(idx + 1).trimmed());
+ else
+ annotations.insert(key, QString());
+ }
+ return annotations;
+}
+
+/** Gets a list of current circuits. */
+QList<Circuit>
+TorControl::getCircuits(QString *errmsg)
+{
+ ControlCommand cmd("GETINFO", "circuit-status");
+ ControlReply reply;
+ CircuitList circuits;
+
+ if (!send(cmd, reply, errmsg))
+ return CircuitList();
+
+ /* The rest of the circuits just come as data, one per line */
+ foreach(QString line, reply.getData()) {
+ Circuit circ(line);
+ if (circ.isValid())
+ circuits << circ;
+ }
+ return circuits;
+}
+
+/** 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. */
+bool
+TorControl::closeCircuit(const CircuitId &circId, bool ifUnused, QString *errmsg)
+{
+ ControlCommand cmd("CLOSECIRCUIT", circId);
+ if (ifUnused) {
+ cmd.addArgument("IfUnused");
+ }
+ return send(cmd, errmsg);
+}
+
+/** Gets a list of current streams. */
+QList<Stream>
+TorControl::getStreams(QString *errmsg)
+{
+ ControlCommand cmd("GETINFO", "stream-status");
+ ControlReply reply;
+ QList<Stream> streams;
+ Stream s;
+
+ if (send(cmd, reply, errmsg)) {
+ /* Sometimes there is a stream on the first message line */
+ QString msg = reply.getMessage();
+ s = Stream::fromString(msg.mid(msg.indexOf("=")+1));
+ if (s.isValid())
+ streams << s;
+
+ /* The rest of the streams just come as data, one per line */
+ foreach (QString line, reply.getData()) {
+ s = Stream::fromString(line);
+ if (s.isValid())
+ streams << s;
+ }
+ }
+ return streams;
+}
+
+/** Closes the stream specified by <b>streamId</b>. */
+bool
+TorControl::closeStream(const StreamId &streamId, QString *errmsg)
+{
+ ControlCommand cmd("CLOSESTREAM", streamId);
+ cmd.addArgument("1"); /* 1 == REASON_MISC (tor-spec.txt) */
+ return send(cmd, errmsg);
+}
+
+ /** 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)
+{
+ AddressMap addressMap;
+ QStringList entries;
+
+ switch (type) {
+ case AddressMap::AddressMapConfig:
+ entries = getInfo("address-mappings/config").toStringList();
+ break;
+ case AddressMap::AddressMapCache:
+ entries = getInfo("address-mappings/cache").toStringList();
+ break;
+ case AddressMap::AddressMapControl:
+ entries = getInfo("address-mappings/control").toStringList();
+ break;
+ default:
+ entries = getInfo("address-mappings/all").toStringList();
+ }
+
+ foreach (QString entry, entries) {
+ addressMap.add(entry);
+ }
+ return addressMap;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorControl.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorControl.h
new file mode 100644
index 0000000..d670741
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorControl.h
@@ -0,0 +1,402 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 TorControl.h
+** \version $Id: TorControl.h 4060 2009-08-20 03:41:13Z edmanm $
+** \brief Object for interacting with the Tor process and control interface
+*/
+
+#ifndef _TORCONTROL_H
+#define _TORCONTROL_H
+
+#include "tcglobal.h"
+#include "ControlConnection.h"
+#include "TorProcess.h"
+#include "TorEvents.h"
+#include "TorSignal.h"
+#include "RouterDescriptor.h"
+#include "RouterStatus.h"
+#include "BootstrapStatus.h"
+#include "Circuit.h"
+#include "Stream.h"
+#include "AddressMap.h"
+
+#if defined(Q_OS_WIN32)
+#include "TorService.h"
+#endif
+
+#include <QObject>
+#include <QHash>
+#include <QList>
+#include <QStringList>
+#include <QVariantMap>
+
+class ProtocolInfo;
+
+/** DescriptorAnnotations stores a map of annotation keys to (possibly empty)
+ * annotation values. */
+typedef QHash<QString,QString> DescriptorAnnotations;
+
+
+class TorControl : public QObject
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor */
+ TorControl();
+ /** Default destructor */
+ ~TorControl();
+
+ /** 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 */
+ bool isRunning();
+ /** Detects if the Tor process is running under Vidalia. */
+ bool isVidaliaRunningTor();
+ /** Stops reading log messages from the Tor process's stdout. This has no
+ * effect if isVidaliaRunningTor() is false. */
+ void closeTorStdout();
+
+ /** Connect to Tor's control socket */
+ void connect(const QHostAddress &address, quint16 port);
+ /** 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);
+ /** Sends an authentication password to Tor. */
+ bool authenticate(const QString &password = QString(), QString *errmsg = 0);
+
+ /** Sends a PROTOCOLINFO command to Tor and parses the response. */
+ ProtocolInfo protocolInfo(QString *errmsg = 0);
+
+ /** Returns the Tor software's current bootstrap phase and status. */
+ BootstrapStatus bootstrapStatus(QString *errmsg = 0);
+
+ /** Returns true if Tor either has an open circuit or (on Tor >=
+ * 0.2.0.1-alpha) has previously decided it's able to establish a circuit. */
+ bool isCircuitEstablished();
+
+ /** Sends a GETINFO message to Tor based on the given keys */
+ bool getInfo(QHash<QString,QString> &map, QString *errmsg = 0);
+ /** Sends a GETINFO message for a single info value to Tor */
+ bool getInfo(QString key, QString &val, QString *errmsg = 0);
+
+ /** Sends a GETINFO message to Tor using the given list of <b>keys</b> and
+ * returns a QVariantMap containing the specified keys and their values as
+ * returned by Tor. Returns a default constructed QVariantMap on failure. */
+ QVariantMap getInfo(const QStringList &keys, QString *errmsg = 0);
+ /** Sends a GETINFO message to Tor with a single <b>key</b> and returns a
+ * QVariant containing the value returned by Tor. Returns a default
+ * constructed QVariant on failure. */
+ QVariant getInfo(const QString &key, QString *errmsg = 0);
+
+ /** Sends a signal to Tor */
+ bool signal(TorSignal::Signal sig, QString *errmsg = 0);
+
+ /** Returns an address on which Tor is listening for application
+ * requests. If none are available, a null QHostAddress is returned. */
+ QHostAddress getSocksAddress(QString *errmsg = 0);
+ /** Returns a (possibly empty) list of all currently configured
+ * SocksListenAddress entries. */
+ QStringList getSocksAddressList(QString *errmsg = 0);
+ /** Returns a valid SOCKS port for Tor, or 0 if Tor is not accepting
+ * application requests. */
+ quint16 getSocksPort(QString *errmsg = 0);
+ /** Returns a list of all currently configured SOCKS ports. If Tor is not
+ * accepting any application connections, an empty list will be returned. */
+ QList<quint16> getSocksPortList(QString *errmsg = 0);
+
+ /** Returns Tor's version as a string. */
+ QString getTorVersionString();
+ /** Returns Tor's version as a numeric value. */
+ quint32 getTorVersion();
+
+ /** Sets an event and its handler. If add is true, then the event is added,
+ * otherwise it is removed. If set is true, then the given event will be
+ * registered with Tor. */
+ bool setEvent(TorEvents::Event e, bool add = true, bool set = true,
+ QString *errmsg = 0);
+ /** Register events of interest with Tor */
+ 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);
+ /** Sets a single configuration key to the given value. */
+ bool setConf(QString key, QString value, QString *errmsg = 0);
+ /** Sets a single configuration string that is formatted <key=escaped value>. */
+ bool setConf(QString keyAndValue, QString *errmsg = 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);
+ /** Gets a set of configuration keyvalues and stores them in <b>map</b>. */
+ bool getConf(QHash<QString,QStringList> &map, QString *errmsg = 0);
+ /** Gets a single configuration value for <b>key</b>. */
+ bool getConf(QString key, QString &value, QString *errmsg = 0);
+ /** Gets a list of configuration values for <b>key</b>. */
+ bool getConf(QString key, QStringList &value, QString *errmsg = 0);
+
+ /** Sends a GETCONF message to Tor using the given list of <b>keys</b> and
+ * returns a QVariantMap containing the specified keys and their values as
+ * returned by Tor. Returns a default constructed QVariantMap on failure. */
+ QVariantMap getConf(const QStringList &keys, QString *errmsg = 0);
+ /** Sends a GETCONF message to Tor with a single <b>key</b> and returns a
+ * QVariant containing the value returned by Tor. Returns a default
+ * constructed QVariant on failure. */
+ QVariant getConf(const QString &key, QString *errmsg = 0);
+ /** 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);
+
+ /** Asks Tor to save the current configuration to its torrc */
+ bool saveConf(QString *errmsg = 0);
+ /** Tells Tor to reset the given configuration keys back to defaults. */
+ bool resetConf(QStringList keys, QString *errmsg = 0);
+ /** Tells Tor to reset a configuration key back to its default value. */
+ bool resetConf(QString key, QString *errmsg = 0);
+
+ /** Returns an unparsed router descriptor for the router whose fingerprint
+ * matches <b>id</b>. The returned text can later be parsed by the
+ * RouterDescriptor class. If <b>id</b> is invalid, then an empty
+ * QStringList is returned. */
+ QStringList getRouterDescriptorText(const QString &id, QString *errmsg = 0);
+ /** Returns the descriptor for the router whose fingerprint matches
+ * <b>id</b>. If <b>id</b> is invalid or the router's descriptor cannot be
+ * parsed, then an invalid RouterDescriptor is returned. */
+ RouterDescriptor getRouterDescriptor(const QString &id, QString *errmsg = 0);
+ /** Returns the status of the router whose fingerprint matches <b>id</b>. If
+ * <b>id</b> is invalid or the router's status cannot be parsed, then an
+ * invalid RouterStatus is returned. */
+ RouterStatus getRouterStatus(const QString &id, QString *errmsg = 0);
+ /** Returns a RouterStatus object for every known router in the network. If
+ * the network status document cannot be parsed, then an empty NetworkStatus
+ * is returned. */
+ NetworkStatus getNetworkStatus(QString *errmsg = 0);
+ /** Returns the annotations for the router whose fingerprint matches
+ * <b>id</b>. If <b>id</b> is invalid or the router's descriptor cannot be
+ * parsed, then an empty DescriptorAnnotations is returned and
+ * <b>errmsg</b> is set if it's not NULL. (Tor >= 0.2.0.13-alpha only) */
+ DescriptorAnnotations getDescriptorAnnotations(const QString &id,
+ QString *errmsg = 0);
+
+ /** Gets a list of current circuits. */
+ CircuitList getCircuits(QString *errmsg = 0);
+ /** Gets a list of current streams. */
+ StreamList getStreams(QString *errmsg = 0);
+
+ /** Gets a list of address mappings of the type specified by <b>type</b>
+ * (defaults to <i>AddressMapAll</i>. */
+ AddressMap getAddressMap(
+ AddressMap::AddressMapType type = AddressMap::AddressMapAll,
+ QString *errmsg = 0);
+
+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. */
+ bool closeCircuit(const CircuitId &circId, bool ifUnused = false,
+ QString *errmsg = 0);
+ /** Closes the stream specified by <b>streamId</b>. */
+ bool closeStream(const StreamId &streamId, QString *errmsg = 0);
+
+signals:
+ /** Emitted when the Tor process has started */
+ void started();
+ /** Emitted when the Tor process fails to start. */
+ void startFailed(QString errmsg);
+ /** Emitted when the Tor process has stopped */
+ void stopped(int exitCode, QProcess::ExitStatus exitStatus);
+ /** Emitted when the Tor process has stopped. */
+ void stopped();
+ /** Emitted when the controller has connected to Tor */
+ void connected();
+ /** Emitted when the controller failed to connect to Tor. */
+ void connectFailed(QString errmsg);
+ /** Emitted when the controller has disconnected from Tor */
+ void disconnected();
+ /** Emitted when the control socket is connected and authenticated. */
+ void authenticated();
+ /** Emitted when Tor rejects our authentication attempt. */
+ void authenticationFailed(QString errmsg);
+
+ /** Emitted when Tor writes the message <b>msg</b> to the control port
+ * with message severity <b>level</b>.
+ */
+ void logMessage(tc::Severity level, const QString &msg);
+
+ /** 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);
+
+ /** Emitted when the stream status of <b>stream</b> has changed.
+ */
+ void streamStatusChanged(const Stream &stream);
+
+ /** Emitted when the circuit status of <b>circuit</b> has changed.
+ */
+ void circuitStatusChanged(const Circuit &circuit);
+
+ /** 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.
+ */
+ void addressMapped(const QString &from, const QString &to,
+ const QDateTime &expires);
+
+ /** Emitted when Tor has received one or more new router descriptors.
+ * <b>ids</b> contains a list of digests of the new descriptors.
+ */
+ void newDescriptors(const QStringList &ids);
+
+ /** Indicates Tor has been able to successfully establish one or more
+ * circuits.
+ */
+ void circuitEstablished();
+
+ /** Indicates that Tor has decided the user's Tor software <b>version</b>
+ * is no longer recommended for some <b>reason</b>. <b>recommended</b> is
+ * a list of Tor software versions that are considered current.
+ */
+ void dangerousTorVersion(tc::TorVersionStatus reason,
+ const QString &version,
+ const QStringList &recommended);
+
+ /** Emitted during Tor's startup process to indicate how far in its
+ * bootstrapping process it has progressed. <b>status</b> may indicate
+ * the current bootstrapping stage or an error during bootstrapping.
+ */
+ void bootstrapStatusChanged(const BootstrapStatus &status);
+
+ /** Emitted when the user attempts to establish a connection to some
+ * destination on port <b>port</b>, which is a port known to use
+ * plaintext connections (as determined by Tor's WarnPlaintextPorts and
+ * RejectPlaintextPorts torrc options). <b>rejected</b> indicates whether
+ * Tor rejected the connection or permitted it to connect anyway.
+ */
+ void dangerousPort(quint16 port, bool rejected);
+
+ /** Emitted when Tor detects a problem with a SOCKS connection from the
+ * user, such as a bad hostname, dangerous SOCKS protocol type, or a bad
+ * hostname. <b>type</b> indicates the type of error encountered and
+ * <b>destination</b> (if non-empty) specifies the attempted connection
+ * destination address or hostname.
+ */
+ void socksError(tc::SocksError type, const QString &destination);
+
+ /** Emitted when Tor decides the client's external IP address has changed
+ * to <b>ip</b>. If <b>hostname</b> is non-empty, Tor obtained the new
+ * value for <b>ip</b> by resolving <b>hostname</b>.
+ */
+ void externalAddressChanged(const QHostAddress &ip, const QString &hostname);
+
+ /** Indicates that Tor has determined the client's clock is potentially
+ * skewed by <b>skew</b> seconds relative to <b>source</b>.
+ */
+ void clockSkewed(int skew, const QString &source);
+
+ /** Emitted when Tor has encountered an internal bug. <b>reason</b> is
+ * Tor's description of the bug.
+ */
+ void bug(const QString &reason);
+
+ /** Emitted when Tor determines that the user's DNS provider is providing
+ * an address for non-existent domains when it should really be saying
+ * "NXDOMAIN".
+ */
+ void dnsHijacked();
+
+ /** Emitted when Tor determines that the user's DNS provider is providing
+ * a hijacked address even for well-known websites.
+ */
+ void dnsUseless();
+
+ /** Indicates Tor has started testing the reachability of its OR port
+ * using the IP address <b>ip</b> and port <b>port</b>.
+ */
+ void checkingOrPortReachability(const QHostAddress &ip, quint16 port);
+
+ /** Tor has completed testing the reachability of its OR port using
+ * the IP address <b>ip</b> and port <b>port</b>. If the user's OR port
+ * was reachable, <b>reachable</b> will be set to true.
+ */
+ void orPortReachabilityFinished(const QHostAddress &ip, quint16 port,
+ bool reachable);
+
+ /** Indicates Tor has started testing the reachability of its directory
+ * port using the IP address <b>ip</b> and port <b>port</b>.
+ */
+ void checkingDirPortReachability(const QHostAddress &ip, quint16 port);
+
+ /** Tor has completed testing the reachability of its directory port using
+ * the IP address <b>ip</b> and port <b>port</b>. If the user's directory
+ * port was reachable, <b>reachable</b> will be set to true.
+ */
+ void dirPortReachabilityFinished(const QHostAddress &ip, quint16 port,
+ bool reachable);
+
+ /** Emitted when the directory authority with IP address <b>ip</b> and
+ * port <b>port</b> rejected the user's server descriptor. <b>reason</b>
+ * describes why the descriptor was rejected (e.g., malformed, skewed
+ * clock, etc.).
+ */
+ void serverDescriptorRejected(const QHostAddress &ip, quint16 port,
+ const QString &reason);
+
+ /** Emitted when the directory authority with IP address <b>ip</b> and
+ * port <b>port</b> accepted the user's server descriptor.
+ */
+ void serverDescriptorAccepted(const QHostAddress &ip, quint16 port);
+
+ /** Emitted when at least one directory authority has accepted the user's
+ * server descriptor.
+ */
+ void serverDescriptorAccepted();
+
+private:
+ /** Instantiates a connection used to talk to Tor's control port */
+ ControlConnection* _controlConn;
+ /** Manages and monitors the Tor process */
+ TorProcess* _torProcess;
+ /** Keep track of which events we're interested in */
+ TorEvents* _eventHandler;
+ TorEvents::Events _events;
+ /** The version of Tor we're currently talking to. */
+ QString _torVersion;
+#if defined(Q_OS_WIN32)
+ /** Manages the Tor service, if supported and enabled */
+ TorService* _torService;
+#endif
+
+ /** Send a message to Tor and read the response */
+ bool send(ControlCommand cmd, ControlReply &reply, QString *errmsg = 0);
+ /** Send a message to Tor and discard the response */
+ bool send(ControlCommand cmd, QString *errmsg = 0);
+ /** Tells Tor the controller wants to enable <b>feature</b> via the
+ * USEFEATURE control command. Returns true if the given feature was
+ * successfully enabled. */
+ bool useFeature(const QString &feature, QString *errmsg = 0);
+
+/* The slots below simply relay signals from the appropriate member objects */
+private slots:
+ void onStopped(int exitCode, QProcess::ExitStatus exitStatus);
+ void onDisconnected();
+ void onLogStdout(const QString &severity, const QString &message);
+ void onAuthenticated();
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorEvents.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorEvents.cpp
new file mode 100644
index 0000000..9007ccf
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorEvents.cpp
@@ -0,0 +1,458 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 TorEvents.cpp
+** \version $Id: TorEvents.cpp 4100 2009-09-01 13:54:27Z edmanm $
+** \brief Parses and dispatches events from Tor
+*/
+
+
+#include "TorEvents.h"
+#include "ControlReply.h"
+#include "ReplyLine.h"
+#include "Circuit.h"
+#include "Stream.h"
+#include "BootstrapStatus.h"
+
+#include "stringutil.h"
+
+#include <QHostAddress>
+#include <QMetaType>
+
+/** Format of expiry times in address map events. */
+#define DATE_FMT "\"yyyy-MM-dd HH:mm:ss\""
+
+
+/** Default constructor */
+TorEvents::TorEvents(QObject *parent)
+ : QObject(parent)
+{
+ qRegisterMetaType<tc::Severity>();
+ qRegisterMetaType<tc::SocksError>();
+ qRegisterMetaType<tc::TorVersionStatus>();
+
+ qRegisterMetaType<BootstrapStatus>("BootstrapStatus");
+ qRegisterMetaType<Circuit>("Circuit");
+ qRegisterMetaType<Stream>("Stream");
+
+ qRegisterMetaType<QHostAddress>("QHostAddress");
+ qRegisterMetaType<QDateTime>("QDateTime");
+}
+
+/** Converts an event type to a string Tor understands */
+QString
+TorEvents::toString(Event e)
+{
+ QString event;
+ switch (e) {
+ case Bandwidth: event = "BW"; break;
+ case LogDebug: event = "DEBUG"; break;
+ case LogInfo: event = "INFO"; break;
+ case LogNotice: event = "NOTICE"; break;
+ case LogWarn: event = "WARN"; break;
+ case LogError: event = "ERR"; break;
+ case CircuitStatus: event = "CIRC"; break;
+ case StreamStatus: event = "STREAM"; break;
+ case NewDescriptor: event = "NEWDESC"; break;
+ case AddressMap: event = "ADDRMAP"; break;
+ case GeneralStatus: event = "STATUS_GENERAL"; break;
+ case ClientStatus: event = "STATUS_CLIENT"; break;
+ case ServerStatus: event = "STATUS_SERVER"; break;
+ default: event = "UNKNOWN"; break;
+ }
+ return event;
+}
+
+/** Converts an event in the string form sent by Tor to its enum value */
+TorEvents::Event
+TorEvents::toTorEvent(const QString &event)
+{
+ Event e;
+ if (event == "BW") {
+ e = Bandwidth;
+ } else if (event == "CIRC") {
+ e = CircuitStatus;
+ } else if (event == "STREAM") {
+ e = StreamStatus;
+ } else if (event == "DEBUG") {
+ e = LogDebug;
+ } else if (event == "INFO") {
+ e = LogInfo;
+ } else if (event == "NOTICE") {
+ e = LogNotice;
+ } else if (event == "WARN") {
+ e = LogWarn;
+ } else if (event == "ERR") {
+ e = LogError;
+ } else if (event == "NEWDESC") {
+ e = NewDescriptor;
+ } else if (event == "ADDRMAP") {
+ e = AddressMap;
+ } else if (event == "STATUS_GENERAL") {
+ e = GeneralStatus;
+ } else if (event == "STATUS_CLIENT") {
+ e = ClientStatus;
+ } else if (event == "STATUS_SERVER") {
+ e = ServerStatus;
+ } else {
+ e = Unknown;
+ }
+ return e;
+}
+
+/** Parse the event type out of a message line and return the corresponding
+ * Event enum value */
+TorEvents::Event
+TorEvents::parseEventType(const ReplyLine &line)
+{
+ QString msg = line.getMessage();
+ int i = msg.indexOf(" ");
+ return toTorEvent(msg.mid(0, i));
+}
+
+/** Handles an event message from Tor. An event message can potentially have
+ * more than one line, so we will iterate through them all and dispatch the
+ * necessary events. */
+void
+TorEvents::handleEvent(const ControlReply &reply)
+{
+ foreach(ReplyLine line, reply.getLines()) {
+ switch (parseEventType(line)) {
+ case Bandwidth: handleBandwidthUpdate(line); break;
+ case CircuitStatus: handleCircuitStatus(line); break;
+ case StreamStatus: handleStreamStatus(line); break;
+ case NewDescriptor: handleNewDescriptor(line); break;
+ case AddressMap: handleAddressMap(line); break;
+
+ case GeneralStatus:
+ handleStatusEvent(GeneralStatus, line); break;
+ case ClientStatus:
+ handleStatusEvent(ClientStatus, line); break;
+ case ServerStatus:
+ handleStatusEvent(ServerStatus, line); break;
+
+ case LogDebug:
+ case LogInfo:
+ case LogNotice:
+ case LogWarn:
+ case LogError:
+ handleLogMessage(line); break;
+ default: break;
+ }
+ }
+}
+
+/** Handle a bandwidth update event, to inform the controller of the bandwidth
+ * used in the last second. The format of this message is:
+ *
+ * "650" SP "BW" SP BytesRead SP BytesWritten
+ * BytesRead = 1*DIGIT
+ * BytesWritten = 1*DIGIT
+ */
+void
+TorEvents::handleBandwidthUpdate(const ReplyLine &line)
+{
+ QStringList msg = line.getMessage().split(" ");
+ if (msg.size() >= 3) {
+ quint64 bytesIn = (quint64)msg.at(1).toULongLong();
+ quint64 bytesOut = (quint64)msg.at(2).toULongLong();
+
+ /* Post the event to each of the interested targets */
+ emit bandwidthUpdate(bytesIn, bytesOut);
+ }
+}
+
+/** Handle a circuit status event. The format of this message is:
+ *
+ * "650" SP "CIRC" SP CircuitID SP CircStatus SP Path
+ * CircStatus =
+ * "LAUNCHED" / ; circuit ID assigned to new circuit
+ * "BUILT" / ; all hops finished, can now accept streams
+ * "EXTENDED" / ; one more hop has been completed
+ * "FAILED" / ; circuit closed (was not built)
+ * "CLOSED" ; circuit closed (was built)
+ * Path = ServerID *("," ServerID)
+ */
+void
+TorEvents::handleCircuitStatus(const ReplyLine &line)
+{
+ QString msg = line.getMessage().trimmed();
+ int i = msg.indexOf(" ") + 1;
+ if (i > 0) {
+ /* Post the event to each of the interested targets */
+ Circuit circ(msg.mid(i));
+ if (circ.isValid())
+ emit circuitStatusChanged(circ);
+ }
+}
+
+/** Handle a stream status event. The format of this message is:
+ *
+ * "650" SP "STREAM" SP StreamID SP StreamStatus SP CircID SP Target SP
+ * StreamStatus =
+ * "NEW" / ; New request to connect
+ * "NEWRESOLVE" / ; New request to resolve an address
+ * "SENTCONNECT" / ; Sent a connect cell along a circuit
+ * "SENTRESOLVE" / ; Sent a resolve cell along a circuit
+ * "SUCCEEDED" / ; Received a reply; stream established
+ * "FAILED" / ; Stream failed and not retriable.
+ * "CLOSED" / ; Stream closed
+ * "DETACHED" ; Detached from circuit; still retriable.
+ * Target = Address ":" Port
+ *
+ * If the circuit ID is 0, then the stream is unattached.
+ */
+void
+TorEvents::handleStreamStatus(const ReplyLine &line)
+{
+ QString msg = line.getMessage().trimmed();
+ int i = msg.indexOf(" ") + 1;
+ if (i > 0) {
+ Stream stream = Stream::fromString(msg.mid(i));
+ if (stream.isValid())
+ emit streamStatusChanged(stream);
+ }
+}
+
+/** Handle a log message event. The format of this message is:
+ * The syntax is:
+ *
+ * "650" SP Severity SP ReplyText
+ * or
+ * "650+" Severity CRLF Data
+ * Severity = "DEBUG" / "INFO" / "NOTICE" / "WARN"/ "ERR"
+ */
+void
+TorEvents::handleLogMessage(const ReplyLine &line)
+{
+ QString msg = line.getMessage();
+ int i = msg.indexOf(" ");
+ tc::Severity severity = tc::severityFromString(msg.mid(0, i));
+ QString logLine = (line.getData().size() > 0 ? line.getData().join("\n") :
+ msg.mid(i+1));
+
+ emit logMessage(severity, logLine);
+}
+
+/** Handles a new descriptor event. The format for event messages of this type
+ * is:
+ *
+ * "650" SP "NEWDESC" 1*(SP ServerID)
+ */
+void
+TorEvents::handleNewDescriptor(const ReplyLine &line)
+{
+ QString descs = line.getMessage();
+ QStringList descList = descs.mid(descs.indexOf(" ")+1).split(" ");
+ emit newDescriptors(descList);
+}
+
+/** Handles a new or updated address mapping event. The format for event
+ * messages of this type is:
+ *
+ * "650" SP "ADDRMAP" SP Address SP Address SP Expiry
+ * Expiry = DQUOTE ISOTime DQUOTE / "NEVER"
+ *
+ * Expiry is expressed as the local time (rather than GMT).
+ */
+void
+TorEvents::handleAddressMap(const ReplyLine &line)
+{
+ QStringList msg = line.getMessage().split(" ");
+ if (msg.size() >= 4) {
+ QDateTime expires;
+ if (msg.size() >= 5 && msg.at(3) != "NEVER")
+ expires = QDateTime::fromString(msg.at(3) + " " + msg.at(4), DATE_FMT);
+ emit addressMapped(msg.at(1), msg.at(2), expires);
+ }
+}
+
+/** Handles a Tor status event. The format for event messages of this type is:
+ *
+ * "650" SP StatusType SP StatusSeverity SP StatusAction
+ * [SP StatusArguments] CRLF
+ *
+ * StatusType = "STATUS_GENERAL" / "STATUS_CLIENT" / "STATUS_SERVER"
+ * StatusSeverity = "NOTICE" / "WARN" / "ERR"
+ * StatusAction = 1*ALPHA
+ * StatusArguments = StatusArgument *(SP StatusArgument)
+ * StatusArgument = StatusKeyword '=' StatusValue
+ * StatusKeyword = 1*(ALNUM / "_")
+ * StatusValue = 1*(ALNUM / '_') / QuotedString
+ */
+void
+TorEvents::handleStatusEvent(Event e, const ReplyLine &line)
+{
+ QString status;
+ tc::Severity severity;
+ QHash<QString,QString> args;
+ QString msg = line.getMessage();
+
+ severity = tc::severityFromString(msg.section(' ', 1, 1));
+ status = msg.section(' ', 2, 2);
+ args = string_parse_keyvals(msg.section(' ', 3));
+ switch (e) {
+ case ClientStatus:
+ handleClientStatusEvent(severity, status, args);
+ break;
+
+ case ServerStatus:
+ handleServerStatusEvent(severity, status, args);
+ break;
+
+ case GeneralStatus:
+ handleGeneralStatusEvent(severity, status, args);
+ break;
+
+ default:
+ break;
+ }
+}
+
+/** Parses and emits a general Tor status event. */
+void
+TorEvents::handleGeneralStatusEvent(tc::Severity severity,
+ const QString &action,
+ const QHash<QString,QString> &args)
+{
+ if (! action.compare("DANGEROUS_TOR_VERSION", Qt::CaseInsensitive)) {
+ QString reason = args.value("REASON");
+ QString current = args.value("CURRENT");
+ QStringList recommended = args.value("RECOMMENDED")
+ .split(",", QString::SkipEmptyParts);
+ if (! reason.compare("NEW", Qt::CaseInsensitive))
+ emit dangerousTorVersion(tc::NewTorVersion, current, recommended);
+ else if (! reason.compare("UNRECOMMENDED", Qt::CaseInsensitive))
+ emit dangerousTorVersion(tc::UnrecommendedTorVersion, current, recommended);
+ else if (! reason.compare("OBSOLETE", Qt::CaseInsensitive)
+ || ! reason.compare("OLD", Qt::CaseInsensitive))
+ emit dangerousTorVersion(tc::ObsoleteTorVersion, current, recommended);
+ } else if (! action.compare("CLOCK_SKEW", Qt::CaseInsensitive)) {
+ int skew;
+ bool ok = false;
+ if (args.contains("SKEW"))
+ skew = args.value("SKEW").toInt(&ok);
+ else if (args.contains("MIN_SKEW"))
+ skew = args.value("MIN_SKEW").toInt(&ok);
+ if (ok)
+ emit clockSkewed(skew, args.value("SOURCE"));
+ } else if (! action.compare("BUG", Qt::CaseInsensitive)) {
+ emit bug(args.value("REASON"));
+ }
+}
+
+/** Parses and emits a Tor client status event. */
+void
+TorEvents::handleClientStatusEvent(tc::Severity severity,
+ const QString &action,
+ const QHash<QString,QString> &args)
+{
+ if (! action.compare("CIRCUIT_ESTABLISHED", Qt::CaseInsensitive)) {
+ emit circuitEstablished();
+ } else if (! action.compare("DANGEROUS_PORT", Qt::CaseInsensitive)) {
+ bool reject = ! args.value("RESULT").compare("REJECT", Qt::CaseInsensitive);
+ emit dangerousPort(args.value("PORT").toUInt(), reject);
+ } else if (! action.compare("DANGEROUS_SOCKS", Qt::CaseInsensitive)) {
+ emit socksError(tc::DangerousSocksTypeError, args.value("ADDRESS"));
+ } else if (! action.compare("SOCKS_UNKNOWN_PROTOCOL", Qt::CaseInsensitive)) {
+ emit socksError(tc::UnknownSocksProtocolError, QString());
+ } else if (! action.compare("SOCKS_BAD_HOSTNAME", Qt::CaseInsensitive)) {
+ emit socksError(tc::BadSocksHostnameError, args.value("HOSTNAME"));
+ } else if (! action.compare("BOOTSTRAP", Qt::CaseInsensitive)) {
+ BootstrapStatus status
+ = BootstrapStatus(severity,
+ BootstrapStatus::statusFromString(args.value("TAG")),
+ args.value("PROGRESS").toInt(),
+ args.value("SUMMARY"),
+ args.value("WARNING"),
+ tc::connectionStatusReasonFromString(args.value("REASON")),
+ BootstrapStatus::actionFromString(
+ args.value("RECOMMENDATION")));
+ emit bootstrapStatusChanged(status);
+ }
+}
+
+/** Parses and emits a Tor server status event. */
+void
+TorEvents::handleServerStatusEvent(tc::Severity severity,
+ const QString &action,
+ const QHash<QString,QString> &args)
+{
+ if (! action.compare("EXTERNAL_ADDRESS", Qt::CaseInsensitive)) {
+ emit externalAddressChanged(QHostAddress(args.value("ADDRESS")),
+ args.value("HOSTNAME"));
+ } else if (! action.compare("CHECKING_REACHABILITY", Qt::CaseInsensitive)) {
+ if (args.contains("ORADDRESS")) {
+ QPair<QHostAddress,quint16> pair = splitAddress(args.value("ORADDRESS"));
+ if (! pair.first.isNull())
+ emit checkingOrPortReachability(pair.first, pair.second);
+ } else if (args.contains("DIRADDRESS")) {
+ QPair<QHostAddress,quint16> pair = splitAddress(args.value("DIRADDRESS"));
+ if (! pair.first.isNull())
+ emit checkingDirPortReachability(pair.first, pair.second);
+ }
+ } else if (! action.compare("REACHABILITY_SUCCEEDED", Qt::CaseInsensitive)) {
+ if (args.contains("ORADDRESS")) {
+ QPair<QHostAddress,quint16> pair = splitAddress(args.value("ORADDRESS"));
+ if (! pair.first.isNull())
+ emit orPortReachabilityFinished(pair.first, pair.second, true);
+ } else if (args.contains("DIRADDRESS")) {
+ QPair<QHostAddress,quint16> pair = splitAddress(args.value("DIRADDRESS"));
+ if (! pair.first.isNull())
+ emit dirPortReachabilityFinished(pair.first, pair.second, true);
+ }
+ } else if (! action.compare("REACHABILITY_FAILED", Qt::CaseInsensitive)) {
+ if (args.contains("ORADDRESS")) {
+ QPair<QHostAddress,quint16> pair = splitAddress(args.value("ORADDRESS"));
+ if (! pair.first.isNull())
+ emit orPortReachabilityFinished(pair.first, pair.second, false);
+ } else if (args.contains("DIRADDRESS")) {
+ QPair<QHostAddress,quint16> pair = splitAddress(args.value("DIRADDRESS"));
+ if (! pair.first.isNull())
+ emit dirPortReachabilityFinished(pair.first, pair.second, false);
+ }
+ } else if (! action.compare("GOOD_SERVER_DESCRIPTOR", Qt::CaseInsensitive)) {
+ emit serverDescriptorAccepted();
+ } else if (! action.compare("ACCEPTED_SERVER_DESCRIPTOR", Qt::CaseInsensitive)) {
+ QPair<QHostAddress,quint16> pair = splitAddress(args.value("DIRAUTH"));
+ if (! pair.first.isNull())
+ emit serverDescriptorAccepted(pair.first, pair.second);
+ } else if (! action.compare("BAD_SERVER_DESCRIPTOR", Qt::CaseInsensitive)) {
+ QPair<QHostAddress,quint16> pair = splitAddress(args.value("DIRAUTH"));
+ if (! pair.first.isNull())
+ emit serverDescriptorRejected(pair.first, pair.second,
+ args.value("REASON"));
+ } else if (! action.compare("DNS_HIJACKED", Qt::CaseInsensitive)) {
+ emit dnsHijacked();
+ } else if (! action.compare("DNS_USELESS", Qt::CaseInsensitive)) {
+ emit dnsUseless();
+ }
+}
+
+/** Splits a string in the form "IP:PORT" into a QHostAddress and quint16
+ * pair. If either portion is invalid, a default-constructed QPair() is
+ * returned. */
+QPair<QHostAddress,quint16>
+TorEvents::splitAddress(const QString &address)
+{
+ bool ok;
+ int idx = address.indexOf(":");
+ if (idx <= 0 || idx >= address.length()-1)
+ return QPair<QHostAddress,quint16>();
+
+ QHostAddress ip = QHostAddress(address.mid(0, idx));
+ quint16 port = static_cast<quint16>(address.mid(idx+1).toUInt(&ok));
+ if (ip.isNull() || ! ok)
+ return QPair<QHostAddress,quint16>();
+ return QPair<QHostAddress,quint16>(ip, port);
+}
+
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorEvents.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorEvents.h
new file mode 100644
index 0000000..dc71163
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorEvents.h
@@ -0,0 +1,255 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 TorEvents.h
+** \version $Id: TorEvents.h 4060 2009-08-20 03:41:13Z edmanm $
+** \brief Parses and dispatches events from Tor
+*/
+
+#ifndef _TOREVENTS_H
+#define _TOREVENTS_H
+
+#include "tcglobal.h"
+
+#include <QObject>
+#include <QMultiHash>
+#include <QList>
+#include <QFlags>
+
+class Circuit;
+class Stream;
+class BootstrapStatus;
+class ControlReply;
+class ReplyLine;
+
+class QString;
+class QDateTime;
+class QHostAddress;
+
+
+class TorEvents : public QObject
+{
+ Q_OBJECT
+
+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)
+ };
+ static const Event EVENT_MIN = TorEvents::Bandwidth;
+ static const Event EVENT_MAX = TorEvents::ServerStatus;
+ Q_DECLARE_FLAGS(Events, Event);
+
+ /** Default Constructor */
+ TorEvents(QObject *parent = 0);
+
+ /** Parses an event message and emits the proper signal */
+ void handleEvent(const ControlReply &reply);
+
+ /** Converts an Event to a string */
+ static QString toString(TorEvents::Event e);
+
+signals:
+ /** Emitted when Tor writes the message <b>msg</b> to the control port
+ * with message severity <b>level</b>.
+ */
+ void logMessage(tc::Severity level, const QString &msg);
+
+ /** 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);
+
+ /** Emitted when the stream status of <b>stream</b> has changed.
+ */
+ void streamStatusChanged(const Stream &stream);
+
+ /** Emitted when the circuit status of <b>circuit</b> has changed.
+ */
+ void circuitStatusChanged(const Circuit &circuit);
+
+ /** 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.
+ */
+ void addressMapped(const QString &from, const QString &to,
+ const QDateTime &expires);
+
+ /** Emitted when Tor has received one or more new router descriptors.
+ * <b>ids</b> contains a list of digests of the new descriptors.
+ */
+ void newDescriptors(const QStringList &ids);
+
+ /** Indicates Tor has been able to successfully establish one or more
+ * circuits.
+ */
+ void circuitEstablished();
+
+ /** Indicates that Tor has decided the user's Tor software <b>version</b>
+ * is no longer recommended for some <b>reason</b>. <b>recommended</b> is
+ * a list of Tor software versions that are considered current.
+ */
+ void dangerousTorVersion(tc::TorVersionStatus reason,
+ const QString &version,
+ const QStringList &recommended);
+
+ /** Emitted during Tor's startup process to indicate how far in its
+ * bootstrapping process it has progressed. <b>status</b> may indicate
+ * the current bootstrapping stage or an error during bootstrapping.
+ */
+ void bootstrapStatusChanged(const BootstrapStatus &status);
+
+ /** Emitted when the user attempts to establish a connection to some
+ * destination on port <b>port</b>, which is a port known to use
+ * plaintext connections (as determined by Tor's WarnPlaintextPorts and
+ * RejectPlaintextPorts torrc options). <b>rejected</b> indicates whether
+ * Tor rejected the connection or permitted it to connect anyway.
+ */
+ void dangerousPort(quint16 port, bool rejected);
+
+ /** Emitted when Tor detects a problem with a SOCKS connection from the
+ * user, such as a bad hostname, dangerous SOCKS protocol type, or a bad
+ * hostname. <b>type</b> indicates the type of error encountered and
+ * <b>destination</b> (if non-empty) specifies the attempted connection
+ * destination address or hostname.
+ */
+ void socksError(tc::SocksError error, const QString &destination);
+
+ /** Emitted when Tor has encountered an internal bug. <b>reason</b> is
+ * Tor's description of the bug.
+ */
+ void bug(const QString &reason);
+
+ /** Emitted when Tor decides the client's external IP address has changed
+ * to <b>ip</b>. If <b>hostname</b> is non-empty, Tor obtained the new
+ * value for <b>ip</b> by resolving <b>hostname</b>.
+ */
+ void externalAddressChanged(const QHostAddress &ip, const QString &hostname);
+
+ /** Indicates that Tor has determined the client's clock is potentially
+ * skewed by <b>skew</b> seconds relative to <b>source</b>.
+ */
+ void clockSkewed(int skew, const QString &source);
+
+ /** Emitted when Tor determines that the user's DNS provider is providing
+ * an address for non-existent domains when it should really be saying
+ * "NXDOMAIN".
+ */
+ void dnsHijacked();
+
+ /** Emitted when Tor determines that the user's DNS provider is providing
+ * a hijacked address even for well-known websites.
+ */
+ void dnsUseless();
+
+ /** Indicates Tor has started testing the reachability of its OR port
+ * using the IP address <b>ip</b> and port <b>port</b>.
+ */
+ void checkingOrPortReachability(const QHostAddress &ip, quint16 port);
+
+ /** Tor has completed testing the reachability of its OR port using
+ * the IP address <b>ip</b> and port <b>port</b>. If the user's OR port
+ * was reachable, <b>reachable</b> will be set to true.
+ */
+ void orPortReachabilityFinished(const QHostAddress &ip, quint16 port,
+ bool reachable);
+
+ /** Indicates Tor has started testing the reachability of its directory
+ * port using the IP address <b>ip</b> and port <b>port</b>.
+ */
+ void checkingDirPortReachability(const QHostAddress &ip, quint16 port);
+
+ /** Tor has completed testing the reachability of its directory port using
+ * the IP address <b>ip</b> and port <b>port</b>. If the user's directory
+ * port was reachable, <b>reachable</b> will be set to true.
+ */
+ void dirPortReachabilityFinished(const QHostAddress &ip, quint16 port,
+ bool reachable);
+
+ /** Emitted when the directory authority with IP address <b>ip</b> and
+ * port <b>port</b> rejected the user's server descriptor. <b>reason</b>
+ * describes why the descriptor was rejected (e.g., malformed, skewed
+ * clock, etc.).
+ */
+ void serverDescriptorRejected(const QHostAddress &ip, quint16 port,
+ const QString &reason);
+
+ /** Emitted when the directory authority with IP address <b>ip</b> and
+ * port <b>port</b> accepted the user's server descriptor.
+ */
+ void serverDescriptorAccepted(const QHostAddress &ip, quint16 port);
+
+ /** Emitted when at least one directory authority has accepted the user's
+ * server descriptor.
+ */
+ void serverDescriptorAccepted();
+
+private:
+ /** Parses the event type from the event message */
+ static Event parseEventType(const ReplyLine &line);
+ /** Converts a string to an Event */
+ static Event toTorEvent(const QString &event);
+ /** Splits a string in the form "IP:PORT" into a QHostAddress and quint16
+ * pair. If either portion is invalid, a default-constructed QPair() is
+ * returned. */
+ static QPair<QHostAddress,quint16> splitAddress(const QString &address);
+
+ /** Handle a bandwidth update event */
+ void handleBandwidthUpdate(const ReplyLine &line);
+ /** Handle a circuit status event */
+ void handleCircuitStatus(const ReplyLine &line);
+ /** Handle a stream status event */
+ void handleStreamStatus(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 or updated address map event. */
+ void handleAddressMap(const ReplyLine &line);
+
+ /** Handles a Tor status event. */
+ void handleStatusEvent(Event type, const ReplyLine &line);
+ /** Parses and posts a general Tor status event. */
+ void handleGeneralStatusEvent(tc::Severity severity,
+ const QString &action,
+ const QHash<QString,QString> &args);
+ /** Parses and posts a Tor client status event. */
+ void handleClientStatusEvent(tc::Severity severity,
+ const QString &action,
+ const QHash<QString,QString> &args);
+ /** Parses and posts a Tor server status event. */
+ void handleServerStatusEvent(tc::Severity severity,
+ const QString &action,
+ const QHash<QString,QString> &args);
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(TorEvents::Events)
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorProcess.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorProcess.cpp
new file mode 100644
index 0000000..d8cb60c
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorProcess.cpp
@@ -0,0 +1,203 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 TorProcess.cpp
+** \version $Id: TorProcess.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Starts and stops a Tor process
+*/
+
+#include "TorProcess.h"
+#include "tcglobal.h"
+
+#include "stringutil.h"
+
+#include <QString>
+
+/* Needed for _PROCESS_INFORMATION so that pid() works on Win32 */
+#if defined (Q_OS_WIN32)
+#include <windows.h>
+#endif
+
+
+/** Default constructor */
+TorProcess::TorProcess(QObject *parent)
+: QProcess(parent)
+{
+ openStdout();
+ connect(this, SIGNAL(readyReadStandardOutput()),
+ this, SLOT(onReadyRead()));
+ connect(this, SIGNAL(error(QProcess::ProcessError)),
+ this, SLOT(onError(QProcess::ProcessError)));
+}
+
+/** Formats the Tor process arguments for logging. */
+QString
+TorProcess::formatArguments(const QStringList &args)
+{
+ QStringList out;
+ foreach (QString arg, args) {
+ out << (arg.contains(" ") || arg.isEmpty() ? string_escape(arg) : arg);
+ }
+ return out.join(" ");
+}
+
+/** Attempts to start the Tor process using the location, executable, and
+ * command-line arguments specified in Vidalia's settings. If Tor starts, the
+ * signal started() will be emitted. If Tor fails to start,
+ * startFailed(errmsg) will be emitted, with an appropriate error message. */
+void
+TorProcess::start(const QString &app, const QStringList &args)
+{
+ QString exe = app;
+#if defined(Q_OS_WIN32)
+ /* If we're on Windows, QProcess::start requires that paths with spaces are
+ * quoted before being passed to it. */
+ exe = "\"" + exe + "\"";
+#endif
+
+ /* Attempt to start Tor with the given command-line arguments */
+ QStringList env = QProcess::systemEnvironment();
+#if !defined(Q_OS_WIN32)
+ /* Add "/usr/sbin" to an existing $PATH
+ * XXX What if they have no path? Would always just making one with
+ * "/usr/sbin" smart? Should we add anything else? */
+ for (int i = 0; i < env.size(); i++) {
+ QString envVar = env.at(i);
+ if (envVar.startsWith("PATH="))
+ env.replace(i, envVar += ":/usr/sbin");
+ }
+#endif
+ setEnvironment(env);
+
+ tc::debug("Starting Tor using '%1 %2'").arg(app).arg(formatArguments(args));
+ QProcess::start(exe, args, QIODevice::ReadOnly | QIODevice::Text);
+}
+
+/** Stops the Tor process */
+bool
+TorProcess::stop(QString *errmsg)
+{
+ /* First, check if the process is already stopped before closing it
+ * forcefully. */
+ if (state() == QProcess::NotRunning) {
+ return true;
+ }
+
+ tc::debug("Stopping the Tor process.");
+ /* Tell the process to stop */
+#if defined(Q_OS_WIN32)
+ /* Tor on Windows doesn't understand a WM_CLOSE message (which is what
+ * QProcess::terminate() sends it), so we have to kill it harshly. */
+ kill();
+#else
+ terminate();
+
+ /* Wait for it to complete */
+ if (!waitForFinished(5000)) {
+ tc::error("Tor failed to stop: %1").arg(errorString());
+ if (errmsg) {
+ *errmsg =
+ tr("Process %1 failed to stop. [%2]").arg(pid()).arg(errorString());
+ }
+ return false;
+ }
+#endif
+ return true;
+}
+
+/** Return the process ID for the current process. */
+quint64
+TorProcess::pid()
+{
+#if defined(Q_OS_WIN32)
+ return (quint64)((QProcess::pid())->dwProcessId);
+#else
+ return QProcess::pid();
+#endif
+}
+
+/** Opens logging on stdout. When this is open, the log() signal will be
+ * emitted when Tor prints a message to stdout. */
+void
+TorProcess::openStdout()
+{
+ setReadChannelMode(QProcess::MergedChannels);
+ setReadChannel(QProcess::StandardOutput);
+}
+
+/** Closes logging on stdout. When this is closed, the log() signal will not
+ * be emitted when Tor prints a message to stdout. */
+void
+TorProcess::closeStdout()
+{
+ /* Close the stdout channel */
+ closeReadChannel(QProcess::StandardOutput);
+ /* Read anything left waiting on the buffer */
+ onReadyRead();
+}
+
+/** Called when there is data to be read from stdout */
+void
+TorProcess::onReadyRead()
+{
+ int i, j;
+ QString line;
+
+ while (canReadLine()) {
+ line = readLine();
+ if (!line.isEmpty()) {
+ /* Parse the log message and emit log() */
+ i = line.indexOf("[");
+ j = line.indexOf("]");
+ if (i > 0 && j > i && line.length() >= j+2) {
+ emit log(line.mid(i+1, j-i-1), line.mid(j+2));
+ }
+ }
+ }
+}
+
+/** Called when the process encounters an error. If the error tells us that
+ * the process failed to start, then we will emit the startFailed() signal and
+ * an error message indicating why. */
+void
+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());
+ }
+}
+
+/** Returns the version reported by the Tor executable specified in
+ * <b>exe</b>, or a default-constructed QString on failure. */
+QString
+TorProcess::version(const QString &exe)
+{
+ QProcess tor;
+
+ tor.start(exe, QStringList() << "--version");
+ if (!tor.waitForStarted() || !tor.waitForFinished())
+ return QString();
+
+ while (tor.canReadLine()) {
+ QString line = tor.readLine();
+ if (line.startsWith("Tor version", Qt::CaseInsensitive)) {
+ QStringList parts = line.split(" ");
+ if (parts.size() >= 3)
+ return parts.at(2);
+ }
+ }
+ return QString();
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorProcess.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorProcess.h
new file mode 100644
index 0000000..c2fdafe
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorProcess.h
@@ -0,0 +1,67 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 TorProcess.h
+** \version $Id: TorProcess.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Starts and stops a Tor process
+*/
+
+#ifndef _TORPROCESS_H
+#define _TORPROCESS_H
+
+#include <QProcess>
+
+
+class TorProcess : public QProcess
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. */
+ TorProcess(QObject *parent = 0);
+
+ /** Start the Tor process */
+ void start(const QString &app, const QStringList &args);
+ /** Stop the Tor process */
+ bool stop(QString *errmsg = 0);
+
+ /** Return the Tor process's PID (workaround for some Windows funkiness) */
+ quint64 pid();
+
+ /** Enable reading log messages from stdout. */
+ void openStdout();
+ /** Disable reading log messages from stdout. */
+ void closeStdout();
+
+ /** Returns the version reported by the Tor executable specified in
+ * <b>exe</b>, or a default-constructed QString on failure. */
+ static QString version(const QString &exe);
+
+signals:
+ /** Emitted when Tor prints a log message to the console */
+ void log(const QString &severity, const QString &message);
+ /** Emitted when Tor fails to start, perhaps because the path to Tor was
+ * bogus. */
+ void startFailed(const QString &errorMessage);
+
+private slots:
+ /** Called when there is data to be read from stdout */
+ void onReadyRead();
+ /** Called when an error occurs in the process. */
+ void onError(QProcess::ProcessError error);
+
+private:
+ /** Formats the Tor process arguments for logging. */
+ QString formatArguments(const QStringList &args);
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorService.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorService.cpp
new file mode 100644
index 0000000..1bbc40d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorService.cpp
@@ -0,0 +1,313 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 TorService.cpp
+** \version $Id: TorService.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Starts, stops, installs, and uninstalls a Tor service (Win32).
+*/
+
+#include "TorService.h"
+#include "tcglobal.h"
+
+#include <QLibrary>
+
+/** Returned by TorService::exitCode() when we are unable to determine the
+ * actual exit code of the service (unless, of course, Tor returns -999999). */
+#define UNKNOWN_EXIT_CODE -999999
+
+/** List of dynamically loaded NT service functions. */
+ServiceFunctions TorService::_service_fns =
+ { false,
+ NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL
+ };
+
+
+/** Default ctor. */
+TorService::TorService(QObject *parent)
+ : QObject(parent)
+{
+ _scm = openSCM();
+}
+
+/** Default dtor. */
+TorService::~TorService()
+{
+ closeHandle(_scm);
+}
+
+/** Returns true if services are supported. */
+bool
+TorService::isSupported()
+{
+ return (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based);
+}
+
+/** Dyanmically loads NT service related functions from advapi32.dll. This
+ * function is adapted from Tor's nt_service_load_library() function. See
+ * LICENSE for details on Tor's license. */
+bool
+TorService::loadServiceFunctions()
+{
+#define LOAD_SERVICE_FN(f) do { \
+ void *fn; \
+ if (!((fn = QLibrary::resolve("advapi32", #f)))) { \
+ return false; \
+ } else { \
+ _service_fns.f = (f ## _fn) fn; \
+ } \
+ } while (0)
+
+ if (!isSupported()) {
+ _service_fns.loaded = false;
+ } else if (!_service_fns.loaded) {
+ LOAD_SERVICE_FN(ChangeServiceConfig2A);
+ LOAD_SERVICE_FN(CloseServiceHandle);
+ LOAD_SERVICE_FN(ControlService);
+ LOAD_SERVICE_FN(CreateServiceA);
+ LOAD_SERVICE_FN(DeleteService);
+ LOAD_SERVICE_FN(OpenSCManagerA);
+ LOAD_SERVICE_FN(OpenServiceA);
+ LOAD_SERVICE_FN(QueryServiceStatus);
+ LOAD_SERVICE_FN(SetServiceStatus);
+ LOAD_SERVICE_FN(StartServiceA);
+ _service_fns.loaded = true;
+ }
+ return _service_fns.loaded;
+}
+
+/** Opens a handle to the Tor service. Returns NULL on error. */
+SC_HANDLE
+TorService::openService()
+{
+ if (!loadServiceFunctions())
+ return NULL;
+ if (!_scm)
+ return NULL;
+ return _service_fns.OpenServiceA(_scm,
+ (LPCTSTR)TOR_SERVICE_NAME,
+ TOR_SERVICE_ACCESS);
+}
+
+/** Opens a handle to the service control manager. Returns NULL on error. */
+SC_HANDLE
+TorService::openSCM()
+{
+ if (!loadServiceFunctions())
+ return NULL;
+ return _service_fns.OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS);
+}
+
+/** Closes the service <b>handle</b>. */
+void
+TorService::closeHandle(SC_HANDLE handle)
+{
+ if (!loadServiceFunctions())
+ return;
+ _service_fns.CloseServiceHandle(handle);
+}
+
+/** Returns true if the Tor service is installed. */
+bool
+TorService::isInstalled()
+{
+ bool installed;
+ SC_HANDLE service = openService();
+ installed = (service != NULL);
+ closeHandle(service);
+ return installed;
+}
+
+/** Returns true if the Tor service is running. */
+bool
+TorService::isRunning()
+{
+ return (status() == SERVICE_RUNNING);
+}
+
+/** Starts Tor service. */
+void
+TorService::start()
+{
+ SC_HANDLE service = openService();
+
+ if (!service) {
+ tc::error("Bug: We tried to start the Tor service, but it is not installed.");
+ emit startFailed(tr("The Tor service is not installed."));
+ return;
+ }
+
+ /* Starting a service can take up to 30 seconds! */
+ if (status() != SERVICE_RUNNING) {
+ int tries = 0;
+ tc::debug("Starting the Tor service.");
+ _service_fns.StartServiceA(service, 0, NULL);
+
+ while ((status() != SERVICE_RUNNING) && ++tries <= 5)
+ Sleep(1000);
+ }
+
+ if (status() == SERVICE_RUNNING) {
+ emit started();
+ } else {
+ tc::error("Unable to start the Tor service.");
+ emit startFailed(tr("Unable to start the Tor service."));
+ }
+ closeHandle(service);
+}
+
+/** Stops Tor service. */
+bool
+TorService::stop()
+{
+ SC_HANDLE service = openService();
+
+ if (!service)
+ return false;
+
+ if (status() != SERVICE_STOPPED) {
+ SERVICE_STATUS stat;
+ stat.dwCurrentState = SERVICE_RUNNING;
+ tc::debug("Stopping the Tor service.");
+ if (_service_fns.ControlService(service, SERVICE_CONTROL_STOP, &stat)) {
+ /* XXX Five seconds isn't long enough to wait when we're stopping a Tor
+ * that is running as a server, but we don't want to block for 30
+ * seconds. It would be nice if we could get an async notification when
+ * the service stops or fails to stop. */
+ int tries = 0;
+ while ((status() != SERVICE_STOPPED) && (++tries <= 5))
+ Sleep(1000);
+ }
+ }
+ closeHandle(service);
+
+ /* Find out if the service really stopped and return the result */
+ if (status() == SERVICE_STOPPED) {
+ emit finished(exitCode(), exitStatus());
+ return true;
+ }
+ /* XXX This needs an actual reason message. */
+ tc::error("Unable to stop the Tor service.");
+ return false;
+}
+
+/** Returns the exit code of the last Tor service that finished. */
+int
+TorService::exitCode()
+{
+ SC_HANDLE service;
+ int exitCode = UNKNOWN_EXIT_CODE;
+
+ service = openService();
+ if (service) {
+ SERVICE_STATUS s;
+ if (_service_fns.QueryServiceStatus(service, &s)) {
+ /* Services return one exit code, but it could be in one of two
+ * variables. Fun. */
+ exitCode = (int)(s.dwWin32ExitCode == ERROR_SERVICE_SPECIFIC_ERROR
+ ? s.dwServiceSpecificExitCode
+ : s.dwWin32ExitCode);
+ }
+ closeHandle(service);
+ }
+ return exitCode;
+}
+
+/** Returns the exit status of the last Tor service that finished. */
+QProcess::ExitStatus
+TorService::exitStatus()
+{
+ /* NT services don't really have an equivalent to QProcess::CrashExit, so
+ * this just returns QProcess::NormalExit. Tor _could_ set
+ * dwServiceSpecificExitCode to some magic value when it starts and then
+ * set it to the real exit code when Tor exits. Then we would know if the
+ * service crashed when dwServiceSpecificExitCode is still the magic value.
+ * However, I don't care and it doesn't really matter anyway. */
+ return QProcess::NormalExit;
+}
+
+/** Installs the Tor service. Returns true if the service was successfully
+ * installed or already exists. */
+bool
+TorService::install(const QString &torPath, const QString &torrc,
+ quint16 controlPort)
+{
+ SC_HANDLE service;
+
+ if (!_scm)
+ return false;
+
+ service = openService();
+ if (!service) {
+ QString command = QString("\"%1\" --nt-service -f \"%2\" ControlPort %3")
+ .arg(torPath)
+ .arg(torrc)
+ .arg(controlPort);
+
+ tc::debug("Installing the Tor service using the command line '%1'")
+ .arg(command);
+ service = _service_fns.CreateServiceA(_scm,
+ (LPCTSTR)TOR_SERVICE_NAME, (LPCTSTR)TOR_SERVICE_DISP,
+ TOR_SERVICE_ACCESS, SERVICE_WIN32_OWN_PROCESS,
+ SERVICE_AUTO_START, SERVICE_ERROR_IGNORE,
+ (LPCTSTR)command.toAscii().data(), NULL, NULL, NULL,
+ NULL, NULL);
+ if (!service) {
+ /* XXX This needs an actual reason message. */
+ tc::error("Failed to install the Tor service.");
+ return false;
+ }
+
+ SERVICE_DESCRIPTION desc;
+ desc.lpDescription = TOR_SERVICE_DESC;
+ _service_fns.ChangeServiceConfig2A(service,
+ SERVICE_CONFIG_DESCRIPTION, &desc);
+ closeHandle(service);
+ }
+ return true;
+}
+
+/** Removes the Tor service. Returns true if the service was removed
+ * successfully or does not exist. */
+bool
+TorService::remove()
+{
+ bool removed = true;
+ SC_HANDLE service = openService();
+
+ if (service) {
+ stop();
+ tc::debug("Removing the Tor service.");
+ removed = _service_fns.DeleteService(service);
+ closeHandle(service);
+ }
+ if (!removed) {
+ /* XXX This needs an actual reason message. */
+ tc::error("Failed to remove the Tor service.");
+ }
+ return removed;
+}
+
+/** Gets the status of the Tor service. */
+DWORD
+TorService::status()
+{
+ SC_HANDLE service;
+ SERVICE_STATUS s;
+ DWORD stat = SERVICE_ERROR;
+
+ service = openService();
+ if (service && _service_fns.QueryServiceStatus(service, &s))
+ stat = s.dwCurrentState;
+ closeHandle(service);
+ return stat;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorService.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorService.h
new file mode 100644
index 0000000..c5b9fb2
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorService.h
@@ -0,0 +1,152 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 torservice.h
+** \version $Id: TorService.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Starts, stops, installs, and uninstalls a Tor service (Win32).
+*/
+
+#ifndef _TORSERVICE_H
+#define _TORSERVICE_H
+
+#include <QObject>
+#include <QProcess>
+
+#include <windows.h>
+#define TOR_SERVICE_NAME "tor"
+#define TOR_SERVICE_DISP "Tor Win32 Service"
+#define TOR_SERVICE_DESC \
+ TEXT("Provides an anonymous Internet communication system.")
+#define TOR_SERVICE_ACCESS SERVICE_ALL_ACCESS
+#define SERVICE_ERROR 8
+
+/* NT service function prototypes. This code is adapted from Tor's
+ * nt_service_load_library() in main.c. See LICENSE for details on
+ * Tor's license. */
+typedef BOOL (WINAPI *ChangeServiceConfig2A_fn)(
+ SC_HANDLE hService,
+ DWORD dwInfoLevel,
+ LPVOID lpInfo);
+typedef BOOL (WINAPI *CloseServiceHandle_fn)(
+ SC_HANDLE hSCObject);
+typedef BOOL (WINAPI *ControlService_fn)(
+ SC_HANDLE hService,
+ DWORD dwControl,
+ LPSERVICE_STATUS lpServiceStatus);
+typedef SC_HANDLE (WINAPI *CreateServiceA_fn)(
+ SC_HANDLE hSCManager,
+ LPCTSTR lpServiceName,
+ LPCTSTR lpDisplayName,
+ DWORD dwDesiredAccess,
+ DWORD dwServiceType,
+ DWORD dwStartType,
+ DWORD dwErrorControl,
+ LPCTSTR lpBinaryPathName,
+ LPCTSTR lpLoadOrderGroup,
+ LPDWORD lpdwTagId,
+ LPCTSTR lpDependencies,
+ LPCTSTR lpServiceStartName,
+ LPCTSTR lpPassword);
+typedef BOOL (WINAPI *DeleteService_fn)(
+ SC_HANDLE hService);
+typedef SC_HANDLE (WINAPI *OpenSCManagerA_fn)(
+ LPCTSTR lpMachineName,
+ LPCTSTR lpDatabaseName,
+ DWORD dwDesiredAccess);
+typedef SC_HANDLE (WINAPI *OpenServiceA_fn)(
+ SC_HANDLE hSCManager,
+ LPCTSTR lpServiceName,
+ DWORD dwDesiredAccess);
+typedef BOOL (WINAPI *QueryServiceStatus_fn)(
+ SC_HANDLE hService,
+ LPSERVICE_STATUS lpServiceStatus);
+typedef BOOL (WINAPI *SetServiceStatus_fn)(SERVICE_STATUS_HANDLE,
+ LPSERVICE_STATUS);
+typedef BOOL (WINAPI *StartServiceA_fn)(
+ SC_HANDLE hService,
+ DWORD dwNumServiceArgs,
+ LPCTSTR* lpServiceArgVectors);
+
+/** Table of NT service related functions. */
+struct ServiceFunctions {
+ bool loaded;
+ ChangeServiceConfig2A_fn ChangeServiceConfig2A;
+ CloseServiceHandle_fn CloseServiceHandle;
+ ControlService_fn ControlService;
+ CreateServiceA_fn CreateServiceA;
+ DeleteService_fn DeleteService;
+ OpenSCManagerA_fn OpenSCManagerA;
+ OpenServiceA_fn OpenServiceA;
+ QueryServiceStatus_fn QueryServiceStatus;
+ SetServiceStatus_fn SetServiceStatus;
+ StartServiceA_fn StartServiceA;
+};
+
+
+class TorService : public QObject
+{
+ Q_OBJECT
+
+public:
+ /** Returns if services are supported. */
+ static bool isSupported();
+ /** Dynamically loads NT service related functions from advapi32.dll. */
+ static bool loadServiceFunctions();
+
+ /** Default ctor. */
+ TorService(QObject* parent = 0);
+ /** Default dtor. */
+ ~TorService();
+
+ /** Returns true if the Tor service is installed. */
+ bool isInstalled();
+ /** Returns true if the Tor service is running. */
+ bool isRunning();
+ /** Starts the Tor service. Emits started on success. */
+ void start();
+ /** Stops the Tor service. Emits finished on success. */
+ bool stop();
+ /** Returns the exit code of the last Tor service that finished. */
+ int exitCode();
+ /** Returns the exit status of the last Tor service that finished. */
+ QProcess::ExitStatus exitStatus();
+ /** Installs the Tor service. */
+ bool install(const QString &torPath, const QString &torrc,
+ quint16 controlPort);
+ /** Removes the Tor service. */
+ bool remove();
+
+signals:
+ /** Called when the service gets started. */
+ void started();
+ /** Called when the service gets stopped. */
+ void finished(int exitCode, QProcess::ExitStatus);
+ /** Called when there is an error in starting the service. */
+ void startFailed(QString error);
+
+private:
+ /** Opens a handle to the Tor service. Returns NULL on error. */
+ SC_HANDLE openService();
+ /** Opens a handle to the service control manager. Returns NULL on error. */
+ static SC_HANDLE openSCM();
+ /** Closes the service <b>handle</b>. */
+ static void closeHandle(SC_HANDLE handle);
+ /** Gets the status of the Tor service. */
+ DWORD status();
+
+ /** Handle to the service control manager. */
+ SC_HANDLE _scm;
+ /** List of dynamically loaded NT service functions. */
+ static ServiceFunctions _service_fns;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorSignal.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorSignal.cpp
new file mode 100644
index 0000000..6cba49d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorSignal.cpp
@@ -0,0 +1,36 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 TorSignal.cpp
+** \version $Id: TorSignal.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Sends a signal to Tor's control interface
+*/
+
+#include "TorSignal.h"
+
+
+/** Returns a string representation of a signal that Tor understands. */
+QString
+TorSignal::toString(Signal signal)
+{
+ QString sigtype;
+ switch (signal) {
+ case Reload: sigtype = "RELOAD"; break;
+ case Shutdown: sigtype = "SHUTDOWN"; break;
+ case Dump: sigtype = "DUMP"; break;
+ case Debug: sigtype = "DEBUG"; break;
+ case Halt: sigtype = "HALT"; break;
+ case NewNym: sigtype = "NEWNYM"; break;
+ default: return "UNKNOWN";
+ }
+ return sigtype;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorSignal.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorSignal.h
new file mode 100644
index 0000000..19ee6ec
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/TorSignal.h
@@ -0,0 +1,41 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 TorSignal.h
+** \version $Id: TorSignal.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Sends a signal to Tor's control interface
+*/
+
+#ifndef _TORSIGNAL_H
+#define _TORSGINAL_H
+
+#include <QString>
+
+
+class TorSignal
+{
+public:
+ /** Signals that can be sent by the controller */
+ enum Signal {
+ Reload, /**< SIGHUP: Reloads config items and refetch directory */
+ Shutdown, /**< SIGINT: Controlled shutdown */
+ Dump, /**< SIGUSR1: Log information about current circuits */
+ Debug, /**< SIGUSR2: Switch all open logs to loglevel debug */
+ Halt, /**< SIGTERM: Immediate shutdown */
+ NewNym /**< NEWNYM: Switch to all new clean circuits */
+ };
+
+ /** Returns a string representation of a signal that Tor understands. */
+ static QString toString(Signal signal);
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/tcglobal.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/tcglobal.cpp
new file mode 100644
index 0000000..30a92ed
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/tcglobal.cpp
@@ -0,0 +1,99 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 tcglobal.cpp
+** \version $Id: tcglobal.cpp 4054 2009-08-17 02:25:08Z edmanm $
+** \brief Provides common methods and constants used by the torcontrol library
+*/
+
+#include "tcglobal.h"
+
+
+namespace tc {
+
+/* Creates a new message using <b>fmt</b> and a severity level of
+ * QtDebugMsg. */
+DebugMessage
+debug(const QString &fmt)
+{
+ return DebugMessage(QtDebugMsg, fmt);
+}
+
+/* Creates a new message using <b>fmt</b> and a severity level of
+ * QtWarningMsg. */
+DebugMessage
+warn(const QString &fmt)
+{
+ return DebugMessage(QtWarningMsg, fmt);
+}
+
+/* Creates a new message using <b>fmt</b> and a severity level of
+ * QtCriticalMsg. */
+DebugMessage
+error(const QString &fmt)
+{
+ return DebugMessage(QtCriticalMsg, fmt);
+}
+
+/* Creates a new message using <b>fmt</b> and a severity level of
+ * QtFatalMsg. */
+DebugMessage
+fatal(const QString &fmt)
+{
+ return DebugMessage(QtFatalMsg, fmt);
+}
+
+/* Converts <b>str</b> to a ConnectionStatusReason enum value. */
+ConnectionStatusReason
+connectionStatusReasonFromString(const QString &str)
+{
+ if (str.isEmpty())
+ return UnrecognizedReason;
+ if (!str.compare("MISC", Qt::CaseInsensitive))
+ return MiscellaneousReason;
+ if (!str.compare("IDENTITY", Qt::CaseInsensitive))
+ return IdentityMismatch;
+ if (!str.compare("RESOURCELIMIT", Qt::CaseInsensitive))
+ return ResourceLimitReached;
+ if (!str.compare("DONE", Qt::CaseInsensitive))
+ return ConnectionDone;
+ if (!str.compare("CONNECTREFUSED"))
+ return ConnectionRefused;
+ if (!str.compare("CONNECTRESET", Qt::CaseInsensitive))
+ return ConnectionRefused;
+ if (!str.compare("TIMEOUT", Qt::CaseInsensitive))
+ return ConnectionTimeout;
+ if (!str.compare("NOROUTE", Qt::CaseInsensitive))
+ return NoRouteToHost;
+ if (!str.compare("IOERROR", Qt::CaseInsensitive))
+ return ConnectionIoError;
+ return UnrecognizedReason;
+}
+
+/* Converts <b>str</b> to a Severity enum value. */
+Severity
+severityFromString(const QString &str)
+{
+ if (!str.compare("DEBUG", Qt::CaseInsensitive))
+ return DebugSeverity;
+ if (!str.compare("INFO", Qt::CaseInsensitive))
+ return InfoSeverity;
+ if (!str.compare("NOTICE", Qt::CaseInsensitive))
+ return NoticeSeverity;
+ if (!str.compare("WARN", Qt::CaseInsensitive))
+ return WarnSeverity;
+ if (!str.compare("ERR", Qt::CaseInsensitive))
+ return ErrorSeverity;
+ return UnrecognizedSeverity;
+}
+
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/tcglobal.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/tcglobal.h
new file mode 100644
index 0000000..61e11ab
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/torcontrol/tcglobal.h
@@ -0,0 +1,121 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 tcglobal.h
+** \version $Id: tcglobal.h 4054 2009-08-17 02:25:08Z edmanm $
+** \brief Provides common methods and constants used by the torcontrol library
+*/
+
+#ifndef _TCGLOBAL_H
+#define _TCGLOBAL_H
+
+#include <QString>
+#include <QMetaType>
+
+namespace tc {
+ /** Helper class to handle formatting log messages with arguments. */
+ class DebugMessage {
+ struct Stream {
+ Stream(QtMsgType t, const QString &fmt)
+ : type(t), buf(fmt), ref(1) {}
+ QtMsgType type; /**< DebugMessage severity level. */
+ QString buf; /**< Log message buffer. */
+ int ref; /**< Reference counter. */
+ } *stream;
+
+ public:
+ /** Constructs a new DebugMessage with severity <b>t</b> and the message
+ * format <b>fmt</b>. */
+ inline DebugMessage(QtMsgType t, const QString &fmt)
+ : stream(new Stream(t, fmt)) {}
+ inline DebugMessage(const DebugMessage &o)
+ : stream(o.stream) { ++stream->ref; }
+ virtual ~DebugMessage() {
+ if (!--stream->ref) {
+ stream->buf.prepend("torcontrol: ");
+ qt_message_output(stream->type, qPrintable(stream->buf));
+ delete stream;
+ }
+ }
+
+ inline DebugMessage arg(const QString &a)
+ { stream->buf = stream->buf.arg(a); return *this; }
+ inline DebugMessage arg(int a)
+ { stream->buf = stream->buf.arg(a); return *this; }
+ };
+}
+
+namespace tc {
+ enum ConnectionStatusReason {
+ UnrecognizedReason,
+ MiscellaneousReason,
+ IdentityMismatch,
+ ConnectionDone,
+ ConnectionRefused,
+ ConnectionReset,
+ ConnectionTimeout,
+ ConnectionIoError,
+ NoRouteToHost,
+ ResourceLimitReached
+ };
+ /** Severity values used in log message and status events. */
+ enum Severity {
+ UnrecognizedSeverity = 0, /**< An unrecognized severity value. */
+ DebugSeverity = (1u<<4), /**< Hyper-verbose events used for debugging. */
+ InfoSeverity = (1u<<3), /**< Verbose events that can occur frequently. */
+ NoticeSeverity = (1u<<2), /**< A not-so-bad event. */
+ WarnSeverity = (1u<<1), /**< An important, but non-fatal event. */
+ ErrorSeverity = (1u<<0) /**< A critical event. */
+ };
+ /** SOCKS error types used by Tor status event notifications. These are
+ * emitted in the TorControl::socksError() signal. */
+ enum SocksError {
+ DangerousSocksTypeError, /**< The SOCKS type uses only IP addresses. */
+ UnknownSocksProtocolError, /**< Unknown SOCKS protocol type. */
+ BadSocksHostnameError /**< Application provided an invalid hostname. */
+ };
+ /** Reasons that use of the user's current Tor version would be
+ * discouraged. */
+ enum TorVersionStatus {
+ ObsoleteTorVersion,
+ UnrecommendedTorVersion,
+ NewTorVersion
+ };
+
+ /** Converts <b>str</b> to a Severity enum value. */
+ Severity severityFromString(const QString &str);
+
+ /** Converts <b>str</b> to a ConnectionStatusReason enum value. */
+ ConnectionStatusReason connectionStatusReasonFromString(const QString &str);
+
+ /** Creates a new message using <b>fmt</b> and a severity level of
+ * QtDebugMsg. */
+ DebugMessage debug(const QString &fmt);
+
+ /** Creates a new message using <b>fmt</b> and a severity level of
+ * QtWarningMsg. */
+ DebugMessage warn(const QString &fmt);
+
+ /** Creates a new message using <b>fmt</b> and a severity level of
+ * QtCriticalMsg. */
+ DebugMessage error(const QString &fmt);
+
+ /** Creates a new message using <b>fmt</b> and a severity level of
+ * QtFatalMsg. */
+ DebugMessage fatal(const QString &fmt);
+}
+
+Q_DECLARE_METATYPE(tc::Severity)
+Q_DECLARE_METATYPE(tc::SocksError)
+Q_DECLARE_METATYPE(tc::TorVersionStatus)
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/CMakeLists.txt
new file mode 100644
index 0000000..86a4d73
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/CMakeLists.txt
@@ -0,0 +1,500 @@
+##
+## $Id: CMakeLists.txt 4227 2010-02-25 04:03:32Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+
+include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/about
+ ${CMAKE_CURRENT_SOURCE_DIR}/bwgraph
+ ${CMAKE_CURRENT_SOURCE_DIR}/config
+ ${CMAKE_CURRENT_SOURCE_DIR}/help/browser
+ ${CMAKE_CURRENT_SOURCE_DIR}/log
+ ${CMAKE_CURRENT_SOURCE_DIR}/network
+ ${MARBLE_INCLUDE_DIR}
+)
+
+if (USE_BREAKPAD AND BREAKPAD_INCLUDE_DIR)
+ include_directories(${BREAKPAD_INCLUDE_DIR})
+endif(USE_BREAKPAD AND BREAKPAD_INCLUDE_DIR)
+
+if (USE_MARBLE)
+ if (APPLE OR WIN32)
+ ##
+ ## XXX: The Marble build system on OS X currently doesn't actually install the
+ ## required include files to /usr/local/include or similar. Instead, we have
+ ## to pluck them directly from the source tree. Ick.
+ ##
+ include_directories(
+ ${MARBLE_INCLUDE_DIR}/AbstractLayer
+ ${MARBLE_INCLUDE_DIR}/geodata
+ ${MARBLE_INCLUDE_DIR}/geodata/data
+ ${MARBLE_INCLUDE_DIR}/geodata/handlers
+ ${MARBLE_INCLUDE_DIR}/geodata/parser
+ ${MARBLE_INCLUDE_DIR}/geodata/scene
+ ${MARBLE_INCLUDE_DIR}/Projections
+ )
+ endif(APPLE OR WIN32)
+endif(USE_MARBLE)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/res/vidalia_win.rc.in
+ ${CMAKE_CURRENT_SOURCE_DIR}/res/vidalia_win.rc
+)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/i18n/vidalia_i18n.qrc
+ ${CMAKE_CURRENT_BINARY_DIR}/i18n/vidalia_i18n.qrc
+)
+
+## Process the translation files
+add_subdirectory(i18n)
+
+## About dialog sources
+set(vidalia_SRCS
+ about/AboutDialog.cpp
+ about/LicenseDialog.cpp
+)
+qt4_wrap_cpp(vidalia_SRCS
+ about/AboutDialog.h
+ about/LicenseDialog.h
+)
+
+## Bandwidth graph sources
+set(vidalia_SRCS ${vidalia_SRCS}
+ bwgraph/BandwidthGraph.cpp
+ bwgraph/GraphFrame.cpp
+)
+qt4_wrap_cpp(vidalia_SRCS
+ bwgraph/BandwidthGraph.h
+ bwgraph/GraphFrame.h
+)
+
+## Configuration dialog sources
+set(vidalia_SRCS ${vidalia_SRCS}
+ config/AbstractTorSettings.cpp
+ config/AdvancedPage.cpp
+ config/AppearancePage.cpp
+ config/BridgeDownloader.cpp
+ config/BridgeDownloaderProgressDialog.cpp
+ config/BridgeUsageDialog.cpp
+ config/ConfigDialog.cpp
+ config/ConfigPageStack.cpp
+ config/DomainValidator.cpp
+ config/ExitPolicy.cpp
+ config/GeneralPage.cpp
+ config/IpValidator.cpp
+ config/NetworkPage.cpp
+ config/NetworkSettings.cpp
+ config/NicknameValidator.cpp
+ config/Policy.cpp
+ config/PortValidator.cpp
+ config/ServerPage.cpp
+ config/ServerSettings.cpp
+ config/Service.cpp
+ config/ServiceList.cpp
+ config/ServicePage.cpp
+ config/ServiceSettings.cpp
+ config/TorSettings.cpp
+ config/VidaliaSettings.cpp
+ config/VSettings.cpp
+)
+qt4_wrap_cpp(vidalia_SRCS
+ config/AbstractTorSettings.h
+ config/AdvancedPage.h
+ config/AppearancePage.h
+ config/BridgeDownloader.h
+ config/BridgeDownloaderProgressDialog.h
+ config/BridgeUsageDialog.h
+ config/ConfigDialog.h
+ config/ConfigPage.h
+ config/ConfigPageStack.h
+ config/DomainValidator.h
+ config/GeneralPage.h
+ config/NetworkPage.h
+ config/NetworkSettings.h
+ config/NicknameValidator.h
+ config/PortValidator.h
+ config/ServerPage.h
+ config/ServerSettings.h
+ config/ServicePage.h
+ config/TorSettings.h
+ config/VidaliaSettings.h
+ config/VSettings.h
+)
+if (USE_MINIUPNPC)
+ include_directories(${MINIUPNPC_INCLUDE_DIR})
+ set(vidalia_SRCS ${vidalia_SRCS}
+ config/UPNPControl.cpp
+ config/UPNPControlThread.cpp
+ config/UPNPTestDialog.cpp
+ )
+ qt4_wrap_cpp(vidalia_SRCS
+ config/UPNPControl.h
+ config/UPNPControlThread.h
+ config/UPNPTestDialog.h
+ )
+endif(USE_MINIUPNPC)
+
+## Help browser sources
+set(vidalia_SRCS ${vidalia_SRCS}
+ help/browser/HelpBrowser.cpp
+ help/browser/HelpTextBrowser.cpp
+)
+qt4_wrap_cpp(vidalia_SRCS
+ help/browser/HelpBrowser.h
+ help/browser/HelpTextBrowser.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
+)
+qt4_wrap_cpp(vidalia_SRCS
+ log/LogFile.h
+ log/LogHeaderView.h
+ log/LogTreeWidget.h
+ log/MessageLog.h
+ log/StatusEventItemDelegate.h
+ log/StatusEventWidget.h
+)
+
+## Network map sources
+set(vidalia_SRCS ${vidalia_SRCS}
+ network/CircuitItem.cpp
+ network/CircuitListWidget.cpp
+ network/GeoIpCache.cpp
+ network/GeoIpCacheItem.cpp
+ network/GeoIp.cpp
+ network/GeoIpRequest.cpp
+ network/GeoIpResolver.cpp
+ network/GeoIpResponse.cpp
+ network/NetViewer.cpp
+ network/RouterDescriptorView.cpp
+ network/RouterInfoDialog.cpp
+ network/RouterListItem.cpp
+ network/RouterListWidget.cpp
+ network/StreamItem.cpp
+)
+qt4_wrap_cpp(vidalia_SRCS
+ network/CircuitListWidget.h
+ network/GeoIpCache.h
+ network/GeoIpResolver.h
+ network/NetViewer.h
+ network/RouterDescriptorView.h
+ network/RouterInfoDialog.h
+ network/RouterListWidget.h
+)
+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)
+ set(vidalia_SRCS ${vidalia_SRCS}
+ network/TorMapImageView.cpp
+ network/ZImageView.cpp
+ )
+ qt4_wrap_cpp(vidalia_SRCS
+ network/TorMapImageView.h
+ network/ZImageView.h
+ )
+endif(USE_MARBLE)
+
+## Main Vidalia sources
+set(vidalia_SRCS ${vidalia_SRCS}
+ main.cpp
+ Vidalia.cpp
+ LanguageSupport.cpp
+ MainWindow.cpp
+ VClickLabel.cpp
+ VidaliaWindow.cpp
+ VMessageBox.cpp
+ HelperProcess.cpp
+ ControlPasswordInputDialog.cpp
+)
+qt4_wrap_cpp(vidalia_SRCS
+ Vidalia.h
+ MainWindow.h
+ VClickLabel.h
+ VidaliaWindow.h
+ VMessageBox.h
+ HelperProcess.h
+ ControlPasswordInputDialog.h
+)
+if (USE_BREAKPAD)
+ set(vidalia_SRCS ${vidalia_SRCS}
+ CrashReporter.cpp
+ )
+endif(USE_BREAKPAD)
+
+## Specify all the Qt Designer .ui files
+qt4_wrap_ui(vidalia_SRCS
+ ControlPasswordInputDialog.ui
+ MainWindow.ui
+ about/AboutDialog.ui
+ about/LicenseDialog.ui
+ bwgraph/BandwidthGraph.ui
+ config/AdvancedPage.ui
+ config/AppearancePage.ui
+ config/BridgeDownloaderProgressDialog.ui
+ config/BridgeUsageDialog.ui
+ config/ConfigDialog.ui
+ config/GeneralPage.ui
+ config/NetworkPage.ui
+ config/ServerPage.ui
+ config/ServicePage.ui
+ help/browser/HelpBrowser.ui
+ log/MessageLog.ui
+ network/NetViewer.ui
+ network/RouterInfoDialog.ui
+)
+
+if (USE_MINIUPNPC)
+ qt4_wrap_ui(vidalia_SRCS config/UPNPTestDialog.ui)
+endif(USE_MINIUPNPC)
+
+if (USE_AUTOUPDATE)
+ set(vidalia_SRCS ${vidalia_SRCS}
+ PackageInfo.cpp
+ UpdateProcess.cpp
+ UpdateProgressDialog.cpp
+ UpdatesAvailableDialog.cpp
+ )
+ qt4_wrap_cpp(vidalia_SRCS
+ UpdateProcess.h
+ UpdateProgressDialog.h
+ UpdatesAvailableDialog.h
+ )
+ qt4_wrap_ui(vidalia_SRCS
+ UpdateProgressDialog.ui
+ UpdatesAvailableDialog.ui
+ )
+endif(USE_AUTOUPDATE)
+
+## Add the resource files (icons, etc.)
+qt4_add_resources(vidalia_SRCS
+ res/vidalia.qrc
+ help/content/content.qrc
+ ${CMAKE_CURRENT_BINARY_DIR}/i18n/vidalia_i18n.qrc
+)
+
+## Specify the map data Marble will need
+set(marble_DATA
+ landcolors.leg
+ seacolors.leg
+ maps/earth/bluemarble/bluemarble.dgml
+ maps/earth/citylights/citylights.dgml
+ maps/earth/srtm/srtm.dgml
+ maps/earth/srtm/srtm.jpg
+ mwdbii/DATELINE.PNT
+ mwdbii/PAUST.PNT
+ mwdbii/PBORDER.PNT
+ mwdbii/PCANPROV.PNT
+ mwdbii/PCOAST.PNT
+ mwdbii/PDIFFBORDER.PNT
+ mwdbii/PGLACIER.PNT
+ mwdbii/PISLAND.PNT
+ mwdbii/PLAKE.PNT
+ mwdbii/PLAKEISLAND.PNT
+ mwdbii/PMEXICO.PNT
+ mwdbii/PUSA48.DIFF.PNT
+ mwdbii/PUSA48.PNT
+ mwdbii/RIVER.PNT
+ placemarks/baseplacemarks.cache
+ placemarks/boundaryplacemarks.cache
+ placemarks/elevplacemarks.cache
+ stars/stars.dat
+ svg/worldmap.svg
+)
+
+## Set the appropriate executable target for the current platform
+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})
+ set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${VERSION})
+ set(MACOSX_BUNDLE_LONG_VERSION_STRING "Version ${VERSION}")
+ set(MACOSX_BUNDLE_ICON_FILE vidalia.icns)
+ set(MACOSX_BUNDLE_GUI_IDENTIFIER "net.vidalia-project.vidalia")
+ set(MACOSX_BUNDLE_INFO_STRING "Vidalia ${VERSION}")
+
+ ## Put everything inside the application bundle
+ set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/)
+ add_executable(${vidalia_BIN} MACOSX_BUNDLE ${vidalia_SRCS})
+
+ ## Get the location of the app bundle for the current configuration
+ get_target_property(VIDALIA_EXECUTABLE ${vidalia_BIN} LOCATION)
+ get_filename_component(MACOSX_BUNDLE_DIRECTORY ${VIDALIA_EXECUTABLE} PATH)
+ get_filename_component(MACOSX_BUNDLE_DIRECTORY "${MACOSX_BUNDLE_DIRECTORY}/../../" ABSOLUTE)
+
+ ## Include the bundle resource files
+ add_custom_command(TARGET ${vidalia_BIN} POST_BUILD
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E make_directory ${MACOSX_BUNDLE_DIRECTORY}/Contents/Resources
+ COMMAND cp
+ ARGS ${CMAKE_CURRENT_SOURCE_DIR}/res/icons/*.icns
+ ${MACOSX_BUNDLE_DIRECTORY}/Contents/Resources/
+ )
+
+ if (USE_MARBLE)
+ ## Copy the Marble data into the bundle
+ foreach(it ${marble_DATA})
+ get_filename_component(outdir ${it} PATH)
+ get_filename_component(outfile ${it} NAME)
+ set(outdir ${MACOSX_BUNDLE_DIRECTORY}/Contents/Resources/data/${outdir})
+
+ add_custom_command(TARGET ${vidalia_BIN} POST_BUILD
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E make_directory ${outdir}
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E copy_if_different
+ ${MARBLE_DATA_DIR}/${it} ${outdir}/${outfile}
+ )
+ endforeach(it)
+
+ ## Create the Marble plugins directory and copy in any wanted plugins
+ if (MARBLE_PLUGINS)
+ add_custom_command(TARGET ${vidalia_BIN} POST_BUILD
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E make_directory
+ ${MACOSX_BUNDLE_DIRECTORY}/Contents/Resources/plugins
+ )
+ foreach(it ${MARBLE_PLUGINS})
+ add_custom_command(TARGET ${vidalia_BIN} POST_BUILD
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E copy_if_different ${it}
+ ${MACOSX_BUNDLE_DIRECTORY}/Contents/Resources/plugins/
+ )
+ endforeach(it)
+ endif(MARBLE_PLUGINS)
+ endif(USE_MARBLE)
+else(APPLE)
+ ## Set the output file name
+ set(vidalia_BIN vidalia)
+
+ if (WIN32)
+ ## Create a Windows binary
+ win32_add_rc(vidalia_SRCS res/vidalia_win.rc)
+ add_executable(${vidalia_BIN} WIN32 ${vidalia_SRCS})
+
+ ## Copy the Marble data into the data/ directory under the binary
+ if (USE_MARBLE)
+ foreach(it ${marble_DATA})
+ get_filename_component(outdir ${it} PATH)
+ get_filename_component(outfile ${it} NAME)
+
+ add_custom_command(TARGET ${vidalia_BIN} POST_BUILD
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${outdir}
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E copy_if_different ${MARBLE_DATA_DIR}/${it}
+ ${CMAKE_CURRENT_BINARY_DIR}/data/${it}
+ )
+ endforeach(it)
+
+ ## Create the Marble plugins directory and copy in any wanted plugins
+ if (MARBLE_PLUGINS)
+ add_custom_command(TARGET ${vidalia_BIN} POST_BUILD
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/plugins/marble
+ )
+ foreach(it ${MARBLE_PLUGINS})
+ add_custom_command(TARGET ${vidalia_BIN} POST_BUILD
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E copy_if_different ${it}
+ ${CMAKE_CURRENT_BINARY_DIR}/plugins/marble/
+ )
+ endforeach(it)
+ endif(MARBLE_PLUGINS)
+ endif(USE_MARBLE)
+
+ else (WIN32)
+ ## Non-Windows, non-Mac
+ add_executable(${vidalia_BIN} ${vidalia_SRCS})
+ endif(WIN32)
+endif(APPLE)
+add_dependencies(${vidalia_BIN} i18n)
+
+
+## Link to the Qt libraries and other libraries built as a part of Vidalia
+target_link_libraries(${vidalia_BIN}
+ ${QT_LIBRARIES}
+ common
+ torcontrol
+)
+if (USE_MINIUPNPC)
+ target_link_libraries(${vidalia_BIN} miniupnpc)
+endif(USE_MINIUPNPC)
+if (USE_BREAKPAD)
+ target_link_libraries(${vidalia_BIN} ${BREAKPAD_LIBRARIES})
+endif(USE_BREAKPAD)
+if (USE_MARBLE)
+ target_link_libraries(${vidalia_BIN}
+ ${MARBLE_LIBRARIES}
+ ${QT_QTSVG_LIBRARY}
+ )
+endif(USE_MARBLE)
+
+if (WIN32)
+ target_link_libraries(${vidalia_BIN}
+ ${QT_QTMAIN_LIBRARY}
+ )
+endif(WIN32)
+
+if (APPLE)
+ target_link_libraries(${vidalia_BIN}
+ "-framework AppKit"
+ iconv
+ )
+endif(APPLE)
+
+## Specify the files to be installed
+install(TARGETS ${vidalia_BIN} DESTINATION bin)
+if(NOT WIN32 AND NOT APPLE)
+ install(FILES vidalia.desktop DESTINATION share/applications)
+ install(FILES res/16x16/tor-logo.png RENAME vidalia.png
+ DESTINATION share/icons/hicolor/16x16/apps)
+ install(FILES res/22x22/tor-logo.png RENAME vidalia.png
+ DESTINATION share/icons/hicolor/22x22/apps)
+ install(FILES res/32x32/tor-logo.png RENAME vidalia.png
+ DESTINATION share/icons/hicolor/32x32/apps)
+ install(FILES res/48x48/tor-logo.png RENAME vidalia.png
+ DESTINATION share/icons/hicolor/48x48/apps)
+ install(FILES res/64x64/tor-logo.png RENAME vidalia.png
+ DESTINATION share/icons/hicolor/64x64/apps)
+ install(FILES res/128x128/tor-logo.png RENAME vidalia.png
+ DESTINATION share/icons/hicolor/128x128/apps)
+endif(NOT WIN32 AND NOT APPLE)
+
+## Remember the location of the Vidalia binary so we can use it in
+## the Windows packaging scripts
+get_target_property(VIDALIA_EXECUTABLE ${vidalia_BIN} LOCATION_RelWithDebInfo)
+set(VIDALIA_EXECUTABLE ${VIDALIA_EXECUTABLE}
+ CACHE STRING "Location of the Vidalia executable." FORCE)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/ControlPasswordInputDialog.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/ControlPasswordInputDialog.cpp
new file mode 100644
index 0000000..692333c
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/ControlPasswordInputDialog.cpp
@@ -0,0 +1,103 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 ControlPasswordInputDialog.cpp
+** \version $Id: ControlPasswordInputDialog.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Prompts the user to enter their control port password, and gives
+** them the option to save or attempt to reset it.
+*/
+
+#include "ControlPasswordInputDialog.h"
+
+#include <QPushButton>
+
+
+ControlPasswordInputDialog::ControlPasswordInputDialog(QWidget *parent)
+ : QDialog(parent)
+{
+ ui.setupUi(this);
+ setSizeGripEnabled(false);
+ 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
+ControlPasswordInputDialog::setResetEnabled(bool enabled)
+{
+ if (enabled) {
+ ui.buttonBox->setStandardButtons(ui.buttonBox->standardButtons()
+ | QDialogButtonBox::Reset);
+ } else {
+ ui.buttonBox->setStandardButtons(ui.buttonBox->standardButtons()
+ & ~QDialogButtonBox::Reset);
+ }
+}
+
+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)
+{
+ QDialogButtonBox::StandardButton btn = ui.buttonBox->standardButton(button);
+ switch (btn) {
+ case QDialogButtonBox::Ok:
+ case QDialogButtonBox::Reset:
+ case QDialogButtonBox::Cancel:
+ done(btn);
+ break;
+
+ case QDialogButtonBox::Help:
+ emit helpRequested("troubleshooting.password");
+ break;
+
+ default:
+ break;
+ }
+}
+
+void
+ControlPasswordInputDialog::setVisible(bool visible)
+{
+ if (visible)
+ resize(minimumSizeHint());
+ QDialog::setVisible(visible);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/ControlPasswordInputDialog.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/ControlPasswordInputDialog.h
new file mode 100644
index 0000000..44638aa
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/ControlPasswordInputDialog.h
@@ -0,0 +1,78 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 ControlPasswordInputDialog.h
+** \version $Id: ControlPasswordInputDialog.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Prompts the user to enter their control port password, and gives
+** them the option to save or attempt to reset it.
+*/
+
+#ifndef _CONTROLPASSWORDINPUTDIALOG_H
+#define _CONTROLPASSWORDINPUTDIALOG_H
+
+#include "ui_ControlPasswordInputDialog.h"
+
+#include <QDialog>
+#include <QString>
+
+
+class ControlPasswordInputDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor.
+ */
+ 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.
+ */
+ void setResetEnabled(bool enabled);
+
+signals:
+ /** Emitted when the user clicks on the "Help" dialog button.
+ */
+ void helpRequested(const QString &topic);
+
+protected slots:
+ /** Called when one of the QDialogButtonBox's buttons is clicked. The dialog
+ * is closed if <b>button</b> is the "Ok", "Cancel", or "Reset" button, and
+ * the clicked button's QDialogButtonBox::StandardButton enum value is
+ * returned as the dialog's result code.
+ */
+ 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);
+
+private:
+ Ui::ControlPasswordInputDialog ui; /**< Qt Designer generated object. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/ControlPasswordInputDialog.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/ControlPasswordInputDialog.ui
new file mode 100644
index 0000000..00b5002
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/ControlPasswordInputDialog.ui
@@ -0,0 +1,128 @@
+<ui version="4.0" >
+ <class>ControlPasswordInputDialog</class>
+ <widget class="QDialog" name="ControlPasswordInputDialog" >
+ <property name="windowModality" >
+ <enum>Qt::WindowModal</enum>
+ </property>
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>350</width>
+ <height>192</height>
+ </rect>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>350</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="windowTitle" >
+ <string>Password Required</string>
+ </property>
+ <property name="windowIcon" >
+ <iconset>
+ <normaloff>:/images/32x32/dialog-password.png</normaloff>:/images/32x32/dialog-password.png</iconset>
+ </property>
+ <property name="sizeGripEnabled" >
+ <bool>false</bool>
+ </property>
+ <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" >
+ <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" >
+ <horstretch>1</horstretch>
+ <verstretch>1</verstretch>
+ </sizepolicy>
+ </property>
+ <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>
+ <property name="textFormat" >
+ <enum>Qt::PlainText</enum>
+ </property>
+ <property name="scaledContents" >
+ <bool>true</bool>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <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>
+ </property>
+ </widget>
+ </item>
+ <item row="3" 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="1" column="1" >
+ <widget class="QLineEdit" name="linePassword" >
+ <property name="echoMode" >
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <resources>
+ <include location="res/vidalia.qrc" />
+ </resources>
+ <connections/>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/CrashReporter.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/CrashReporter.cpp
new file mode 100644
index 0000000..7bb7d8b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/CrashReporter.cpp
@@ -0,0 +1,408 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+/*
+** The append_string() function in this file is derived from the implementation
+** of strlcat() by Todd C. Miller. It is licensed as follows:
+**
+** Copyright (c) 1998 Todd C. Miller <Todd.Miller at courtesan.com>
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+** 1. Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** 2. Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in the
+** documentation and/or other materials provided with the distribution.
+** 3. The name of the author may not be used to endorse or promote products
+** derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+** INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+** AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+** THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+** OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+** WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+** OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+** ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+** \file CrashReporter.h
+** \version $Id$
+** \brief General routines to install a Breakpad-based exception handler and
+** set options related to launching the crash reporting application.
+*/
+
+#include "CrashReporter.h"
+#include "stringutil.h"
+
+#if defined(Q_OS_WIN32)
+#include <client/windows/handler/exception_handler.h>
+#elif defined(Q_OS_MAC)
+#include <client/mac/handler/exception_handler.h>
+#elif defined(Q_OS_LINUX)
+#include <client/linux/handler/exception_handler.h>
+#elif defined(Q_OS_SOLARIS)
+#include <client/solaris/handler/exception_handler.h>
+#endif
+
+#include <QString>
+#include <QStringList>
+#include <QFileInfo>
+#include <QDir>
+
+#include <time.h>
+
+
+namespace CrashReporter
+{
+#if defined(Q_OS_WIN32)
+typedef wchar_t _char_t;
+typedef HANDLE _file_handle_t;
+#define PATH_SEPARATOR TEXT("\\")
+# ifdef _USE_32BIT_TIME_T
+# define TIME_TO_STRING(buf, buflen, t) \
+ _ltoa_s(t, buf, buflen, 10)
+# else
+# define TIME_TO_STRING(buf, buflen, t) \
+ _i64toa_s(t, buf, buflen, 10)
+# endif
+#else
+typedef char _char_t;
+typedef int _file_handle_t;
+#define PATH_SEPARATOR "/"
+#define TEXT(x) (x)
+#define TIME_TO_STRING(buf, buflen, t) \
+ snprintf(buf, buflen, "%ld", t)
+#endif
+
+/** Pointer to the Breakpad-installed exception handler called if Vidalia
+ * crashes.
+ * \sa install_exception_handler()
+ */
+static google_breakpad::ExceptionHandler *exceptionHandler = 0;
+
+/** If true, the crash reporting application will be displayed when the
+ * Breakpad-installed exception handler is called. Otherwise, the system
+ * will handle the exception itself.
+ * \sa set_crash_reporter()
+ */
+static bool showCrashReporter = false;
+
+/** Absolute path of the crash reporting application that will be launched
+ * from the exception handler.
+ * \sa set_crash_reporter()
+ */
+static _char_t crashReporterExecutable[MAX_PATH_LEN + 1] = TEXT("");
+
+/** Version information for the application being monitored for crashes.
+ * The version will be written to the extra information file alongside
+ * the minidump.
+ */
+static char buildVersion[MAX_VERSION_LEN + 1] = "";
+
+/** Path and filename of the application to restart after displaying
+ * the crash reporting dialog. The contents of this string are encoded
+ * in UTF-8.
+ * \sa set_restart_options()
+ */
+static char restartExecutable[MAX_CMD_LEN + 1] = "";
+
+/** Additional arguments to use when restarting the crashed application.
+ * The contents of this string are encoded in UTF-8.
+ * \sa set_restart_options()
+ */
+static char restartExecutableArgs[MAX_CMD_LEN + 1] = "";
+
+
+/** Records the time at which install_exception_handler() is called, which
+ * is usually as early as possible during application startup. This is used
+ * in minidump_callback() to determine how long the application was running
+ * before it crashed.
+ * \sa install_exception_handler()
+ * \sa minidump_callback()
+ */
+static time_t startupTime = 0;
+
+
+/** Slightly modified version of the strlcat() implementation by Todd C.
+ * Miller (see the top of this file or the LICENSE file for license details),
+ * that supports arguments of either wchar_t* on Windows or the usual char*
+ * everywhere else but retains the semantics of strlcat().
+ */
+static size_t
+append_string(_char_t *dst, const _char_t *src, size_t siz)
+{
+ _char_t *d = dst;
+ const _char_t *s = src;
+ size_t n = siz;
+ size_t dlen;
+
+ /* Find the end of dst and adjust bytes left but don't go past end */
+ while (n-- != 0 && *d != TEXT('\0'))
+ d++;
+ dlen = d - dst;
+ n = siz - dlen;
+
+ if (n == 0)
+#if defined(Q_OS_WIN32)
+ return (dlen + wcslen(s));
+#else
+ return(dlen + strlen(s));
+#endif
+
+ while (*s != TEXT('\0')) {
+ if (n != 1) {
+ *d++ = *s;
+ n--;
+ }
+ s++;
+ }
+ *d = TEXT('\0');
+
+ return(dlen + (s - src)); /* count does not include NUL */
+}
+
+/** Writes the formatted string "<b>key</b>=</b>val\n" to the file handle
+ * specified by <b>hFile</b>. On Windows, <b>hFile</b> is a HANDLE. Everywhere
+ * else, <b>hFile</b> is an int.
+ */
+static void
+write_keyval_to_file(_file_handle_t hFile, const char *key, const char *val)
+{
+#if defined(Q_OS_WIN32)
+ DWORD dwWritten;
+ WriteFile(hFile, key, strlen(key), &dwWritten, NULL);
+ WriteFile(hFile, "=", 1, &dwWritten, NULL);
+ WriteFile(hFile, val, strlen(val), &dwWritten, NULL);
+ WriteFile(hFile, "\n", 1, &dwWritten, NULL);
+#else
+ write(hFile, key, strlen(key));
+ write(hFile, "=", 1);
+ write(hFile, val, strlen(val));
+ write(hFile, "\n", 1);
+#endif
+}
+
+/** Writes to a file extra information used by the crash reporting
+ * application such as how long the application was running before it
+ * crashed, the application to restart, as well as any extra arguments.
+ * The contents of the file are formatted as a series of "Key=Val\n" pairs.
+ * The written file has the same path and base filename as the minidump
+ * file, with ".info" appended to the end. Returns true if the file was
+ * created succesfully. Otherwise, returns false.
+ */
+static bool
+write_extra_dump_info(const _char_t *path, const _char_t *id, time_t crashTime)
+{
+ static const char *KeyBuildVersion = "BuildVersion";
+ static const char *KeyCrashTime = "CrashTime";
+ static const char *KeyStartupTime = "StartupTime";
+ static const char *KeyRestartExecutable = "RestartExecutable";
+ static const char *KeyRestartExecutableArgs = "RestartExecutableArgs";
+
+ _char_t extraInfoPath[MAX_PATH_LEN] = TEXT("");
+ append_string(extraInfoPath, path, MAX_PATH_LEN);
+ append_string(extraInfoPath, PATH_SEPARATOR, MAX_PATH_LEN);
+ append_string(extraInfoPath, id, MAX_PATH_LEN);
+ size_t len = append_string(extraInfoPath, TEXT(".dmp.info"), MAX_PATH_LEN);
+ if (len >= MAX_PATH_LEN)
+ return false;
+
+#if defined(Q_OS_WIN32)
+ HANDLE hFile = CreateFile(extraInfoPath, GENERIC_WRITE, 0, NULL,
+ CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+ if (hFile == INVALID_HANDLE_VALUE)
+ return false;
+#else
+ /* TODO: Implement for non-Windowses */
+#endif
+
+ char crashTimeString[24], startupTimeString[24];
+ TIME_TO_STRING(crashTimeString, 24, crashTime);
+ TIME_TO_STRING(startupTimeString, 24, startupTime);
+
+ write_keyval_to_file(hFile, KeyBuildVersion, buildVersion);
+ write_keyval_to_file(hFile, KeyCrashTime, crashTimeString);
+ write_keyval_to_file(hFile, KeyStartupTime, startupTimeString);
+ write_keyval_to_file(hFile, KeyRestartExecutable, restartExecutable);
+ write_keyval_to_file(hFile, KeyRestartExecutableArgs, restartExecutableArgs);
+
+#if defined(Q_OS_WIN32)
+ CloseHandle(hFile);
+#else
+ /* TODO: Implement for non-Windowses */
+ /* close(hFile); */
+#endif
+ return true;
+}
+
+/** Breakpad-installed exception handler. This function gets called in the
+ * event of a crash. If <b>showCrashReporter</b> is true, this will execute
+ * the crash reporting application, passing it the name and location of the
+ * generated minidump, the absolute path to the (now crashed) Vidalia
+ * executable, and any arguments that may be needed to restart Vidalia.
+ */
+bool
+minidump_callback(const _char_t *path, // Path to the minidump file
+ const _char_t *id, // Minidump UUID
+ void *context, // Callback context
+#if defined(Q_OS_WIN32)
+ EXCEPTION_POINTERS *exInfo,
+ MDRawAssertionInfo *assertionInfo,
+#endif
+ bool succeeded)
+{
+ if (! succeeded || ! showCrashReporter)
+ return false;
+
+ /* Write the extra dump info, such as application uptime, executable to
+ * restart, and any necessary restart arguments. */
+ write_extra_dump_info(path, id, time(NULL));
+
+ /* Format the command line used to launch the crash reporter */
+ _char_t commandLine[MAX_CMD_LEN] = TEXT("");
+ append_string(commandLine, TEXT("\""), MAX_CMD_LEN);
+ append_string(commandLine, crashReporterExecutable, MAX_CMD_LEN);
+ append_string(commandLine, TEXT("\" \""), MAX_CMD_LEN);
+ append_string(commandLine, path, MAX_CMD_LEN);
+ append_string(commandLine, PATH_SEPARATOR, MAX_CMD_LEN);
+ append_string(commandLine, id, MAX_CMD_LEN);
+ size_t len = append_string(commandLine, TEXT(".dmp\""), MAX_CMD_LEN);
+ if (len >= MAX_CMD_LEN)
+ return false;
+
+ /* Launch the crash reporter with the name and location of the minidump */
+#if defined(Q_OS_WIN32)
+ PROCESS_INFORMATION pi;
+ STARTUPINFOW si;
+
+ ZeroMemory(&pi, sizeof(pi));
+ ZeroMemory(&si, sizeof(si));
+ si.cb = sizeof(si);
+ si.dwFlags = STARTF_USESHOWWINDOW;
+ si.wShowWindow = SW_SHOWDEFAULT;
+
+ BOOL rc = CreateProcess(NULL, (LPWSTR)commandLine, NULL, NULL, FALSE, 0,
+ NULL, NULL, &si, &pi);
+ if (rc) {
+ CloseHandle(pi.hThread);
+ CloseHandle(pi.hProcess);
+ }
+ TerminateProcess(GetCurrentProcess(), 1);
+ return true;
+#else
+ /* TODO: Implement for non-Windowses */
+ return false;
+#endif
+}
+
+bool
+install_exception_handler(const QString &dumpPath)
+{
+ /* Create a directory for the crash dumps if it doesn't already exist */
+ QDir dumpDir(dumpPath);
+ if (! dumpDir.exists() && ! dumpDir.mkdir("."))
+ return false;
+
+ /* Create the exception handler and specify where the dumps should go */
+ exceptionHandler = new google_breakpad::ExceptionHandler(
+#if defined(Q_OS_WIN32)
+ dumpDir.absolutePath().toStdWString(),
+#else
+ dumpDir.absolutePath().toStdString(),
+#endif
+ NULL,
+ minidump_callback,
+ NULL,
+#if defined(Q_OS_WIN32)
+ google_breakpad::ExceptionHandler::HANDLER_ALL);
+#else
+ true);
+#endif
+ if (! exceptionHandler)
+ return false;
+
+ startupTime = time(NULL);
+ return true;
+}
+
+void
+remove_exception_handler(void)
+{
+ if (exceptionHandler) {
+ delete exceptionHandler;
+ exceptionHandler = 0;
+ }
+}
+
+bool
+set_crash_reporter(const QString &crashReporter)
+{
+#if defined(Q_OS_WIN32)
+ if (crashReporter.length() <= CrashReporter::MAX_PATH_LEN) {
+ crashReporter.toWCharArray(crashReporterExecutable);
+ crashReporterExecutable[crashReporter.length()] = L'\0';
+#else
+ QByteArray utf8 = crashReporter.toUtf8();
+ if (utf8.length() <= CrashReporter::MAX_PATH_LEN) {
+ memcpy(crashReporterExecutable, utf8.constData(), utf8.length());
+ crashReporterExecutable[utf8.length()] = '\0';
+#endif
+ showCrashReporter = true;
+ } else {
+ /* If the given path is longer than MAX_PATH_LEN, no crash reporting
+ * application will be set since the user's platform wouldn't be able to
+ * execute it anyway.
+ */
+ showCrashReporter = false;
+ }
+ return showCrashReporter;
+}
+
+bool
+set_restart_options(const QString &executable, const QStringList &arguments)
+{
+ QByteArray exe = executable.toUtf8();
+ if (exe.length() > MAX_CMD_LEN)
+ return false;
+
+ QByteArray args = string_format_arguments(arguments).toUtf8();
+ if (args.length() > MAX_CMD_LEN)
+ return false;
+
+ memcpy(restartExecutable, exe.constData(), exe.length());
+ restartExecutable[exe.length()] = '\0';
+
+ memcpy(restartExecutableArgs, args.constData(), args.length());
+ restartExecutableArgs[args.length()] = '\0';
+
+ return true;
+}
+
+bool
+set_build_version(const QString &version)
+{
+ if (version.length() > MAX_VERSION_LEN)
+ return false;
+
+ QByteArray ascii = version.toAscii();
+ memcpy(buildVersion, ascii.constData(), ascii.length());
+ buildVersion[ascii.length()] = '\0';
+
+ return true;
+}
+
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/CrashReporter.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/CrashReporter.h
new file mode 100644
index 0000000..c627f8a
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/CrashReporter.h
@@ -0,0 +1,96 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 CrashReporter.h
+** \version $Id$
+** \brief General routines to install a Breakpad-based exception handler and
+** set options related to launching the crash reporting application.
+*/
+
+#ifndef _CRASHREPORTER_H
+#define _CRASHREPORTER_H
+
+class QString;
+class QStringList;
+
+
+namespace CrashReporter
+{
+ /** Defines the maximum length of the absolute path plus filename of the
+ * crash reporting executable displayed when the exception handler is
+ * called.
+ */
+#if defined(Q_OS_WIN32)
+ static const int MAX_PATH_LEN = 260;
+#else
+ static const int MAX_PATH_LEN = 4096; /* Is there a better value for this? */
+#endif
+
+ /** Defines the maximum length of the command line arguments used to restart
+ * the crashed application by the crash reporter. The maximum command line
+ * length is based on Windows' 32K character command line limit, according
+ * to the MSDN documents.
+ */
+ static const int MAX_CMD_LEN = 32768;
+
+ /** Defines the maximum length of a build version string that can be set
+ * by set_build_version().
+ * \sa set_build_version()
+ */
+ static const int MAX_VERSION_LEN = 64;
+
+ /** Installs the Breakpad exception handler and sets the static global
+ * variables used by the exception handler to launch the crash reporting
+ * application. Minidumps will be writen to <b>dumpPath</b>, which will
+ * be created if it doesn't already exist.
+ * \sa remove_exception_handler()
+ */
+ bool install_exception_handler(const QString &dumpPath);
+
+ /** Removes the application's exception handler previously created by
+ * install_exception_handler(). If no exception handler was previously created,
+ * no action will be taken.
+ * \sa install_exception_handler()
+ */
+ void remove_exception_handler(void);
+
+ /** Sets <b>crashReporter</b> as the executable that gets called when the
+ * exception handler catches a crash. If <b>crashReporter</b> contains one
+ * or more spaces, the given path will be wrapped in quotes. The caller is
+ * responsible for ensuring that <b>crashReporter</b> is no greater than
+ * CrashReporter::MAX_PATH_LEN (including added quotes). Returns true if
+ * the crash reporting application was set successfully, or false if
+ * <b>crashReporter</b> was too long.
+ */
+ bool set_crash_reporter(const QString &crashReporter);
+
+ /** Sets the <b>executable</b> and <b>args</b> that will be passed to the
+ * crash reporting application, so it can restart the crashed application
+ * with the same arguments as before it crashed. If the <b>executable</b>
+ * path or any of <b>args</b> contains a space, they will be quoted before
+ * being passed to the crash reporting application. The path to the
+ * generated minidump, crash reporting application, executable to restart
+ * and any arguments must fit within MAX_CMD_LEN, including any added
+ * quotes.
+ * \sa set_crash_reporter()
+ */
+ bool set_restart_options(const QString &executable,
+ const QStringList &arguments);
+
+ /** Sets <b>version</b> as the build version identifier written to the
+ * extra information file alongside a minidump. The version string must
+ * be no longer than CrashReporter::MAX_VERSION_LEN.
+ */
+ bool set_build_version(const QString &version);
+}
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/HelperProcess.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/HelperProcess.cpp
new file mode 100644
index 0000000..60ac9b5
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/HelperProcess.cpp
@@ -0,0 +1,134 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+/*
+** This file was originally written by Steven J. Murdoch, and
+** modified by Matt Edman. It is distributed under the following
+** license:
+**
+** Copyright (C) 2007, Matt Edman
+** Copyright (C) 2007, Steven J. Murdoch
+** <http://www.cl.cam.ac.uk/users/sjm217/>
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor,
+** Boston, MA 02110-1301, USA.
+*/
+
+/*
+** \file helperprocess.cpp
+** \version $Id: HelperProcess.cpp 4132 2009-09-24 02:28:18Z edmanm $
+** \brief Invokes a web browser process (originally by Steven. J. Murdoch)
+*/
+
+#include "HelperProcess.h"
+#include "Vidalia.h"
+
+#include "stringutil.h"
+
+#include <QString>
+#include <QFileInfo>
+
+
+/** Default constructor */
+HelperProcess::HelperProcess(QObject *parent)
+: QProcess(parent)
+{
+ // Call error handling routine on errors
+ QObject::connect(this, SIGNAL(error(QProcess::ProcessError)),
+ this, SLOT(onError(QProcess::ProcessError)));
+
+ // Call output handling routines on process output
+ QObject::connect(this, SIGNAL(readyReadStandardError()),
+ this, SLOT(onReadyReadStandardError()));
+ QObject::connect(this, SIGNAL(readyReadStandardOutput()),
+ this, SLOT(onReadyReadStandardOutput()));
+}
+
+/** Invoked when output is written to the process's stderr. */
+void
+HelperProcess::onReadyReadStandardError()
+{
+ QString output = QString(readAllStandardError());
+ foreach (QString line, output.split("\n")) {
+ vInfo("(%1:stderr): %2").arg(_processName).arg(line);
+ }
+}
+
+/** Invoked when output is written to the process's stdout. */
+void
+HelperProcess::onReadyReadStandardOutput()
+{
+ QString output = QString(readAllStandardOutput());
+ foreach (QString line, output.split("\n")) {
+ vInfo("(%1:stdout): %2").arg(_processName).arg(line);
+ }
+}
+
+void
+HelperProcess::start(const QString &app, const QString &args)
+{
+ QFileInfo fi(app);
+ _processName = fi.fileName();
+
+ QString commandLine = QString("\"%1\" %2").arg(app).arg(args);
+
+ // Log the process name and arguments
+ vNotice("Launching helper process with command line '%1'")
+ .arg(commandLine);
+
+ QProcess::start(commandLine, QIODevice::ReadOnly | QIODevice::Text);
+}
+
+/** Start the specified application. */
+void
+HelperProcess::start(const QString &app, const QStringList &args)
+{
+ // Remember the executable name of the process
+ QFileInfo fi(app);
+ _processName = fi.fileName();
+
+ // Log the process name and arguments
+ vNotice("Launching helper process '%1' with arguments '%2'").arg(app)
+ .arg(string_format_arguments(args));
+
+ // Start the specified application
+ QProcess::start(app, args, QIODevice::ReadOnly | QIODevice::Text);
+}
+
+/** Invoked when underlying QProcess fails. */
+void
+HelperProcess::onError(QProcess::ProcessError error)
+{
+ // Pass up error messages on startup, but ignore the rest
+ if (error == QProcess::FailedToStart) {
+ vWarn("Helper process '%1' failed to start: %2").arg(_processName)
+ .arg(errorString());
+ emit startFailed(errorString());
+ }
+}
+
+/** Returns true iff process is not running. */
+bool
+HelperProcess::isDone() const
+{
+ return state() == NotRunning;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/HelperProcess.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/HelperProcess.h
new file mode 100644
index 0000000..5d2a2d5
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/HelperProcess.h
@@ -0,0 +1,80 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+/*
+** This file was originally written by Steven J. Murdoch, and
+** modified by Matt Edman. It is distributed under the following
+** license:
+**
+** Copyright (C) 2007, Matt Edman
+** Copyright (C) 2007, Steven J. Murdoch
+** <http://www.cl.cam.ac.uk/users/sjm217/>
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor,
+** Boston, MA 02110-1301, USA.
+*/
+
+/*
+** \file HelperProcess.h
+** \version $Id: HelperProcess.h 4132 2009-09-24 02:28:18Z edmanm $
+** \brief Invokes a web browser process (originally by Steven. J. Murdoch)
+*/
+
+#ifndef _HELPERPROCESS_H
+#define _HELPERPROCESS_H
+
+#include <QProcess>
+
+
+class HelperProcess : public QProcess
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor */
+ HelperProcess(QObject *parent = 0);
+ /** Start <b>app</b> with <b>args</b> appended to the end of the command
+ * line. <b>app</b> will be quoted, so an executable name with spaces is
+ * acceptable. */
+ void start(const QString &app, const QString &args);
+ /** Start the specified application. */
+ void start(const QString &app, const QStringList &args);
+ /** Returns true iff process is not running. */
+ bool isDone() const;
+
+signals:
+ /** Invoked when start() fails. */
+ void startFailed(const QString &errorMessage);
+
+private slots:
+ /** Invoked when underlying QProcess fails. */
+ void onError(QProcess::ProcessError error);
+ /** Invoked when output is written to the process's stderr. */
+ void onReadyReadStandardError();
+ /** Invoked when output is written to the process's stdout. */
+ void onReadyReadStandardOutput();
+
+private:
+ QString _processName;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/LanguageSupport.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/LanguageSupport.cpp
new file mode 100644
index 0000000..a96c2e6
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/LanguageSupport.cpp
@@ -0,0 +1,128 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 LanguageSupport.cpp
+** \version $Id: LanguageSupport.cpp 4266 2010-04-17 21:45:21Z edmanm $
+** \brief Contains languages supported by Vidalia
+*/
+
+#include "LanguageSupport.h"
+#include "Vidalia.h"
+
+#include <QLocale>
+
+
+/** Initializes the list of available languages. */
+QMap<QString, QString>
+LanguageSupport::languages()
+{
+ static QMap<QString, QString> languages;
+ if (languages.isEmpty()) {
+ languages.insert("en", "English");
+ 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("bms", "Burmese");
+// languages.insert("cs",
+// QString::fromUtf8("\304\215e\305\241tina"));
+ languages.insert("da", "dansk");
+ languages.insert("de", "Deutsch");
+ languages.insert("es",
+ QString::fromUtf8("espa\303\261ol"));
+ languages.insert("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("hu", "magyar nyelv");
+ languages.insert("it", "Italiano");
+ 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("pl", "Polski");
+ languages.insert("pt",
+ QString::fromUtf8("Portugu\303\252s"));
+ 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("sv", "svenska");
+ 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("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"));
+ }
+ return languages;
+}
+
+/** Returns the default language code for the system locale. */
+QString
+LanguageSupport::defaultLanguageCode()
+{
+ QString language = QLocale::system().name();
+
+ if (language != "zh_CN" && language != "zh_TW")
+ language = language.mid(0, language.indexOf("_"));
+ if (!isValidLanguageCode(language))
+ language = "en";
+
+ return language;
+}
+
+/** Returns the language code for a given language name. */
+QString
+LanguageSupport::languageCode(const QString &languageName)
+{
+ return languages().key(languageName);
+}
+
+/** Returns a list of all supported language codes. (e.g., "en"). */
+QStringList
+LanguageSupport::languageCodes()
+{
+ return languages().keys();
+}
+
+/** Returns the language name for a given language code. */
+QString
+LanguageSupport::languageName(const QString &languageCode)
+{
+ return languages().value(languageCode);
+}
+
+/** Returns a list of all supported language names (e.g., "English"). */
+QStringList
+LanguageSupport::languageNames()
+{
+ return languages().values();
+}
+
+/** Returns true if we understand the given language code. */
+bool
+LanguageSupport::isValidLanguageCode(const QString &languageCode)
+{
+ return languageCodes().contains(languageCode);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/LanguageSupport.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/LanguageSupport.h
new file mode 100644
index 0000000..57e30ef
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/LanguageSupport.h
@@ -0,0 +1,44 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 LanguageSupport.h
+** \version $Id: LanguageSupport.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Contains languages supported by Vidalia
+*/
+
+#ifndef _LANGUAGESUPPORT_H
+#define _LANGUAGESUPPORT_H
+
+#include <QStringList>
+#include <QMap>
+
+
+class LanguageSupport
+{
+public:
+ /** Returns the default language code for the system locale. */
+ static QString defaultLanguageCode();
+ /** Returns the language code for a given language name. */
+ static QString languageCode(const QString &languageName);
+ /** Returns a list of all supported language codes (e.g., "en"). */
+ static QStringList languageCodes();
+ /** Returns the language name for a given language code. */
+ static QString languageName(const QString &languageCode);
+ /** Returns a list of all supported language names (e.g., "English"). */
+ static QStringList languageNames();
+ /** Returns a list of all supported language codes and names. */
+ static QMap<QString, QString> languages();
+ /** Returns true if we understand the given language code. */
+ static bool isValidLanguageCode(const QString &languageCode);
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/MainWindow.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/MainWindow.cpp
new file mode 100644
index 0000000..4711e28
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/MainWindow.cpp
@@ -0,0 +1,1949 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 MainWindow.cpp
+** \version $Id: MainWindow.cpp 4227 2010-02-25 04:03:32Z edmanm $
+** \brief Main (hidden) window. Creates tray menu and child windows
+**
+** Implements the main window. The main window is a hidden window that serves
+** as the parent of the tray icon and popup menu, as well as other application
+** dialogs.
+*/
+
+#include "MainWindow.h"
+#include "Vidalia.h"
+#include "VMessageBox.h"
+#include "ControlPasswordInputDialog.h"
+#include "TorSettings.h"
+#include "ServerSettings.h"
+#ifdef USE_AUTOUPDATE
+#include "UpdatesAvailableDialog.h"
+#endif
+
+#include "ProtocolInfo.h"
+
+#include "net.h"
+#include "file.h"
+#include "html.h"
+#include "stringutil.h"
+#include "procutil.h"
+
+#include <QMenuBar>
+#include <QTimer>
+#include <QTextStream>
+
+#define IMG_BWGRAPH ":/images/16x16/utilities-system-monitor.png"
+#define IMG_CONTROL_PANEL ":/images/16x16/system-run.png"
+#define IMG_MESSAGELOG ":/images/16x16/format-justify-fill.png"
+#define IMG_CONFIG ":/images/16x16/preferences-system.png"
+#define IMG_IDENTITY ":/images/16x16/view-media-artist.png"
+#define IMG_HELP ":/images/16x16/system-help.png"
+#define IMG_ABOUT ":/images/16x16/help-about.png"
+#define IMG_EXIT ":/images/16x16/application-exit.png"
+#define IMG_NETWORK ":/images/16x16/applications-internet.png"
+
+#define IMG_START_TOR_16 ":/images/16x16/media-playback-start.png"
+#define IMG_STOP_TOR_16 ":/images/16x16/media-playback-stop.png"
+#define IMG_START_TOR_48 ":/images/48x48/media-playback-start.png"
+#define IMG_STOP_TOR_48 ":/images/48x48/media-playback-stop.png"
+#define IMG_TOR_STOPPED_48 ":/images/48x48/tor-off.png"
+#define IMG_TOR_RUNNING_48 ":/images/48x48/tor-on.png"
+#define IMG_TOR_STARTING_48 ":/images/48x48/tor-starting.png"
+#define IMG_TOR_STOPPING_48 ":/images/48x48/tor-stopping.png"
+
+/* Decide which of our four sets of tray icons to use. */
+#if defined(Q_WS_WIN)
+/* QSystemTrayIcon on Windows wants 16x16 .png files */
+#define IMG_TOR_STOPPED ":/images/16x16/tor-off.png"
+#define IMG_TOR_RUNNING ":/images/16x16/tor-on.png"
+#define IMG_TOR_STARTING ":/images/16x16/tor-starting.png"
+#define IMG_TOR_STOPPING ":/images/16x16/tor-stopping.png"
+#elif defined(Q_WS_MAC)
+/* On Mac, the dock icons look best at 128x128, otherwise they get blurry
+ * if resized from a smaller image */
+#define IMG_TOR_STOPPED ":/images/128x128/tor-off.png"
+#define IMG_TOR_RUNNING ":/images/128x128/tor-on.png"
+#define IMG_TOR_STARTING ":/images/128x128/tor-starting.png"
+#define IMG_TOR_STOPPING ":/images/128x128/tor-stopping.png"
+void qt_mac_set_dock_menu(QMenu *menu);
+#else
+/* On X11, we just use always the 22x22 .png files */
+#define IMG_TOR_STOPPED ":/images/22x22/tor-off.png"
+#define IMG_TOR_RUNNING ":/images/22x22/tor-on.png"
+#define IMG_TOR_STARTING ":/images/22x22/tor-starting.png"
+#define IMG_TOR_STOPPING ":/images/22x22/tor-stopping.png"
+#endif
+
+/** Only allow 'New Identity' to be clicked once every 10 seconds. */
+#define MIN_NEWIDENTITY_INTERVAL (10*1000)
+
+/* Startup progress milestones */
+#define STARTUP_PROGRESS_STARTING 0
+#define STARTUP_PROGRESS_CONNECTING 10
+#define STARTUP_PROGRESS_AUTHENTICATING 20
+#define STARTUP_PROGRESS_BOOTSTRAPPING 30
+#define STARTUP_PROGRESS_CIRCUITBUILD 75
+#define STARTUP_PROGRESS_MAXIMUM (STARTUP_PROGRESS_BOOTSTRAPPING+100)
+
+/** Default constructor. It installs an icon in the system tray area and
+ * creates the popup menu associated with that icon. */
+MainWindow::MainWindow()
+: VidaliaWindow("MainWindow")
+{
+ VidaliaSettings settings;
+
+ ui.setupUi(this);
+
+ /* Pressing 'Esc' or 'Ctrl+W' will close the window */
+ Vidalia::createShortcut("Ctrl+W", this, ui.btnHide, SLOT(click()));
+ Vidalia::createShortcut("Esc", this, ui.btnHide, SLOT(click()));
+
+ /* Create all the dialogs of which we only want one instance */
+ _messageLog = new MessageLog();
+ _bandwidthGraph = new BandwidthGraph();
+ _netViewer = new NetViewer();
+ _configDialog = new ConfigDialog();
+ _menuBar = 0;
+ connect(_messageLog, SIGNAL(helpRequested(QString)),
+ this, SLOT(showHelpDialog(QString)));
+ connect(_netViewer, SIGNAL(helpRequested(QString)),
+ this, SLOT(showHelpDialog(QString)));
+ connect(_configDialog, SIGNAL(helpRequested(QString)),
+ this, SLOT(showHelpDialog(QString)));
+
+ /* 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)));
+
+ /* Create a new HelperProcess object, used to start the web browser */
+ _browserProcess = new HelperProcess(this);
+ connect(_browserProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
+ this, SLOT(onSubprocessFinished(int, QProcess::ExitStatus)));
+ connect(_browserProcess, SIGNAL(startFailed(QString)),
+ this, SLOT(onBrowserFailed(QString)));
+
+ /* Create a new HelperProcess object, used to start the IM client */
+ _imProcess = new HelperProcess(this);
+ connect(_imProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
+ this, SLOT(onSubprocessFinished(int, QProcess::ExitStatus)));
+ connect(_imProcess, SIGNAL(startFailed(QString)),
+ this, SLOT(onIMFailed(QString)));
+
+ /* Create a new HelperProcess object, used to start the proxy server */
+ _proxyProcess = new HelperProcess(this);
+ connect(_proxyProcess, SIGNAL(startFailed(QString)),
+ this, SLOT(onProxyFailed(QString)));
+
+ /* Catch signals when the application is running or shutting down */
+ connect(vApp, SIGNAL(running()), this, SLOT(running()));
+ connect(vApp, SIGNAL(aboutToQuit()), this, SLOT(aboutToQuit()));
+
+#if defined(USE_AUTOUPDATE)
+ /* Create a timer used to remind us to check for software updates */
+ 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();
+}
+
+/** Destructor. */
+MainWindow::~MainWindow()
+{
+ _trayIcon.hide();
+ delete _messageLog;
+ delete _bandwidthGraph;
+ delete _netViewer;
+ delete _configDialog;
+}
+
+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());
+ }
+ }
+ VidaliaWindow::setVisible(visible);
+}
+
+void
+MainWindow::retranslateUi()
+{
+ ui.retranslateUi(this);
+
+ updateTorStatus(_status);
+ if (_status == Stopped) {
+ _actionStartStopTor->setText(tr("Start Tor"));
+ ui.lblStartStopTor->setText(tr("Start Tor"));
+ } else if (_status == Starting) {
+ _actionStartStopTor->setText(tr("Starting Tor"));
+ ui.lblStartStopTor->setText(tr("Starting Tor"));
+ } else {
+ _actionStartStopTor->setText(tr("Stop Tor"));
+ ui.lblStartStopTor->setText(tr("Stop Tor"));
+ }
+
+ _actionShowBandwidth->setText(tr("Bandwidth Graph"));
+ _actionShowMessageLog->setText(tr("Message Log"));
+ _actionShowNetworkMap->setText(tr("Network Map"));
+ _actionShowControlPanel->setText(tr("Control Panel"));
+ _actionShowHelp->setText(tr("Help"));
+ _actionNewIdentity->setText(tr("New Identity"));
+
+#if !defined(Q_WS_MAC)
+ _actionShowAbout->setText(tr("About"));
+ _actionShowConfig->setText(tr("Settings"));
+ _actionExit->setText(tr("Exit"));
+#else
+ createMenuBar();
+#endif
+}
+
+/** Called when the application has started and the main event loop is
+ * running. */
+void
+MainWindow::running()
+{
+ 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
+}
+
+/** Terminate the Tor process if it is being run under Vidalia, disconnect all
+ * TorControl signals, and exit Vidalia. */
+void
+MainWindow::aboutToQuit()
+{
+ 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
+
+ if (_imProcess->state() == QProcess::Running)
+ _imProcess->terminate();
+ }
+
+ /* Disconnect all of the TorControl object's signals */
+ QObject::disconnect(_torControl, 0, 0, 0);
+}
+
+/** Called when the application is closing, by selecting "Exit" from the tray
+ * menu. If we're running a Tor server, then ask if we want to kill Tor now,
+ * or do a delayed shutdown. */
+void
+MainWindow::close()
+{
+ if (_torControl->isVidaliaRunningTor()) {
+ /* If we're running a server currently, ask if we want to do a delayed
+ * shutdown. If we do, then close Vidalia only when Tor stops. Otherwise,
+ * kill Tor and bail now. */
+ ServerSettings settings(_torControl);
+ if (_torControl->isConnected() && settings.isServerEnabled()) {
+ connect(_torControl, SIGNAL(stopped()), vApp, SLOT(quit()));
+ if (!stop())
+ QObject::disconnect(_torControl, SIGNAL(stopped()), vApp, SLOT(quit()));
+ return;
+ }
+ }
+ vApp->quit();
+}
+
+/** Create and bind actions to events. Setup for initial
+ * tray menu configuration. */
+void
+MainWindow::createActions()
+{
+ _actionStartStopTor = new QAction(tr("Start Tor"), this);
+ connect(_actionStartStopTor, SIGNAL(triggered()), this, SLOT(start()));
+
+ _actionExit = new QAction(tr("Exit"), this);
+ connect(_actionExit, SIGNAL(triggered()), this, SLOT(close()));
+
+ _actionShowBandwidth = new QAction(tr("Bandwidth Graph"), this);
+ connect(_actionShowBandwidth, SIGNAL(triggered()),
+ _bandwidthGraph, SLOT(showWindow()));
+ connect(ui.lblBandwidthGraph, SIGNAL(clicked()),
+ _bandwidthGraph, SLOT(showWindow()));
+
+ _actionShowMessageLog = new QAction(tr("Message Log"), this);
+ connect(_actionShowMessageLog, SIGNAL(triggered()),
+ _messageLog, SLOT(showWindow()));
+ connect(ui.lblMessageLog, SIGNAL(clicked()),
+ _messageLog, SLOT(showWindow()));
+
+ _actionShowNetworkMap = new QAction(tr("Network Map"), this);
+ connect(_actionShowNetworkMap, SIGNAL(triggered()),
+ _netViewer, SLOT(showWindow()));
+ connect(ui.lblViewNetwork, SIGNAL(clicked()),
+ _netViewer, SLOT(showWindow()));
+
+ _actionShowControlPanel = new QAction(tr("Control Panel"), this);
+ connect(_actionShowControlPanel, SIGNAL(triggered()), this, SLOT(show()));
+
+ _actionShowConfig = new QAction(tr("Settings"), this);
+ connect(_actionShowConfig, SIGNAL(triggered()), this, SLOT(showConfigDialog()));
+
+ _actionShowAbout = new QAction(tr("About"), this);
+ connect(_actionShowAbout, SIGNAL(triggered()), this, SLOT(showAboutDialog()));
+
+ _actionShowHelp = new QAction(tr("Help"), this);
+ connect(_actionShowHelp, SIGNAL(triggered()), this, SLOT(showHelpDialog()));
+ connect(ui.lblHelpBrowser, SIGNAL(clicked()), this, SLOT(showHelpDialog()));
+
+ _actionNewIdentity = new QAction(tr("New Identity"), this);
+ _actionNewIdentity->setEnabled(false);
+ connect(_actionNewIdentity, SIGNAL(triggered()), this, SLOT(newIdentity()));
+
+#if !defined(Q_WS_MAC)
+ /* Don't give the menu items icons on OS X, since they end up in the
+ * application menu bar. Menu bar items on OS X typically do not have
+ * icons. */
+ _actionStartStopTor->setIcon(QIcon(IMG_START_TOR_16));
+ _actionExit->setIcon(QIcon(IMG_EXIT));
+ _actionShowBandwidth->setIcon(QIcon(IMG_BWGRAPH));
+ _actionShowMessageLog->setIcon(QIcon(IMG_MESSAGELOG));
+ _actionShowNetworkMap->setIcon(QIcon(IMG_NETWORK));
+ _actionShowControlPanel->setIcon(QIcon(IMG_CONTROL_PANEL));
+ _actionShowConfig->setIcon(QIcon(IMG_CONFIG));
+ _actionShowAbout->setIcon(QIcon(IMG_ABOUT));
+ _actionShowHelp->setIcon(QIcon(IMG_HELP));
+ _actionNewIdentity->setIcon(QIcon(IMG_IDENTITY));
+#endif
+}
+
+/** Creates a tray icon with a context menu and adds it to the system
+ * notification area. On Mac, we also set up an application menubar. */
+void
+MainWindow::createTrayIcon()
+{
+ QMenu *menu = createTrayMenu();
+
+ /* Add the menu it to the tray icon */
+ _trayIcon.setContextMenu(menu);
+
+ connect(&_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
+ this, SLOT(trayIconActivated(QSystemTrayIcon::ActivationReason)));
+
+#if defined(Q_WS_MAC)
+ createMenuBar();
+ qt_mac_set_dock_menu(menu);
+#endif
+}
+
+/** Creates a QMenu object that contains QActions which compose the system
+ * tray menu. */
+QMenu*
+MainWindow::createTrayMenu()
+{
+ QMenu *menu = new QMenu(this);
+ menu->addAction(_actionStartStopTor);
+ menu->addSeparator();
+ menu->addAction(_actionShowBandwidth);
+ menu->addAction(_actionShowMessageLog);
+ menu->addAction(_actionShowNetworkMap);
+ menu->addAction(_actionNewIdentity);
+ menu->addSeparator();
+ menu->addAction(_actionShowControlPanel);
+
+#if !defined(Q_WS_MAC)
+ /* These aren't added to the dock menu on Mac, since they are in the
+ * standard Mac locations in the menu bar. */
+ menu->addAction(_actionShowConfig);
+ menu->addAction(_actionShowHelp);
+ menu->addAction(_actionShowAbout);
+ menu->addSeparator();
+ menu->addAction(_actionExit);
+#endif
+ return menu;
+}
+
+/** Creates a new menubar with no parent, so Qt will use this as the "default
+ * menubar" on Mac. This adds on to the existing actions from the createMens()
+ * method. */
+void
+MainWindow::createMenuBar()
+{
+#if defined(Q_WS_MAC)
+ /* Mac users sure like their shortcuts. Actions NOT mentioned below
+ * don't explicitly need shortcuts, since they are merged to the default
+ * menubar and get the default shortcuts anyway. */
+ _actionStartStopTor->setShortcut(tr("Ctrl+T"));
+ _actionShowBandwidth->setShortcut(tr("Ctrl+B"));
+ _actionShowMessageLog->setShortcut(tr("Ctrl+L"));
+ _actionShowNetworkMap->setShortcut(tr("Ctrl+N"));
+ _actionShowHelp->setShortcut(tr("Ctrl+?"));
+ _actionNewIdentity->setShortcut(tr("Ctrl+I"));
+ _actionShowControlPanel->setShortcut(tr("Ctrl+P"));
+
+ /* Force Qt to put merge the Exit, Configure, and About menubar options into
+ * the default menu, even if Vidalia is currently not speaking English. */
+ _actionShowConfig->setText("config");
+ _actionShowConfig->setMenuRole(QAction::PreferencesRole);
+ _actionShowAbout->setText("about");
+ _actionShowAbout->setMenuRole(QAction::AboutRole);
+ _actionExit->setText("quit");
+ _actionExit->setMenuRole(QAction::QuitRole);
+
+ /* The File, Help, and Configure menus will get merged into the application
+ * menu by Qt. */
+ if (_menuBar)
+ delete _menuBar;
+ _menuBar = new QMenuBar(0);
+ QMenu *fileMenu = _menuBar->addMenu("File");
+ fileMenu->addAction(_actionExit);
+ fileMenu->addAction(_actionShowConfig);
+
+ QMenu *torMenu = _menuBar->addMenu(tr("Tor"));
+ torMenu->addAction(_actionStartStopTor);
+ torMenu->addSeparator();
+ torMenu->addAction(_actionNewIdentity);
+
+ QMenu *viewMenu = _menuBar->addMenu(tr("View"));
+ viewMenu->addAction(_actionShowControlPanel);
+ viewMenu->addSeparator();
+ viewMenu->addAction(_actionShowBandwidth);
+ viewMenu->addAction(_actionShowMessageLog);
+ viewMenu->addAction(_actionShowNetworkMap);
+
+ QMenu *helpMenu = _menuBar->addMenu(tr("Help"));
+ _actionShowHelp->setText(tr("Vidalia Help"));
+ helpMenu->addAction(_actionShowHelp);
+ helpMenu->addAction(_actionShowAbout);
+#endif
+}
+
+/** Sets the current tray or dock icon image to <b>iconFile</b>. */
+void
+MainWindow::setTrayIcon(const QString &iconFile)
+{
+#if defined(Q_WS_MAC)
+ QApplication::setWindowIcon(QPixmap(iconFile));
+#else
+ _trayIcon.setIcon(QIcon(iconFile));
+#endif
+}
+
+/** Respond to a double-click on the tray icon by opening the Control Panel
+ * window. */
+void
+MainWindow::trayIconActivated(QSystemTrayIcon::ActivationReason reason)
+{
+ if (reason == QSystemTrayIcon::DoubleClick)
+ setVisible(true);
+}
+
+/** Start a web browser when given the directory containing the executable and profile */
+void
+MainWindow::launchBrowserFromDirectory()
+{
+ VidaliaSettings settings;
+
+ QString browserDirectory = settings.getBrowserDirectory();
+ QString browserDirectoryFilename = settings.getBrowserExecutable();
+
+ /* Set TZ=UTC (to stop leaking timezone information) and
+ * MOZ_NO_REMOTE=1 (to allow multiple instances of Firefox */
+ QStringList env = QProcess::systemEnvironment();
+ env << "TZ=UTC";
+ env << "MOZ_NO_REMOTE=1";
+ _browserProcess->setEnvironment(env);
+
+ /* The browser is in <browserDirectory>/App/Firefox/<browserDirectoryFilename> */
+ QString browserExecutable =
+ QDir::toNativeSeparators(browserDirectory + "/App/Firefox/" + browserDirectoryFilename);
+ /* The profile is in <browserDirectory>/Data/profile */
+ QString profileDir =
+ QDir::toNativeSeparators(browserDirectory + "/Data/profile");
+
+ /* Copy the profile directory if it's not already there */
+ QDir browserDirObj = QDir(browserDirectory);
+
+ /* Copy the profile directory if it's not already there */
+ if (!browserDirObj.exists("Data/profile")) {
+ browserDirObj.mkdir("Data/profile");
+ copy_dir(browserDirectory + "/App/DefaultData/profile", browserDirectory + "/Data/profile");
+ }
+
+ /* Copy the plugins directory if it's not already there */
+ if (!browserDirObj.exists("Data/plugins")) {
+ browserDirObj.mkdir("Data/plugins");
+ copy_dir(browserDirectory + "/App/DefaultData/plugins", browserDirectory + "/Data/plugins");
+ }
+
+ /* Build the command line arguments */
+ QStringList commandLine;
+ // Is this better or worse than MOZ_NO_REMOTE?
+ //commandLine << "-no-remote";
+ commandLine << "-profile";
+ commandLine << profileDir;
+
+ /* Launch the browser */
+ _browserProcess->start(browserExecutable, commandLine);
+}
+
+/** Starts the web browser and IM client, if appropriately configured */
+void
+MainWindow::startSubprocesses()
+{
+ VidaliaSettings settings;
+ QString subprocess;
+
+ /* Launch the web browser */
+ if (!(subprocess = settings.getBrowserDirectory()).isEmpty()) {
+ /* The user has set BrowserDirectory; use this */
+ launchBrowserFromDirectory();
+ } else if (!(subprocess = settings.getBrowserExecutable()).isEmpty()) {
+ /* BrowserDirectory is not set, but BrowserExecutable is; use this */
+ _browserProcess->setEnvironment(QProcess::systemEnvironment() << "TZ=UTC");
+ _browserProcess->start(subprocess, QStringList());
+ }
+
+ /* Launch the IM client */
+ subprocess = settings.getIMExecutable();
+
+ if (!subprocess.isEmpty())
+ _imProcess->start(subprocess, QStringList());
+}
+
+/** Called when browser or IM client have exited */
+void
+MainWindow::onSubprocessFinished(int exitCode, QProcess::ExitStatus exitStatus)
+{
+ Q_UNUSED(exitCode)
+ Q_UNUSED(exitStatus)
+
+ /* Get path to browser and IM client */
+ VidaliaSettings settings;
+ QString browserExecutable = settings.getBrowserExecutable();
+ QString browserDirectory = settings.getBrowserDirectory();
+ QString imExecutable = settings.getIMExecutable();
+
+ /* A subprocess is finished if it successfully exited or was never asked to start */
+ bool browserDone = (browserExecutable.isEmpty()
+ && browserDirectory.isEmpty())
+ || _browserProcess->isDone();
+ bool imDone = imExecutable.isEmpty() || _imProcess->isDone();
+
+ /* Exit if both subprocesses are finished */
+ if (browserDone && imDone) {
+ if (browserDirectory.isEmpty()) {
+ /* We are using the standard launcher, exit immediately */
+ vApp->quit();
+ } else {
+ /* We are using the alternate launcher, wait until the browser has really died */
+ QTimer *browserWatcher = new QTimer(this);
+ connect(browserWatcher, SIGNAL(timeout()), this, SLOT(onCheckForBrowser()));
+ browserWatcher->start(2000);
+ }
+ }
+}
+
+/** Called periodically to check if the browser is running. If it is not,
+ * exit Vidalia cleanly */
+void
+MainWindow::onCheckForBrowser()
+{
+/* This only works on Windows for now */
+#if defined(Q_OS_WIN)
+
+ VidaliaSettings settings;
+ QString browserDirectoryFilename = settings.getBrowserExecutable();
+
+ /* Get list of running processes */
+ QHash<qint64, QString> procList = win32_process_list();
+
+ /* On old versions of Windows win32_process_list() will return
+ an empty list. In this case, just keep Vidalia open */
+ if (procList.isEmpty()) {
+ return;
+ }
+
+ /* Loop over all processes or until we find <browserDirectoryFilename> */
+ QHashIterator<qint64, QString> i(procList);
+ while (i.hasNext()) {
+ i.next();
+ if (i.value().toLower() == browserDirectoryFilename) {
+ /* The browser is still running, so Vidalia should keep running too */
+ return;
+ }
+ }
+
+ /* The browser isn't running, exit Vidalia */
+ vApp->quit();
+#endif
+}
+
+/** Called when the web browser failed to start, for example, because the path
+ * specified to the web browser executable didn't lead to an executable. */
+void
+MainWindow::onBrowserFailed(QString errmsg)
+{
+ Q_UNUSED(errmsg);
+
+ /* Display an error message and see if the user wants some help */
+ VMessageBox::warning(this, tr("Error starting web browser"),
+ tr("Vidalia was unable to start the configured web browser"),
+ VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape);
+}
+
+/** Called when the IM client failed to start, for example, because the path
+ * specified to the IM client executable didn't lead to an executable. */
+void
+MainWindow::onIMFailed(QString errmsg)
+{
+ Q_UNUSED(errmsg);
+
+ /* Display an error message and see if the user wants some help */
+ VMessageBox::warning(this, tr("Error starting IM client"),
+ tr("Vidalia was unable to start the configured IM client"),
+ VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape);
+}
+
+/** Starts the proxy server, if appropriately configured */
+void
+MainWindow::startProxy()
+{
+ VidaliaSettings settings;
+ QString executable = settings.getProxyExecutable();
+ _proxyProcess->start(executable, settings.getProxyExecutableArguments());
+}
+
+/** Called when the proxy server fails to start, for example, because
+ * the path specified didn't lead to an executable. */
+void
+MainWindow::onProxyFailed(QString errmsg)
+{
+ Q_UNUSED(errmsg);
+
+ /* Display an error message and see if the user wants some help */
+ VMessageBox::warning(this, tr("Error starting proxy server"),
+ tr("Vidalia was unable to start the configured proxy server"),
+ VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape);
+}
+
+/** Called when Tor's bootstrapping status changes. <b>bse</b> represents
+ * Tor's current estimate of its bootstrapping progress. */
+void
+MainWindow::bootstrapStatusChanged(const BootstrapStatus &bs)
+{
+ int percentComplete = STARTUP_PROGRESS_BOOTSTRAPPING + bs.percentComplete();
+ bool warn = (bs.severity() == tc::WarnSeverity &&
+ bs.recommendedAction() != BootstrapStatus::RecommendIgnore);
+
+ QString description;
+ switch (bs.status()) {
+ case BootstrapStatus::ConnectingToDirMirror:
+ description = tr("Connecting to a relay directory");
+ break;
+ case BootstrapStatus::HandshakingWithDirMirror:
+ case BootstrapStatus::CreatingOneHopCircuit:
+ description = tr("Establishing an encrypted directory connection");
+ break;
+ case BootstrapStatus::RequestingNetworkStatus:
+ description = tr("Retrieving network status");
+ break;
+ case BootstrapStatus::LoadingNetworkStatus:
+ description = tr("Loading network status");
+ break;
+ case BootstrapStatus::LoadingAuthorityCertificates:
+ description = tr("Loading authority certificates");
+ break;
+ case BootstrapStatus::RequestingDescriptors:
+ description = tr("Requesting relay information");
+ break;
+ case BootstrapStatus::LoadingDescriptors:
+ description = tr("Loading relay information");
+ break;
+ case BootstrapStatus::ConnectingToEntryGuard:
+ description = tr("Connecting to the Tor network");
+ break;
+ case BootstrapStatus::HandshakingWithEntryGuard:
+ case BootstrapStatus::EstablishingCircuit:
+ description = tr("Establishing a Tor circuit");
+ break;
+ case BootstrapStatus::BootstrappingDone:
+ description = tr("Connected to the Tor network!");
+ warn = false; /* probably false anyway */
+ break;
+ default:
+ description = tr("Unrecognized startup status");
+ }
+ if (warn) {
+ QString reason;
+ /* Is it really a good idea to translate these? */
+ switch (bs.reason()) {
+ case tc::MiscellaneousReason:
+ reason = tr("miscellaneous");
+ break;
+ case tc::IdentityMismatch:
+ reason = tr("identity mismatch");
+ break;
+ case tc::ConnectionDone:
+ reason = tr("done");
+ break;
+ case tc::ConnectionRefused:
+ reason = tr("connection refused");
+ break;
+ case tc::ConnectionTimeout:
+ reason = tr("connection timeout");
+ break;
+ case tc::ConnectionIoError:
+ reason = tr("read/write error");
+ break;
+ case tc::NoRouteToHost:
+ reason = tr("no route to host");
+ break;
+ case tc::ResourceLimitReached:
+ reason = tr("insufficient resources");
+ break;
+ default:
+ reason = tr("unknown");
+ }
+ description += tr(" failed (%1)").arg(reason);
+ }
+ setStartupProgress(percentComplete, description);
+}
+
+/** Updates the UI to reflect Tor's current <b>status</b>. Returns the
+ * previously set TorStatus value.*/
+MainWindow::TorStatus
+MainWindow::updateTorStatus(TorStatus status)
+{
+ QString statusText, actionText;
+ QString trayIconFile, statusIconFile;
+ TorStatus prevStatus = _status;
+
+ vNotice("Tor status changed from '%1' to '%2'.")
+ .arg(toString(prevStatus)).arg(toString(status));
+ _status = status;
+
+ if (status == Stopped) {
+ statusText = tr("Tor is not running");
+ actionText = tr("Start Tor");
+ trayIconFile = IMG_TOR_STOPPED;
+ statusIconFile = IMG_TOR_STOPPED_48;
+ _actionStartStopTor->setEnabled(true);
+ _actionStartStopTor->setText(actionText);
+ _actionStartStopTor->setIcon(QIcon(IMG_START_TOR_16));
+ ui.lblStartStopTor->setEnabled(true);
+ ui.lblStartStopTor->setText(actionText);
+ ui.lblStartStopTor->setPixmap(QPixmap(IMG_START_TOR_48));
+ ui.lblStartStopTor->setStatusTip(actionText);
+
+ /* XXX: This might need to be smarter if we ever start connecting other
+ * slots to these triggered() and clicked() signals. */
+ QObject::disconnect(_actionStartStopTor, SIGNAL(triggered()), this, 0);
+ QObject::disconnect(ui.lblStartStopTor, SIGNAL(clicked()), this, 0);
+ connect(_actionStartStopTor, SIGNAL(triggered()), this, SLOT(start()));
+ connect(ui.lblStartStopTor, SIGNAL(clicked()), this, SLOT(start()));
+ setStartupProgressVisible(false);
+ } else if (status == Stopping) {
+ if (_delayedShutdownStarted) {
+ statusText = tr("Your relay is shutting down.\n"
+ "Click 'Stop' again to stop your relay now.");
+ } else {
+ statusText = tr("Tor is shutting down");
+ }
+ trayIconFile = IMG_TOR_STOPPING;
+ statusIconFile = IMG_TOR_STOPPING_48;
+
+ ui.lblStartStopTor->setStatusTip(tr("Stop Tor Now"));
+ } else if (status == Started) {
+ actionText = tr("Stop Tor");
+ _actionStartStopTor->setEnabled(true);
+ _actionStartStopTor->setText(actionText);
+ _actionStartStopTor->setIcon(QIcon(IMG_STOP_TOR_16));
+ ui.lblStartStopTor->setEnabled(true);
+ ui.lblStartStopTor->setText(actionText);
+ ui.lblStartStopTor->setPixmap(QPixmap(IMG_STOP_TOR_48));
+ ui.lblStartStopTor->setStatusTip(actionText);
+
+ /* XXX: This might need to be smarter if we ever start connecting other
+ * slots to these triggered() and clicked() signals. */
+ QObject::disconnect(_actionStartStopTor, SIGNAL(triggered()), this, 0);
+ QObject::disconnect(ui.lblStartStopTor, SIGNAL(clicked()), this, 0);
+ connect(_actionStartStopTor, SIGNAL(triggered()), this, SLOT(stop()));
+ connect(ui.lblStartStopTor, SIGNAL(clicked()), this, SLOT(stop()));
+ } else if (status == Starting) {
+ statusText = tr("Starting the Tor software");
+ trayIconFile = IMG_TOR_STARTING;
+ statusIconFile = IMG_TOR_STARTING_48;
+ _actionStartStopTor->setEnabled(false);
+ ui.lblStartStopTor->setText(tr("Starting Tor"));
+ ui.lblStartStopTor->setEnabled(false);
+ ui.lblStartStopTor->setStatusTip(statusText);
+ setStartupProgressVisible(true);
+ setStartupProgress(STARTUP_PROGRESS_STARTING, statusText);
+ } else if (status == CircuitEstablished) {
+ statusText = tr("Connected to the Tor network!");
+ trayIconFile = IMG_TOR_RUNNING;
+ statusIconFile = IMG_TOR_RUNNING_48;
+ setStartupProgressVisible(false);
+ }
+
+ /* Update the tray icon */
+ if (!trayIconFile.isEmpty()) {
+ setTrayIcon(trayIconFile);
+ }
+ /* Update the status banner on the control panel */
+ if (!statusIconFile.isEmpty())
+ ui.lblTorStatusImg->setPixmap(QPixmap(statusIconFile));
+ if (!statusText.isEmpty()) {
+ _trayIcon.setToolTip(statusText);
+ ui.lblTorStatus->setText(statusText);
+ }
+ return prevStatus;
+}
+
+/** Called when the "show on startup" checkbox is toggled. */
+void
+MainWindow::toggleShowOnStartup(bool checked)
+{
+ VidaliaSettings settings;
+ settings.setShowMainWindowAtStart(checked);
+}
+
+/** Sets the visibility of the startup status description and progress bar to
+ * <b>visible</b>. */
+void
+MainWindow::setStartupProgressVisible(bool visible)
+{
+ /* XXX: We force a repaint() to make sure the progress bar and onion status
+ * icon don't overlap briefly. This is pretty hacktastic. */
+ if (visible) {
+ ui.lblTorStatus->setVisible(false);
+ ui.lblTorStatusImg->setVisible(false);
+ repaint(ui.grpStatus->rect());
+ ui.lblStartupProgress->setVisible(true);
+ ui.progressBar->setVisible(true);
+ } else {
+ ui.lblStartupProgress->setVisible(false);
+ ui.progressBar->setVisible(false);
+ repaint(ui.grpStatus->rect());
+ ui.lblTorStatus->setVisible(true);
+ ui.lblTorStatusImg->setVisible(true);
+ }
+}
+
+/** Sets the progress bar completion value to <b>progressValue</b> and sets
+ * the status text to <b>description</b>. */
+void
+MainWindow::setStartupProgress(int progressValue,
+ const QString &description)
+{
+ ui.progressBar->setValue(progressValue);
+ ui.lblStartupProgress->setText(description);
+ _trayIcon.setToolTip(description);
+}
+
+/** Attempts to start Tor. If Tor fails to start, then startFailed() will be
+ * called with an error message containing the reason. */
+void
+MainWindow::start()
+{
+ TorSettings settings;
+ QStringList args;
+
+ updateTorStatus(Starting);
+
+ /* Check if Tor is already running separately */
+ if (net_test_connect(settings.getControlAddress(),
+ settings.getControlPort())) {
+ started();
+ return;
+ }
+
+ /* Make sure the torrc we want to use really exists. */
+ QString torrc = settings.getTorrc();
+ if (!torrc.isEmpty()) {
+ if (!QFileInfo(torrc).exists())
+ touch_file(torrc, true);
+ args << "-f" << torrc;
+ }
+
+ /* Specify Tor's data directory, if different from the default */
+ QString dataDirectory = settings.getDataDirectory();
+ if (!dataDirectory.isEmpty())
+ args << "DataDirectory" << expand_filename(dataDirectory);
+
+ /* Add the intended control port value */
+ quint16 controlPort = settings.getControlPort();
+ if (controlPort)
+ args << "ControlPort" << QString::number(controlPort);
+
+ /* Add the control port authentication arguments */
+ switch (settings.getAuthenticationMethod()) {
+ case TorSettings::PasswordAuth:
+ if (! vApp->readPasswordFromStdin()) {
+ if (settings.useRandomPassword()) {
+ _controlPassword = TorSettings::randomPassword();
+ _useSavedPassword = false;
+ } else {
+ _controlPassword = settings.getControlPassword();
+ _useSavedPassword = true;
+ }
+ }
+ args << "HashedControlPassword"
+ << TorSettings::hashPassword(_controlPassword);
+ break;
+ case TorSettings::CookieAuth:
+ args << "CookieAuthentication" << "1";
+ break;
+ default:
+ args << "CookieAuthentication" << "0";
+ }
+
+ /* This doesn't get set to false until Tor is actually up and running, so we
+ * don't yell at users twice if their Tor doesn't even start, due to the fact
+ * that QProcess::stopped() is emitted even if the process didn't even
+ * start. */
+ _isIntentionalExit = true;
+ /* Kick off the Tor process */
+ _torControl->start(settings.getExecutable(), args);
+}
+
+/** Called when the Tor process fails to start, for example, because the path
+ * specified to the Tor executable didn't lead to an executable. */
+void
+MainWindow::startFailed(QString errmsg)
+{
+ /* We don't display the error message for now, because the error message
+ * that Qt gives us in this instance is almost always "Unknown Error". That
+ * will make users sad. */
+ Q_UNUSED(errmsg);
+
+ updateTorStatus(Stopped);
+
+ /* Display an error message and see if the user wants some help */
+ int response = VMessageBox::warning(this, tr("Error Starting Tor"),
+ tr("Vidalia was unable to start Tor. Check your settings "
+ "to ensure the correct name and location of your Tor "
+ "executable is specified."),
+ VMessageBox::ShowSettings|VMessageBox::Default,
+ VMessageBox::Cancel|VMessageBox::Escape,
+ VMessageBox::Help);
+
+ if (response == VMessageBox::ShowSettings) {
+ /* Show the settings dialog so the user can make sure they're pointing to
+ * the correct Tor. */
+ showConfigDialog();
+ } else if (response == VMessageBox::Help) {
+ /* Show troubleshooting information about starting Tor */
+ showHelpDialog("troubleshooting.start");
+ }
+}
+
+/** Slot: Called when the Tor process is started. It will connect the control
+ * socket and set the icons and tooltips accordingly. */
+void
+MainWindow::started()
+{
+ TorSettings settings;
+
+ updateTorStatus(Started);
+
+ /* Now that Tor is running, we want to know if it dies when we didn't want
+ * it to. */
+ _isIntentionalExit = false;
+ /* We haven't started a delayed shutdown yet. */
+ _delayedShutdownStarted = false;
+ /* Remember whether we started Tor or not */
+ _isVidaliaRunningTor = _torControl->isVidaliaRunningTor();
+ /* Try to connect to Tor's control port */
+ _torControl->connect(settings.getControlAddress(),
+ settings.getControlPort());
+ setStartupProgress(STARTUP_PROGRESS_CONNECTING, tr("Connecting to Tor"));
+}
+
+/** Called when the connection to the control socket fails. The reason will be
+ * given in the errmsg parameter. */
+void
+MainWindow::connectFailed(QString errmsg)
+{
+ /* Ok, ok. It really isn't going to connect. I give up. */
+ int response = VMessageBox::warning(this,
+ tr("Connection Error"), p(errmsg),
+ VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape,
+ VMessageBox::Retry, VMessageBox::Help);
+
+
+ if (response == VMessageBox::Retry) {
+ /* Let's give it another try. */
+ TorSettings settings;
+ _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();
+ }
+}
+
+/** Disconnects the control socket and stops the Tor process. */
+bool
+MainWindow::stop()
+{
+ ServerSettings server(_torControl);
+ QString errmsg;
+ TorStatus prevStatus;
+ bool rc;
+
+ /* If we're running a server, give users the option of terminating
+ * gracefully so clients have time to find new servers. */
+ if (server.isServerEnabled() && !_delayedShutdownStarted) {
+ /* Ask the user if they want to shutdown nicely. */
+ int response = VMessageBox::question(this, tr("Relaying is Enabled"),
+ tr("You are currently running a relay. "
+ "Terminating your relay will interrupt any "
+ "open connections from clients.\n\n"
+ "Would you like to shutdown gracefully and "
+ "give clients time to find a new relay?"),
+ VMessageBox::Yes|VMessageBox::Default,
+ VMessageBox::No,
+ VMessageBox::Cancel|VMessageBox::Escape);
+ if (response == VMessageBox::Yes)
+ _delayedShutdownStarted = true;
+ else if (response == VMessageBox::Cancel)
+ return false;
+ }
+
+ prevStatus = updateTorStatus(Stopping);
+ if (_delayedShutdownStarted) {
+ /* Start a delayed shutdown */
+ rc = _torControl->signal(TorSignal::Shutdown, &errmsg);
+ } else {
+ /* We want Tor to stop now, regardless of whether we're a server. */
+ _isIntentionalExit = true;
+ rc = _torControl->stop(&errmsg);
+ }
+
+ if (!rc) {
+ /* We couldn't tell Tor to stop, for some reason. */
+ int response = VMessageBox::warning(this, tr("Error Shutting Down"),
+ p(tr("Vidalia was unable to stop the Tor software."))
+ + p(errmsg),
+ VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape,
+ VMessageBox::Help);
+
+ if (response == VMessageBox::Help) {
+ /* Show some troubleshooting help */
+ showHelpDialog("troubleshooting.stop");
+ }
+ /* Tor is still running since stopping failed */
+ _isIntentionalExit = false;
+ _delayedShutdownStarted = false;
+ updateTorStatus(prevStatus);
+ }
+ return rc;
+}
+
+/** Slot: Called when the Tor process has exited. It will adjust the tray
+ * icons and tooltips accordingly. */
+void
+MainWindow::stopped(int exitCode, QProcess::ExitStatus exitStatus)
+{
+ updateTorStatus(Stopped);
+
+ /* If we didn't intentionally close Tor, then check to see if it crashed or
+ * if it closed itself and returned an error code. */
+ if (!_isIntentionalExit) {
+ /* A quick overview of Tor's code tells me that if it catches a SIGTERM or
+ * SIGINT, Tor will exit(0). We might need to change this warning message
+ * if this turns out to not be the case. */
+ if (exitStatus == QProcess::CrashExit || exitCode != 0) {
+ int ret = VMessageBox::warning(this, tr("Unexpected Error"),
+ tr("Vidalia detected that the Tor software exited "
+ "unexpectedly.\n\n"
+ "Please check the message log for recent "
+ "warning or error messages."),
+ VMessageBox::Ok|VMessageBox::Escape,
+ VMessageBox::ShowLog|VMessageBox::Default,
+ VMessageBox::Help);
+ if (ret == VMessageBox::ShowLog)
+ _messageLog->showWindow();
+ else if (ret == VMessageBox::Help)
+ showHelpDialog("troubleshooting.torexited");
+ }
+ }
+}
+
+/** Called when the control socket has successfully connected to Tor. */
+void
+MainWindow::connected()
+{
+ authenticate();
+}
+
+/** 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);
+ ui.lblNewIdentity->setEnabled(false);
+ _isVidaliaRunningTor = false;
+}
+
+/** Attempts to authenticate to Tor's control port, depending on the
+ * authentication method specified in TorSettings::getAuthenticationMethod().
+ */
+bool
+MainWindow::authenticate()
+{
+ TorSettings::AuthenticationMethod authMethod;
+ TorSettings settings;
+ ProtocolInfo pi;
+
+ updateTorStatus(Authenticating);
+ setStartupProgress(STARTUP_PROGRESS_AUTHENTICATING,
+ tr("Authenticating to Tor"));
+
+ 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;
+ }
+
+ 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);
+ }
+ 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();
+ }
+ return _torControl->authenticate(_controlPassword);
+ }
+ /* No authentication. Send an empty password. */
+ vNotice("Authenticating using 'null' authentication.");
+ return _torControl->authenticate(QString(""));
+
+cancel:
+ vWarn("Cancelling control authentication attempt.");
+ if (_isVidaliaRunningTor)
+ stop();
+ else
+ disconnect();
+ return false;
+}
+
+/** Called when Vidalia has successfully authenticated to Tor. */
+void
+MainWindow::authenticated()
+{
+ ServerSettings serverSettings(_torControl);
+ QString errmsg;
+
+ updateTorStatus(Authenticated);
+
+ /* If Tor doesn't have bootstrapping events, then update the current
+ * status string and bump the progress bar along a bit. */
+ if (_torControl->getTorVersion() < 0x020101) {
+ setStartupProgress(STARTUP_PROGRESS_CIRCUITBUILD,
+ tr("Connecting to the Tor network"));
+ }
+
+ /* Let people click on their beloved "New Identity" button */
+ _actionNewIdentity->setEnabled(true);
+ ui.lblNewIdentity->setEnabled(true);
+
+ /* Register for any pertinent asynchronous events. */
+ if (!_torControl->setEvents(&errmsg)) {
+ VMessageBox::warning(this, tr("Error Registering for Events"),
+ p(tr("Vidalia was unable to register for some events. "
+ "Many of Vidalia's features may be unavailable."))
+ + p(errmsg),
+ VMessageBox::Ok);
+ } else {
+ /* Stop reading from Tor's stdout immediately, since we successfully
+ * registered for Tor events, including any desired log events. */
+ _torControl->closeTorStdout();
+ }
+
+ /* Configure UPnP port forwarding if needed */
+ serverSettings.configurePortForwarding();
+
+ /* Check if Tor has a circuit established */
+ if (_torControl->isCircuitEstablished())
+ circuitEstablished();
+ /* Check the status of Tor's version */
+ if (_torControl->getTorVersion() >= 0x020001)
+ checkTorVersion();
+ if (_torControl->getTorVersion() >= 0x020102) {
+ BootstrapStatus status = _torControl->bootstrapStatus();
+ if (status.isValid())
+ bootstrapStatusChanged(status);
+ }
+}
+
+/** Called when Vidalia fails to authenticate to Tor. The failure reason is
+ * specified in <b>errmsg</b>. */
+void
+MainWindow::authenticationFailed(QString errmsg)
+{
+ bool retry = false;
+
+ vWarn("Authentication failed: %1").arg(errmsg);
+
+ /* Parsing log messages is evil, but we're left with little option */
+ if (errmsg.contains("Password did not match")) {
+ ControlPasswordInputDialog dlg;
+ connect(&dlg, SIGNAL(helpRequested(QString)),
+ this, SLOT(showHelpDialog(QString)));
+
+ qint64 torPid = 0;
+
+#if defined(Q_OS_WIN32)
+ QHash<qint64, QString> procs = process_list();
+ foreach (qint64 pid, procs.keys()) {
+ if (! procs.value(pid).compare("tor.exe", Qt::CaseInsensitive)) {
+ torPid = pid;
+ break;
+ }
+ }
+ dlg.setResetEnabled(torPid > 0);
+#else
+ dlg.setResetEnabled(false);
+#endif
+
+ int ret = dlg.exec();
+ if (ret == QDialogButtonBox::Ok) {
+ if (dlg.isSavePasswordChecked()) {
+ TorSettings settings;
+ settings.setAuthenticationMethod(TorSettings::PasswordAuth);
+ settings.setUseRandomPassword(false);
+ settings.setControlPassword(dlg.password());
+ _useSavedPassword = true;
+ } else {
+ _controlPassword = dlg.password();
+ _useSavedPassword = false;
+ }
+ retry = true;
+ } else if (ret == QDialogButtonBox::Reset) {
+ if (! process_kill(torPid)) {
+ VMessageBox::warning(this,
+ tr("Password Reset Failed"),
+ p(tr("Vidalia tried to reset Tor's control password, but was not "
+ "able to restart the Tor software. Please check your Task "
+ "Manager to ensure there are no other Tor processes running.")),
+ VMessageBox::Ok|VMessageBox::Default);
+ } else {
+ retry = true;
+ }
+ }
+ } else {
+ /* Something else went wrong */
+ int ret = VMessageBox::warning(this,
+ tr("Authentication Error"),
+ p(tr("Vidalia was unable to authenticate to the Tor software. "
+ "(%1)").arg(errmsg)) +
+ p(tr("Please check your control port authentication "
+ "settings.")),
+ VMessageBox::ShowSettings|VMessageBox::Default,
+ VMessageBox::Cancel|VMessageBox::Escape);
+
+ if (ret == VMessageBox::ShowSettings)
+ showConfigDialog(ConfigDialog::Advanced);
+ }
+
+ if (_torControl->isRunning())
+ if (_isVidaliaRunningTor)
+ stop();
+ else
+ disconnect();
+ if (retry)
+ start();
+}
+
+/** Searches for and attempts to load the control authentication cookie. This
+ * 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();
+}
+
+/** Called when Tor has successfully established a circuit. */
+void
+MainWindow::circuitEstablished()
+{
+ updateTorStatus(CircuitEstablished);
+ setStartupProgress(ui.progressBar->maximum(),
+ tr("Connected to the Tor network!"));
+ startSubprocesses();
+
+#if defined(USE_AUTOUPDATE)
+ VidaliaSettings settings;
+ if (settings.isAutoUpdateEnabled()) {
+ QDateTime lastCheckedAt = settings.lastCheckedForUpdates();
+ if (UpdateProcess::shouldCheckForUpdates(lastCheckedAt)) {
+ /* Initiate a background check for updates now */
+ _updateTimer.stop();
+ checkForUpdates();
+ }
+ }
+#endif
+}
+
+/** Checks the status of the current version of Tor to see if it's old,
+ * unrecommended, or obsolete. */
+void
+MainWindow::checkTorVersion()
+{
+ 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();
+ }
+ }
+}
+
+/** Called when Tor thinks its version is old or unrecommended, and displays
+ * a message notifying the user. */
+void
+MainWindow::dangerousTorVersion(tc::TorVersionStatus reason,
+ const QString ¤t,
+ const QStringList &recommended)
+{
+ Q_UNUSED(current);
+ Q_UNUSED(recommended);
+
+ if (reason == tc::ObsoleteTorVersion
+ || reason == tc::UnrecommendedTorVersion)
+ displayTorVersionWarning();
+}
+
+/** Called when Tor thinks its version is old or unrecommended, and displays a
+ * message notifying the user. */
+void
+MainWindow::displayTorVersionWarning()
+{
+ static bool alreadyWarned = false;
+
+ if (!alreadyWarned) {
+#if !defined(USE_AUTOUPDATE)
+ QString website = "https://www.torproject.org/";
+# if QT_VERSION >= 0x040200
+ website = QString("<a href=\"%1\">%1</a>").arg(website);
+# endif
+
+ VMessageBox::information(this, tr("Tor Update Available"),
+ p(tr("The currently installed version of Tor is out of date or no longer "
+ "recommended. Please visit the Tor website to download the latest "
+ "version.")) + p(tr("Tor website: %1").arg(website)),
+ VMessageBox::Ok);
+#else
+ int ret = VMessageBox::information(this,
+ tr("Tor Update Available"),
+ p(tr("The currently installed version of Tor is out of date "
+ "or no longer recommended."))
+ + p(tr("Would you like to check if a newer package is "
+ "available for installation?")),
+ VMessageBox::Yes|VMessageBox::Default,
+ VMessageBox::No|VMessageBox::Escape);
+
+ if (ret == VMessageBox::Yes)
+ checkForUpdatesWithUi();
+#endif
+ alreadyWarned = true;
+ }
+}
+
+/** Called when Tor 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%1appears 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;
+}
+
+/** Creates and displays Vidalia's About dialog. */
+void
+MainWindow::showAboutDialog()
+{
+ AboutDialog dlg(this);
+ dlg.exec();
+}
+
+/** Displays the help browser and displays the most recently viewed help
+ * topic. */
+void
+MainWindow::showHelpDialog()
+{
+ showHelpDialog(QString());
+}
+
+/**< Shows the help browser and displays the given help <b>topic</b>. */
+void
+MainWindow::showHelpDialog(const QString &topic)
+{
+ static HelpBrowser *helpBrowser = 0;
+ if (!helpBrowser)
+ helpBrowser = new HelpBrowser(this);
+ helpBrowser->showWindow(topic);
+}
+
+/** 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()
+{
+ 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);
+ }
+}
+
+/** 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);
+ 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";
+}
+
+#if defined(USE_MINIUPNPC)
+/** Called when a UPnP error occurs. */
+void
+MainWindow::upnpError(UPNPControl::UPNPError error)
+{
+ Q_UNUSED(error);
+
+#if 0
+ /* XXX: Is there a better way to do this? Currently, this could get called
+ * if there is an error when testing UPnP support, and again when attempting
+ * to reset the UPnP state when the test dialog is closed. The user would
+ * not be amused with all the warning dialogs. */
+
+ VMessageBox::warning(this,
+ tr("Port Forwarding Failed"),
+ p(tr("Vidalia was unable to configure automatic port forwarding."))
+ + p(UPNPControl::Instance()->errorString()),
+ VMessageBox::Ok);
+#endif
+}
+#endif
+
+#if defined(USE_AUTOUPDATE)
+/** Called when the user clicks the 'Check Now' button in the General
+ * settings page. */
+void
+MainWindow::checkForUpdatesWithUi()
+{
+ checkForUpdates(true);
+}
+
+/** Called when the update interval timer expires, notifying Vidalia that
+ * we should check for updates again. */
+void
+MainWindow::checkForUpdates(bool showProgress)
+{
+ VidaliaSettings settings;
+
+ if (_updateProcess.isRunning()) {
+ if (showProgress) {
+ /* A check for updates is already in progress, so just bring the update
+ * progress dialog into focus.
+ */
+ _updateProgressDialog.show();
+ }
+ } else {
+ /* If Tor is running and bootstrapped, then use Tor to check for updates */
+ if (_torControl->isRunning() && _torControl->circuitEstablished())
+ _updateProcess.setSocksPort(_torControl->getSocksPort());
+ else
+ _updateProcess.setSocksPort(0);
+
+ /* Initialize the UpdateProgressDialog and display it, if necessary. */
+ _updateProgressDialog.setStatus(UpdateProgressDialog::CheckingForUpdates);
+ if (showProgress)
+ _updateProgressDialog.show();
+
+ /* Initiate a check for available software updates. This check will
+ * be done in the background, notifying the user only if there are
+ * updates to be installed.
+ */
+ _updateProcess.checkForUpdates(UpdateProcess::TorBundleInfo);
+
+ /* Remember when we last checked for software updates */
+ settings.setLastCheckedForUpdates(QDateTime::currentDateTime().toUTC());
+
+ /* Restart the "Check for Updates" timer */
+ _updateTimer.start(UpdateProcess::checkForUpdatesInterval() * 1000);
+ }
+}
+
+/** Called when the check for software updates fails. */
+void
+MainWindow::checkForUpdatesFailed(const QString &errmsg)
+{
+ if (_updateProgressDialog.isVisible()) {
+ _updateProgressDialog.hide();
+ VMessageBox::warning(this, tr("Update Failed"), errmsg,
+ VMessageBox::Ok);
+ }
+}
+
+/** Called when there is an update available for installation. */
+void
+MainWindow::updatesAvailable(UpdateProcess::BundleInfo bi,
+ const PackageList &packageList)
+{
+ vInfo("%1 software update(s) available").arg(packageList.size());
+ if (packageList.size() > 0) {
+ UpdatesAvailableDialog dlg(packageList, &_updateProgressDialog);
+
+ switch (dlg.exec()) {
+ case UpdatesAvailableDialog::InstallUpdatesNow:
+ installUpdates(bi);
+ break;
+
+ default:
+ _updateProgressDialog.hide();
+ break;
+ }
+ } else {
+ if (_updateProgressDialog.isVisible()) {
+ _updateProgressDialog.hide();
+ VMessageBox::information(this, tr("Your software is up to date"),
+ tr("There are no new Tor software packages "
+ "available for your computer at this time."),
+ VMessageBox::Ok);
+ }
+ }
+}
+
+/** Stops Tor (if necessary), installs any available for <b>bi</b>, and
+ * restarts Tor (if necessary). */
+void
+MainWindow::installUpdates(UpdateProcess::BundleInfo bi)
+{
+ _updateProgressDialog.setStatus(UpdateProgressDialog::InstallingUpdates);
+ _updateProgressDialog.show();
+
+ if (_isVidaliaRunningTor) {
+ _restartTorAfterUpgrade = true;
+ _isIntentionalExit = true;
+ _torControl->stop();
+ } else {
+ _restartTorAfterUpgrade = false;
+ }
+ _updateProcess.installUpdates(bi);
+}
+
+/** Called when all <b>numUpdates</b> software updates have been installed
+ * successfully. */
+void
+MainWindow::updatesInstalled(int numUpdates)
+{
+ _updateProgressDialog.setStatus(UpdateProgressDialog::UpdatesInstalled);
+ _updateProgressDialog.show();
+
+ if (_restartTorAfterUpgrade)
+ start();
+}
+
+/** Called when an update fails to install. <b>errmsg</b> contains details
+ * about the failure. */
+void
+MainWindow::installUpdatesFailed(const QString &errmsg)
+{
+ _updateProgressDialog.hide();
+
+ VMessageBox::warning(this, tr("Installation Failed"),
+ p(tr("Vidalia was unable to install your software updates."))
+ + p(tr("The following error occurred:"))
+ + p(errmsg),
+ VMessageBox::Ok);
+
+ if (_restartTorAfterUpgrade)
+ start();
+}
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/MainWindow.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/MainWindow.h
new file mode 100644
index 0000000..73074f4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/MainWindow.h
@@ -0,0 +1,292 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 MainWindow.h
+** \version $Id: MainWindow.h 4227 2010-02-25 04:03:32Z edmanm $
+** \brief Main window. Creates tray menu and child windows
+*/
+
+#ifndef _MAINWINDOW_H
+#define _MAINWINDOW_H
+
+#include "config.h"
+#include "ui_MainWindow.h"
+
+#include "VidaliaWindow.h"
+#include "HelperProcess.h"
+#include "AboutDialog.h"
+#include "MessageLog.h"
+#include "BandwidthGraph.h"
+#include "ConfigDialog.h"
+#include "HelpBrowser.h"
+#include "NetViewer.h"
+
+#include "TorControl.h"
+
+#if defined(USE_AUTOUPDATE)
+#include "UpdateProcess.h"
+#include "UpdateProgressDialog.h"
+#endif
+#if defined(USE_MINIUPNPC)
+#include "UPNPControl.h"
+#endif
+
+#include <QMainWindow>
+#include <QTimer>
+#include <QSystemTrayIcon>
+
+class MainWindow : public VidaliaWindow
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor */
+ MainWindow();
+ /** Destructor. */
+ ~MainWindow();
+
+public slots:
+ /** Shows or hides this window. **/
+ virtual void setVisible(bool visible);
+
+protected:
+ /** Called when the user changes the UI translation. */
+ virtual void retranslateUi();
+
+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 Tor process fails to start. */
+ void startFailed(QString errmsg);
+ /** Called when the Tor process has successfully started. */
+ void started();
+ /** 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();
+ /** Called when the control connection fails. */
+ void connectFailed(QString errmsg);
+ /** Called when Vidalia wants to disconnect from a Tor it did not start. */
+ void disconnect();
+ /** Called when the control socket has been disconnected. */
+ void disconnected();
+ /** Called when Vidalia has successfully authenticated to Tor. */
+ void authenticated();
+ /** Called when Vidalia fails to authenticate to Tor. The failure reason is
+ * specified in <b>errmsg</b>. */
+ void authenticationFailed(QString errmsg);
+ /** Re-enables the 'New Identity' button after a delay from the previous time
+ * 'New Identity' was used. */
+ void enableNewIdentity();
+ /** Called when the user selects the "New Identity" action from the menu. */
+ void newIdentity();
+ /** Called when the user exits Vidalia. */
+ void close();
+ /** Called when the application has started and the main event loop is
+ * running. */
+ void running();
+ /** 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();
+ /** 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>. */
+ void warnDangerousPort(quint16 port, bool rejected);
+ /** Called when Tor's bootstrapping status changes. <b>bse</b> represents
+ * Tor's current estimate of its bootstrapping progress. */
+ void bootstrapStatusChanged(const BootstrapStatus &bs);
+ /** Called when Tor thinks its version is old or unrecommended, and displays
+ * a message notifying the user. */
+ void dangerousTorVersion(tc::TorVersionStatus reason,
+ const QString &version,
+ const QStringList &recommended);
+
+#if defined(USE_AUTOUPDATE)
+ /** Called when the user clicks the 'Check Now' button in the General
+ * settings page. */
+ void checkForUpdatesWithUi();
+ /** Called when the update interval timer expires, notifying Vidalia that
+ * we should check for updates again. */
+ void checkForUpdates(bool showProgress = false);
+ /** Called when the check for software updates fails. */
+ void checkForUpdatesFailed(const QString &errmsg);
+ /** Called when there is an update available for installation. */
+ void updatesAvailable(UpdateProcess::BundleInfo bi,
+ const PackageList &packageList);
+ /** Stops Tor (if necessary), installs any available for <b>bi</b>, and
+ * restarts Tor (if necessary). */
+ void installUpdates(UpdateProcess::BundleInfo bi);
+ /** Called when all <b>numUpdates</b> software updates have been installed
+ * successfully. */
+ void updatesInstalled(int numUpdates);
+ /** Called when an update fails to install. <b>errmsg</b> contains details
+ * about the failure. */
+ void installUpdatesFailed(const QString &errmsg);
+#endif
+
+#if defined(USE_MINIUPNPC)
+ /** Called when a UPnP error occurs. */
+ void upnpError(UPNPControl::UPNPError error);
+#endif
+
+private:
+ enum TorStatus {
+ Unset, /**< Tor's status has not yet been set. */
+ Stopping, /**< Tor is in the process of shutting down. */
+ Stopped, /**< Tor is not running. */
+ Starting, /**< Tor is in the process of starting. */
+ Started, /**< Tor is currently running. */
+ Authenticating, /**< Vidalia is authenticating to Tor. */
+ Authenticated, /**< Vidalia has authenticated to Tor. */
+ CircuitEstablished /**< Tor has built a circuit. */
+ };
+ /** 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
+ * notification area. On Mac, we also set up an application menubar. */
+ void createTrayIcon();
+ /** Create the tray popup menu and it's submenus */
+ QMenu* createTrayMenu();
+ /** Creates a default menubar on Mac */
+ void createMenuBar();
+ /** 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();
+ /** 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 loadControlCookie(QString cookiePath = QString());
+ /** Checks the status of the current version of Tor to see if it's old,
+ * unrecommended, or obsolete. */
+ void checkTorVersion();
+ /** Alerts the user that their current Tor version is either obsolete or
+ * no longer recommended. If Vidalia was built with auto-update support,
+ * they will be given the option to check for available updates. */
+ void displayTorVersionWarning();
+ /** Sets the visibility of the startup status description and progress bar
+ * to <b>visible</b>. */
+ void setStartupProgressVisible(bool visible);
+ /** 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);
+
+ /** The current status of Tor. */
+ TorStatus _status;
+ /** Used to determine if the Tor process exiting was intentional or not */
+ bool _isIntentionalExit;
+ /** Tracks whether we started a delayed server shutdown. */
+ 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;
+ /** Set to true if we should use the control password saved in TorSettings
+ * when authenticating to Tor. */
+ bool _useSavedPassword;
+ /** The Vidalia icon that sits in the tray. */
+ QSystemTrayIcon _trayIcon;
+
+#if defined(USE_AUTOUPDATE)
+ /** Timer used to remind us to check for software updates. */
+ QTimer _updateTimer;
+ /** The auto-update process used to check for and download updates. */
+ UpdateProcess _updateProcess;
+ /** Dialog instance that is be used to show the progress of the auto-update
+ * executable. */
+ UpdateProgressDialog _updateProgressDialog;
+ /** 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;
+
+ Ui::MainWindow ui; /**< Qt Designer generated object. */
+};
+
+#endif
+
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/MainWindow.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/MainWindow.ui
new file mode 100644
index 0000000..5668cdc
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/MainWindow.ui
@@ -0,0 +1,603 @@
+<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>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>16777215</width>
+ <height>1</height>
+ </size>
+ </property>
+ <property name="windowTitle" >
+ <string>Vidalia Control Panel</string>
+ </property>
+ <property name="windowIcon" >
+ <iconset resource="res/vidalia.qrc" >:/images/32x32/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>
+ </property>
+ <property name="statusTip" >
+ <string>Hide this window</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QStatusBar" name="statusbar" />
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>VClickLabel</class>
+ <extends>QWidget</extends>
+ <header>VClickLabel.h</header>
+ </customwidget>
+ </customwidgets>
+ <resources>
+ <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>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/PackageInfo.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/PackageInfo.cpp
new file mode 100644
index 0000000..401b620
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/PackageInfo.cpp
@@ -0,0 +1,92 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 PackageInfo.cpp
+** \version $Id: PackageInfo.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Contains information about a single available updated software
+** package.
+*/
+
+#include "Packageinfo.h"
+
+
+PackageInfo::PackageInfo()
+{
+}
+
+bool
+PackageInfo::isValid() const
+{
+ return (! _name.isEmpty() && ! _version.isEmpty());
+}
+
+void
+PackageInfo::setName(const QString &name)
+{
+ _name = name;
+}
+
+QString
+PackageInfo::name() const
+{
+ return _name;
+}
+
+void
+PackageInfo::setVersion(const QString &version)
+{
+ _version = version;
+}
+
+QString
+PackageInfo::version() const
+{
+ return _version;
+}
+
+void
+PackageInfo::setLongDescription(const QString &lang, const QString &desc)
+{
+ _longDescription.insert(lang, desc);
+}
+
+QString
+PackageInfo::longDescription(const QString &lang) const
+{
+ return _longDescription.value(lang);
+}
+
+bool
+PackageInfo::hasLongDescription(const QString &lang) const
+{
+ return _longDescription.contains(lang);
+}
+
+void
+PackageInfo::setShortDescription(const QString &lang, const QString &desc)
+{
+ _shortDescription.insert(lang, desc);
+}
+
+
+QString
+PackageInfo::shortDescription(const QString &lang) const
+{
+ return _shortDescription.value(lang);
+}
+
+
+bool
+PackageInfo::hasShortDescription(const QString &lang) const
+{
+ return _shortDescription.contains(lang);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/PackageInfo.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/PackageInfo.h
new file mode 100644
index 0000000..1c2b514
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/PackageInfo.h
@@ -0,0 +1,97 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 PackageInfo.h
+** \version $Id: PackageInfo.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Contains information about a single available updated software
+** package.
+*/
+
+#ifndef _PACKAGEINFO_H
+#define _PACKAGEINFO_H
+
+#include <QHash>
+#include <QList>
+#include <QString>
+
+
+class PackageInfo
+{
+public:
+ /** Default constructor. */
+ PackageInfo();
+
+ /** Returns true if this PackageInfo object is valid. A valid PackageInfo
+ * object must have a name and a version number set. All other fields are
+ * optional.
+ */
+ bool isValid() const;
+
+ /** Sets the name of this software package to <b>name</b>.
+ */
+ void setName(const QString &name);
+
+ /** Returns the name of this software package.
+ */
+ QString name() const;
+
+ /** Sets the version of this software package to <b>version</b>.
+ */
+ void setVersion(const QString &version);
+
+ /** Returns the version of this software package.
+ */
+ QString version() const;
+
+ /** Sets the long description of this software package to <b>desc</b> for
+ * the language <b>lang</b>.
+ */
+ void setLongDescription(const QString &lang, const QString &desc);
+
+ /** Returns true if there is a long description for this software package
+ * currently set for language <b>lang</b>.
+ */
+ bool hasLongDescription(const QString &lang) const;
+
+ /** Returns long description of this software package for language
+ * <b>lang</b>. If a description is not currently set for the specified
+ * language, a null QString object is returned.
+ */
+ QString longDescription(const QString &lang) const;
+
+ /** Sets the short description of this software package to <b>desc</b> for
+ * the language <b>lang</b>.
+ */
+ void setShortDescription(const QString &lang, const QString &desc);
+
+ /** Returns true if there is a short description of this software package
+ * currently set for language <b>lang</b>.
+ */
+ bool hasShortDescription(const QString &lang) const;
+
+ /** Returns the short description of this software package for language
+ * <b>lang</b>. If a description is not currently set for the specified
+ * language, a null QString object is returned.
+ */
+ QString shortDescription(const QString &lang) const;
+
+private:
+ QString _name;
+ QString _version;
+ QHash<QString,QString> _longDescription;
+ QHash<QString,QString> _shortDescription;
+};
+
+/** An unordered collection of PackageInfo objects. */
+typedef QList<PackageInfo> PackageList;
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdateProcess.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdateProcess.cpp
new file mode 100644
index 0000000..cc4be98
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdateProcess.cpp
@@ -0,0 +1,354 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#include "UpdateProcess.h"
+#include "Vidalia.h"
+
+#include "stringutil.h"
+
+#include <QDir>
+#include <QDomDocument>
+#include <QDomElement>
+#include <QDomNodeList>
+
+
+UpdateProcess::UpdateProcess(QObject *parent)
+ : QProcess(parent)
+{
+ _currentCommand = NoCommand;
+ _socksPort = 0;
+
+ connect(this, SIGNAL(readyReadStandardError()),
+ this, SLOT(readStandardError()));
+ connect(this, SIGNAL(readyReadStandardOutput()),
+ this, SLOT(readStandardOutput()));
+ connect(this, SIGNAL(finished(int, QProcess::ExitStatus)),
+ this, SLOT(onFinished(int, QProcess::ExitStatus)));
+
+ setEnvironment(systemEnvironment());
+}
+
+void
+UpdateProcess::checkForUpdates(BundleInfo bi)
+{
+ QStringList args;
+
+ args << "update" << "--force-check"
+ << " --controller-log-format"
+ << "--repo=" + updateRepositoryDir()
+ << "--debug";
+ if (_socksPort)
+ args << "--socks-port=" + QString::number(_socksPort);
+
+ args << bundleInfoToString(bi);
+
+ vNotice("updater: launching auto-update executable: %1 %2")
+ .arg(updateExecutable())
+ .arg(args.join(" "));
+ _currentBundle = bi;
+ _currentCommand = CheckForUpdates;
+ start(updateExecutable(), args);
+}
+
+void
+UpdateProcess::installUpdates(BundleInfo bi)
+{
+ QStringList args;
+
+ args << "update" << "--controller-log-format"
+ << "--repo=" + updateRepositoryDir()
+ << "--install";
+ if (_socksPort)
+ args << "--socks-port=" + QString::number(_socksPort);
+
+ args << bundleInfoToString(bi);
+
+ vNotice("updater: launching auto-update executable: %1 %2")
+ .arg(updateExecutable())
+ .arg(args.join(" "));
+ _currentBundle = bi;
+ _currentCommand = InstallUpdates;
+ start(updateExecutable(), args);
+}
+
+void
+UpdateProcess::setSocksPort(quint16 port)
+{
+ _socksPort = port;
+}
+
+bool
+UpdateProcess::isRunning() const
+{
+ return (state() != QProcess::NotRunning);
+}
+
+void
+UpdateProcess::cancel()
+{
+ if (_currentCommand == CheckForUpdates) {
+#if defined(Q_OS_WIN32)
+ kill();
+#else
+ terminate();
+#endif
+ }
+}
+
+void
+UpdateProcess::readStandardError()
+{
+ int idx;
+ bool ok;
+ QString line, type;
+ QHash<QString,QString> args;
+
+ setReadChannel(QProcess::StandardError);
+ while (canReadLine()) {
+ line = readLine().trimmed();
+ vInfo("updater (stderr): %1").arg(line);
+
+ idx = line.indexOf(" ");
+ if (idx < 0 || idx == line.length()-1)
+ continue;
+ type = line.mid(0, idx);
+ line = line.mid(idx + 1);
+
+ args = string_parse_keyvals(line, &ok);
+ if (! ok)
+ continue;
+ else if (line.startsWith("thandy.InstallFailed: ", Qt::CaseInsensitive)) {
+ /** XXX: This is a fucking kludge. If installation fails, Thandy just
+ * dumps a Python traceback that (for obvious reasons) doesn't
+ * follow the expected format. There isn't a defined control
+ * message type for this yet we'd really like the error, so treat
+ * this one specially.
+ */
+ emit installUpdatesFailed(line);
+ continue;
+ }
+
+ if (! type.compare("CAN_INSTALL", Qt::CaseInsensitive)) {
+ QString package = args.value("PKG");
+ if (! package.isEmpty()) {
+ PackageInfo pkgInfo = packageInfo(package);
+ if (pkgInfo.isValid())
+ _packageList << pkgInfo;
+ }
+ } else if (_currentCommand == CheckForUpdates
+ && ! type.compare("DEBUG")
+ && args.value("msg").startsWith("Got ")) {
+ /* XXX: This is an even worse fucking kludge. Thandy only reports
+ * download progress in a not-so-parser-friendly log message,
+ * though, so we must kludge again.
+ *
+ * Here's an example of what we're parsing:
+ * "Got 1666048/1666560 bytes from http://updates.torproject.org/thandy/data/win32/tor-0.2.1.9-alpha.msi"
+ *
+ * (Note that the kludge above would even match on "Got milk?".)
+ */
+ QStringList parts = args.value("msg").split(" ");
+ if (parts.size() == 5) {
+ QStringList progress = parts.at(1).split("/");
+ if (progress.size() == 2) {
+ int bytesReceived = progress.at(0).toUInt();
+ int bytesTotal = progress.at(1).toUInt();
+ vInfo("updater: Downloaded %1 of %2 bytes of file %3").arg(bytesReceived)
+ .arg(bytesTotal)
+ .arg(parts.at(4));
+ emit downloadProgress(parts.at(4), bytesReceived, bytesTotal);
+ }
+ }
+ }
+ }
+}
+
+void
+UpdateProcess::readStandardOutput()
+{
+ QString line;
+
+ setReadChannel(QProcess::StandardOutput);
+ while (canReadLine()) {
+ line = readLine().trimmed();
+ vInfo("updater (stdout): %1").arg(line);
+ }
+}
+
+void
+UpdateProcess::onFinished(int exitCode, QProcess::ExitStatus exitStatus)
+{
+ vInfo("updater: update process finished with exit code %1").arg(exitCode);
+
+ if (_currentCommand == CheckForUpdates) {
+ if (exitStatus == QProcess::NormalExit) {
+ emit updatesAvailable(_currentBundle, _packageList);
+ } else {
+ emit checkForUpdatesFailed(tr("Vidalia was unable to check for available "
+ "software updates because Tor's update process "
+ "exited unexpectedly."));
+ }
+ } else if (_currentCommand == InstallUpdates) {
+ if (exitStatus == QProcess::NormalExit && exitCode == 0)
+ emit updatesInstalled(_packageList.size());
+ }
+ _packageList.clear();
+}
+
+void
+UpdateProcess::onError(QProcess::ProcessError error)
+{
+ if (error == QProcess::FailedToStart) {
+ vWarn("updater: failed to start");
+ emit checkForUpdatesFailed(tr("Vidalia was unable to check for available "
+ "software updates because it could not find "
+ "'%1'.").arg(updateExecutable()));
+ }
+}
+
+int
+UpdateProcess::checkForUpdatesInterval()
+{
+ /* XXX: Check twice a day. Why? Because arma said so. */
+ return 12*60*60;
+}
+
+QDateTime
+UpdateProcess::nextCheckForUpdates(const QDateTime &lastCheckedAt)
+{
+ return lastCheckedAt.addSecs(checkForUpdatesInterval()).toUTC();
+}
+
+bool
+UpdateProcess::shouldCheckForUpdates(const QDateTime &lastCheckedAt)
+{
+ QDateTime nextCheckAt = nextCheckForUpdates(lastCheckedAt);
+ return (QDateTime::currentDateTime().toUTC() >= nextCheckAt);
+}
+
+QString
+UpdateProcess::updateExecutable()
+{
+ return "thandy.exe";
+}
+
+QString
+UpdateProcess::updateRepositoryDir()
+{
+ return QDir::convertSeparators(Vidalia::dataDirectory() + "/updates");
+}
+
+QString
+UpdateProcess::bundleInfoToString(BundleInfo bi)
+{
+ switch (bi) {
+ case TorBundleInfo:
+ return "/bundleinfo/tor/win32/";
+ default:
+ return QString();
+ };
+}
+
+PackageInfo
+UpdateProcess::packageInfo(const QString &package)
+{
+ QProcess proc;
+ QStringList args;
+
+ args << "json2xml"
+ << QDir::convertSeparators(updateRepositoryDir() + "/" + package);
+
+ vNotice("updater: launching auto-update executable: %1 %2")
+ .arg(updateExecutable())
+ .arg(args.join(" "));
+
+ proc.setEnvironment(proc.systemEnvironment());
+ proc.start(updateExecutable(), args);
+ if (! proc.waitForStarted())
+ return PackageInfo();
+ if (! proc.waitForFinished())
+ return PackageInfo();
+ return packageInfoFromXml(proc.readAll());
+}
+
+PackageInfo
+UpdateProcess::packageInfoFromXml(const QByteArray &xml)
+{
+ QDomDocument doc;
+ QDomElement dict, elem;
+ QDomNodeList nodeList;
+ QString errmsg;
+ QStringList versionParts;
+ PackageInfo pkgInfo;
+
+ if (! doc.setContent(xml, false, &errmsg, 0, 0))
+ goto err;
+
+ /* XXX: Qt 4.4 introduced XPath support, which would make the following
+ * parsing much easier. Whenever we drop support for Qt < 4.4, this should
+ * be updated.
+ */
+ elem = doc.documentElement().firstChildElement("signed");
+ if (elem.isNull()) {
+ errmsg = "Signed element not found";
+ goto err;
+ }
+
+ dict = elem.firstChildElement("dict");
+ if (dict.isNull()) {
+ errmsg = "no Dict element as a child of Signed";
+ goto err;
+ }
+
+ elem = dict.firstChildElement("name");
+ if (elem.isNull()) {
+ errmsg = "Name element not found";
+ goto err;
+ }
+ pkgInfo.setName(elem.text());
+
+ elem = dict.firstChildElement("version").firstChildElement("list");
+ if (elem.isNull()) {
+ errmsg = "no valid Version element found";
+ goto err;
+ }
+ elem = elem.firstChildElement("item");
+ for ( ; ! elem.isNull(); elem = elem.nextSiblingElement("item")) {
+ versionParts << elem.text();
+ }
+ pkgInfo.setVersion(versionParts.join("."));
+
+ elem = dict.firstChildElement("shortdesc").firstChildElement("dict");
+ if (elem.isNull()) {
+ errmsg = "no valid Shortdesc element found";
+ goto err;
+ }
+ elem = elem.firstChildElement();
+ for ( ; ! elem.isNull(); elem = elem.nextSiblingElement()) {
+ pkgInfo.setShortDescription(elem.tagName(), elem.text());
+ }
+
+ elem = dict.firstChildElement("longdesc").firstChildElement("dict");
+ if (elem.isNull()) {
+ errmsg = "no valid Longdesc element found";
+ goto err;
+ }
+ elem = elem.firstChildElement();
+ for ( ; ! elem.isNull(); elem = elem.nextSiblingElement()) {
+ pkgInfo.setLongDescription(elem.tagName(), elem.text());
+ }
+
+ return pkgInfo;
+
+err:
+ vWarn("updater: invalid package info XML document: %1").arg(errmsg);
+ return PackageInfo();
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdateProcess.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdateProcess.h
new file mode 100644
index 0000000..b92b17e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdateProcess.h
@@ -0,0 +1,170 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#ifndef _UPDATEPROCESS_H
+#define _UPDATEPROCESS_H
+
+#include "PackageInfo.h"
+
+#include <QProcess>
+#include <QDateTime>
+#include <QStringList>
+#include <QUrl>
+
+
+class UpdateProcess : public QProcess
+{
+ Q_OBJECT
+
+public:
+ enum BundleInfo {
+ TorBundleInfo,
+ };
+
+ /** Default constructor.
+ */
+ UpdateProcess(QObject *parent = 0);
+
+ /** Begin a check for software updates that may be available for the
+ * software package specified by <b>bi</b>.
+ */
+ void checkForUpdates(BundleInfo bi);
+
+ /** Instructs the software update process to install previously downloaded
+ * files for <b>bi</b>.
+ */
+ void installUpdates(BundleInfo bi);
+
+ /** Returns true if the update process is currently in the middle of an
+ * operation, such as checking for or installing updates.
+ */
+ bool isRunning() const;
+
+ /** Sets the port to use as a SOCKS proxy to <b>port</b>. If <b>port</b> is
+ * set to 0, then no SOCKS proxy will be used when checking for updates.
+ */
+ void setSocksPort(quint16 port);
+
+ /** Return the time at which we should next check for available updates,
+ * given the last we checked was at <b>lastCheckedAt</b>.
+ */
+ static QDateTime nextCheckForUpdates(const QDateTime &lastCheckedAt);
+
+ /** Return true if we should check for available software udpates, given
+ * the last time we checked was at <b>lastCheckedAt</b>. The returned
+ * QDateTime will be in UTC.
+ */
+ static bool shouldCheckForUpdates(const QDateTime &lastCheckedAt);
+
+ /** Returns the preferred interval (in seconds) between executions of the
+ * Glider process to check for available software updates.
+ */
+ static int checkForUpdatesInterval();
+
+ /** Returns the path and filename of the software update executable.
+ */
+ static QString updateExecutable();
+
+ /** Returns the path in which the software update executable should write
+ * all of its state information.
+ */
+ static QString updateRepositoryDir();
+
+signals:
+ /** Emitted when the check for available software updates failed.
+ * <b>errmsg</b> contains a human-readable description of the problem
+ * encountered.
+ */
+ void checkForUpdatesFailed(QString errmsg);
+
+ /** Emitted while an updated package download is in progress. <b>url</b> is
+ * location of the update, <b>bytesReceived</b> is how many bytes have been
+ * downloaded so far and <b>bytesTotal</b> is the total size of the package
+ * being downloaded. */
+ void downloadProgress(QString url, int bytesReceived, int bytesTotal);
+
+ /** Emitted when updated software packages in bundle <b>bi</b> are
+ * are available. <b>packages</b> contains a collection of PackageInfo objects
+ * describing the updates available for installation.
+ */
+ void updatesAvailable(UpdateProcess::BundleInfo bi, PackageList packages);
+
+ /** Emitted after all available updated packages have been successfully
+ * installed.
+ */
+ void updatesInstalled(int nPackagesInstalled);
+
+ /** Emitted when there is an error installing one or more updated software
+ * packages. <b>errmsg</b> might even contain a useful description of the
+ * error encountered (but don't bet the farm on it).
+ */
+ void installUpdatesFailed(QString errmsg);
+
+public slots:
+ /** Cancels the currently running software update operation immediately. */
+ void cancel();
+
+protected slots:
+ /** Called when there is data to be read from the update process's stdout.
+ * Reads and parses all available data.
+ */
+ void readStandardOutput();
+
+ /** Called when there is data to be read from the update process's stderr.
+ * Reads and parses all available data.
+ */
+ void readStandardError();
+
+ /** Called when the underlying QProcess encounters an error.
+ */
+ void onError(QProcess::ProcessError error);
+
+ /** Called when the auto-update process has terminated.
+ */
+ void onFinished(int exitCode, QProcess::ExitStatus exitStatus);
+
+protected:
+ enum UpdateCommand {
+ NoCommand,
+ CheckForUpdates,
+ InstallUpdates,
+ };
+
+ /** Converts a BundleInfo enum value to its proper Thandy-recognized URL
+ * for the current OS and architecture. */
+ QString bundleInfoToString(BundleInfo bundleInfo);
+
+ /** Returns a PackageInfo object containing information about the updated
+ * package specified by the /pkginfo/ URL in <b>package</b>.
+ */
+ static PackageInfo packageInfo(const QString &package);
+
+ /** Returns a PackageInfo object populated with information extracted
+ * from a Thandy-formatted XML document given by <b>xml</b>.
+ */
+ static PackageInfo packageInfoFromXml(const QByteArray &xml);
+
+private:
+ /** Enum value of the current auto-update operation. */
+ UpdateCommand _currentCommand;
+
+ /** Enum value of the last bundle for which we performed some action
+ * (e.g., check for updates, install an update, etc. */
+ BundleInfo _currentBundle;
+
+ /** List of packages that have available updates. */
+ PackageList _packageList;
+
+ /** Currently configured SOCKS port. */
+ quint16 _socksPort;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdateProgressDialog.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdateProgressDialog.cpp
new file mode 100644
index 0000000..420cbdd
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdateProgressDialog.cpp
@@ -0,0 +1,92 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#include "UpdateProgressDialog.h"
+
+
+UpdateProgressDialog::UpdateProgressDialog(QWidget *parent)
+ : QDialog(parent)
+{
+ ui.setupUi(this);
+
+ connect(ui.btnHide, SIGNAL(clicked()), this, SLOT(onHide()));
+ connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(onCancel()));
+
+ setModal(true);
+}
+
+void
+UpdateProgressDialog::setStatus(UpdateProgressDialog::Status status)
+{
+ switch (status) {
+ case CheckingForUpdates:
+ ui.lblCurrentAction->setText(tr("Checking for available updates..."));
+
+ ui.progressBar->setMinimum(0);
+ ui.progressBar->setMaximum(0);
+
+ ui.btnHide->setText(tr("Hide"));
+ ui.btnCancel->setVisible(true);
+ ui.btnCancel->setEnabled(true);
+ break;
+
+ case DownloadingUpdates:
+ ui.lblCurrentAction->setText(tr("Downloading updates..."));
+ break;
+
+ case InstallingUpdates:
+ ui.lblCurrentAction->setText(tr("Installing updated software..."));
+
+ ui.progressBar->setMinimum(0);
+ ui.progressBar->setMaximum(0);
+
+ ui.btnCancel->setEnabled(false);
+ break;
+
+ case UpdatesInstalled:
+ ui.lblCurrentAction->setText(tr("Done! Your software is now up to date."));
+
+ ui.progressBar->setMinimum(0);
+ ui.progressBar->setMaximum(1);
+ ui.progressBar->setValue(1);
+
+ ui.btnHide->setText(tr("OK"));
+ ui.btnCancel->setVisible(false);
+ break;
+
+ default:
+ break;
+ }
+}
+
+void
+UpdateProgressDialog::setDownloadProgress(const QString &url,
+ int bytesReceived, int bytesTotal)
+{
+ Q_UNUSED(url);
+
+ setStatus(DownloadingUpdates);
+ ui.progressBar->setMaximum(bytesTotal);
+ ui.progressBar->setValue(bytesReceived);
+}
+
+void
+UpdateProgressDialog::onHide()
+{
+ setVisible(false);
+}
+
+void
+UpdateProgressDialog::onCancel()
+{
+ emit cancelUpdate();
+ hide();
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdateProgressDialog.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdateProgressDialog.h
new file mode 100644
index 0000000..542bb7d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdateProgressDialog.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.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.
+*/
+
+#ifndef _UPDATEPROGRESSDIALOG_H
+#define _UPDATEPROGRESSDIALOG_H
+
+#include "ui_UpdateProgressDialog.h"
+
+#include <QDialog>
+
+
+class UpdateProgressDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ enum Status {
+ CheckingForUpdates,
+ DownloadingUpdates,
+ InstallingUpdates,
+ UpdatesInstalled,
+ };
+
+ /** Default constructor.
+ */
+ UpdateProgressDialog(QWidget *parent = 0);
+
+ /** Updates the dialog's display to reflect the current action indicated
+ * by <b>status</b>.
+ */
+ void setStatus(UpdateProgressDialog::Status status);
+
+signals:
+ /** Emitted when the user clicks the "Cancel" button indicating they
+ * want to terminate the current check for available updates.
+ */
+ void cancelUpdate();
+
+public slots:
+ /** Called when more bytes of <b>url</b> have been received.
+ * <b>bytesReceived</b> indicates how many bytes have been downloaded so
+ * far and <b>bytesTotal</b> indicates the total size of the update to be
+ * downloaded.
+ */
+ void setDownloadProgress(const QString &url,
+ int bytesReceived, int bytesTotal);
+
+private slots:
+ /** Called when the user clicks the "Cancel" button. Emits the
+ * cancelUpdate() signal.
+ */
+ void onHide();
+
+ /** Called when the user clicks the "Hide" button. Hides the dialog
+ * box.
+ */
+ void onCancel();
+
+private:
+ Ui::UpdateProgressDialog ui; /**< Qt Designer generated object. */
+};
+
+#endif
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdateProgressDialog.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdateProgressDialog.ui
new file mode 100644
index 0000000..ecedf24
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdateProgressDialog.ui
@@ -0,0 +1,102 @@
+<ui version="4.0" >
+ <class>UpdateProgressDialog</class>
+ <widget class="QDialog" name="UpdateProgressDialog" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>366</width>
+ <height>104</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+ <string>Software Updates</string>
+ </property>
+ <property name="windowIcon" >
+ <iconset resource="res/vidalia.qrc" >
+ <normaloff>:/images/32x32/system-software-update.png</normaloff>:/images/32x32/system-software-update.png</iconset>
+ </property>
+ <layout class="QGridLayout" name="gridLayout" >
+ <item rowspan="2" row="0" column="0" >
+ <widget class="QLabel" name="label" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="pixmap" >
+ <pixmap resource="res/vidalia.qrc" >:/images/48x48/system-software-update.png</pixmap>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QLabel" name="lblCurrentAction" >
+ <property name="text" >
+ <string>Checking for updates...</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QProgressBar" name="progressBar" >
+ <property name="maximum" >
+ <number>0</number>
+ </property>
+ <property name="value" >
+ <number>-1</number>
+ </property>
+ <property name="textVisible" >
+ <bool>false</bool>
+ </property>
+ <property name="format" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="2" >
+ <layout class="QHBoxLayout" name="horizontalLayout" >
+ <item>
+ <spacer name="horizontalSpacer" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnCancel" >
+ <property name="text" >
+ <string>Cancel</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnHide" >
+ <property name="text" >
+ <string>Hide</string>
+ </property>
+ <property name="default" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <resources>
+ <include location="res/vidalia.qrc" />
+ </resources>
+ <connections/>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdatesAvailableDialog.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdatesAvailableDialog.cpp
new file mode 100644
index 0000000..bb52d2a
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdatesAvailableDialog.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.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 UpdatesAvailableDialog.cpp
+** \version $Id: UpdatesAvailableDialog.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays a list of available updates and details, such as release
+** notes. The user can choose to either install the updates now or later, or
+** skip the updates entirely.
+*/
+
+#include "UpdatesAvailableDialog.h"
+#include "Vidalia.h"
+
+#include <QHeaderView>
+
+
+UpdatesAvailableDialog::UpdatesAvailableDialog(const PackageList &packageList,
+ QWidget *parent)
+ : QDialog(parent)
+{
+ ui.setupUi(this);
+
+ connect(ui.btnInstall, SIGNAL(clicked()),
+ this, SLOT(installUpdatesNow()));
+ connect(ui.btnInstallLater, SIGNAL(clicked()),
+ this, SLOT(installUpdatesLater()));
+
+ connect(ui.treeUpdates,
+ SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
+ this, SLOT(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)));
+
+ loadPackagesTable(packageList);
+}
+
+void
+UpdatesAvailableDialog::showEvent(QShowEvent *e)
+{
+ ui.treeUpdates->header()->resizeSection(0, 240);
+ ui.treeUpdates->header()->setResizeMode(1, QHeaderView::ResizeToContents);
+ QDialog::showEvent(e);
+}
+
+void
+UpdatesAvailableDialog::loadPackagesTable(const PackageList &packageList)
+{
+ int row = 0;
+ QString language;
+ QTreeWidgetItem *item;
+
+ language = Vidalia::language();
+
+ foreach (PackageInfo package, packageList) {
+ item = new QTreeWidgetItem(ui.treeUpdates);
+
+ if (package.hasShortDescription(language))
+ item->setText(0, package.shortDescription(language));
+ else
+ item->setText(0, package.shortDescription("en"));
+
+ if (package.hasLongDescription(language))
+ item->setData(0, Qt::UserRole, package.longDescription(language));
+ else
+ item->setData(0, Qt::UserRole, package.longDescription("en"));
+
+ item->setText(1, package.version());
+ ui.treeUpdates->insertTopLevelItem(row++, item);
+ }
+}
+
+void
+UpdatesAvailableDialog::currentItemChanged(QTreeWidgetItem *current,
+ QTreeWidgetItem *previous)
+{
+ Q_UNUSED(previous);
+
+ ui.textDetails->clear();
+ if (current)
+ ui.textDetails->setText(current->data(0, Qt::UserRole).toString());
+}
+
+void
+UpdatesAvailableDialog::installUpdatesNow()
+{
+ done(InstallUpdatesNow);
+}
+
+void
+UpdatesAvailableDialog::installUpdatesLater()
+{
+ done(InstallUpdatesLater);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdatesAvailableDialog.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdatesAvailableDialog.h
new file mode 100644
index 0000000..9934f27
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdatesAvailableDialog.h
@@ -0,0 +1,76 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 UpdatesAvailableDialog.h
+** \version $Id: UpdatesAvailableDialog.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays a list of available updates and details, such as release
+** notes. The user can choose to either install the updates now or later, or
+** skip the updates entirely.
+*/
+
+#ifndef _UpdatesAvailableDialog_H
+#define _UpdatesAvailableDialog_H
+
+#include "ui_UpdatesAvailableDialog.h"
+#include "PackageInfo.h"
+
+#include <QDialog>
+#include <QShowEvent>
+#include <QTreeWidgetItem>
+
+
+class UpdatesAvailableDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ enum UpdatesAvailableDialogExitCode {
+ InstallUpdatesNow = 100,
+ InstallUpdatesLater = 101,
+ };
+
+ /** Constructor. */
+ UpdatesAvailableDialog(const PackageList &packageList, QWidget *parent = 0);
+
+protected:
+ /** Called when the dialog receives a QShowEvent. This simply adjusts
+ * the column widths to something close to sane and forwards the event
+ * to the parent.
+ */
+ virtual void showEvent(QShowEvent *e);
+
+private slots:
+ /** Called when the user selects a different package in the list. The widget
+ * displaying details on the selected package will be updated.
+ */
+ void currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
+
+ /** Called when the user opts to install the displayed software updates
+ * immediately.
+ */
+ void installUpdatesNow();
+
+ /** Called when the user opts to install the display software updates at
+ * a later time.
+ */
+ void installUpdatesLater();
+
+private:
+ /** Populates the table of available updates with package information
+ * from <b>packageList</b>.
+ */
+ void loadPackagesTable(const PackageList &packageList);
+
+ Ui::UpdatesAvailableDialog ui; /**< Qt Designer generated object. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdatesAvailableDialog.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdatesAvailableDialog.ui
new file mode 100644
index 0000000..e074e41
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/UpdatesAvailableDialog.ui
@@ -0,0 +1,96 @@
+<ui version="4.0" >
+ <class>UpdatesAvailableDialog</class>
+ <widget class="QDialog" name="UpdatesAvailableDialog" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>365</width>
+ <height>350</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+ <string>Software Updates Available</string>
+ </property>
+ <property name="windowIcon" >
+ <iconset resource="res/vidalia.qrc" >
+ <normaloff>:/images/32x32/system-software-update.png</normaloff>:/images/32x32/system-software-update.png</iconset>
+ </property>
+ <layout class="QGridLayout" name="gridLayout" >
+ <item row="2" column="0" colspan="2" >
+ <layout class="QHBoxLayout" name="horizontalLayout" >
+ <item>
+ <spacer name="horizontalSpacer" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnInstallLater" >
+ <property name="text" >
+ <string>Remind Me Later</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnInstall" >
+ <property name="text" >
+ <string>Install</string>
+ </property>
+ <property name="default" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="0" colspan="2" >
+ <widget class="QLabel" name="lblUpdatesAvailable" >
+ <property name="text" >
+ <string>The following updated software packages are ready for installation:</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2" >
+ <widget class="QSplitter" name="splitter" >
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <widget class="QTreeWidget" name="treeUpdates" >
+ <property name="rootIsDecorated" >
+ <bool>false</bool>
+ </property>
+ <property name="itemsExpandable" >
+ <bool>false</bool>
+ </property>
+ <column>
+ <property name="text" >
+ <string>Package</string>
+ </property>
+ </column>
+ <column>
+ <property name="text" >
+ <string>Version</string>
+ </property>
+ </column>
+ </widget>
+ <widget class="QTextBrowser" name="textDetails" />
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources>
+ <include location="res/vidalia.qrc" />
+ </resources>
+ <connections/>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VClickLabel.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VClickLabel.cpp
new file mode 100644
index 0000000..f12d50d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VClickLabel.cpp
@@ -0,0 +1,96 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 VClickLabel.cpp
+** \version $Id: VClickLabel.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Custom widget to create a clickable label with both an image and text.
+*/
+
+#include "VClickLabel.h"
+#include "Vidalia.h"
+
+#include <QPainter>
+
+
+/** Default constructor. */
+VClickLabel::VClickLabel(QWidget *parent)
+ : QWidget(parent)
+{
+ setCursor(Qt::PointingHandCursor);
+}
+
+/** Returns the current size hint for this widget's current contents. */
+QSize
+VClickLabel::sizeHint() const
+{
+ int height = qMax(_pixmap.height(), fontMetrics().height())+2;
+ int width = _pixmap.width() + fontMetrics().width(_text)+2;
+ return QSize(width, height);
+}
+
+/** Returns the minimum size hint for this widget's current contents. */
+QSize
+VClickLabel::minimumSizeHint() const
+{
+ return sizeHint();
+}
+
+/** Overloaded paint event to draw a pixmap and a text label. */
+void
+VClickLabel::paintEvent(QPaintEvent *e)
+{
+ QPainter p(this);
+ QRect rect = this->rect();
+
+ if (vApp->isLeftToRight()) {
+ if (!_pixmap.isNull())
+ p.drawPixmap(0, qMax((rect.height()-_pixmap.height())/2, 0), _pixmap);
+ if (!_text.isEmpty())
+ p.drawText(_pixmap.width()+2, (rect.height()+fontInfo().pixelSize())/2, _text);
+ } else {
+ if (!_pixmap.isNull())
+ p.drawPixmap(qMax(rect.right()-_pixmap.width(), 0),
+ qMax((rect.height()-_pixmap.height())/2, 0), _pixmap);
+ if (!_text.isEmpty()) {
+ int textWidth = fontMetrics().width(_text);
+ p.drawText(qMax(rect.right()-_pixmap.width()-textWidth-2, 0),
+ (rect.height()+fontInfo().pixelSize())/2, _text);
+ }
+ }
+ e->accept();
+}
+
+/** Overloaded mouse event to catch left mouse button clicks. */
+void
+VClickLabel::mouseReleaseEvent(QMouseEvent *e)
+{
+ if (e->button() == Qt::LeftButton) {
+ emit clicked();
+ }
+ e->accept();
+}
+
+/** Sets the label text to <b>text</b>. */
+void
+VClickLabel::setText(const QString &text)
+{
+ _text = text;
+ update();
+}
+
+/** Sets the widget's image to <b>img</b>. */
+void
+VClickLabel::setPixmap(const QPixmap &pixmap)
+{
+ _pixmap = pixmap;
+ update();
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VClickLabel.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VClickLabel.h
new file mode 100644
index 0000000..65ec0cb
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VClickLabel.h
@@ -0,0 +1,60 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 VClickLabel.h
+** \version $Id: VClickLabel.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Custom widget to create a clickable label with both an image and text.
+*/
+
+#ifndef _VCLICKLABEL_H
+#define _VCLICKLABEL_H
+
+#include <QWidget>
+#include <QPixmap>
+#include <QMouseEvent>
+#include <QSize>
+
+
+class VClickLabel : public QWidget
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. */
+ VClickLabel(QWidget *parent = 0);
+
+ /** Returns the current size hint for this widget's current contents. */
+ virtual QSize sizeHint() const;
+ /** Returns the minimum size hint for this widget's current contents. */
+ virtual QSize minimumSizeHint() const;
+
+ /** Sets the label text to <b>text</b>. */
+ void setText(const QString &text);
+ /** Sets the widget's image to <b>img</b>. */
+ void setPixmap(const QPixmap &img);
+
+signals:
+ /** Emitted when the widget is left-clicked. */
+ void clicked();
+
+protected:
+ /** Overloaded paint event to draw a pixmap and a text label. */
+ virtual void paintEvent(QPaintEvent *e);
+ /** Overloaded mouse event to catch left mouse button clicks. */
+ virtual void mouseReleaseEvent(QMouseEvent *e);
+
+private:
+ QString _text; /**< Text label to display in the widget. */
+ QPixmap _pixmap; /**< Image to display in the widget. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VMessageBox.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VMessageBox.cpp
new file mode 100644
index 0000000..0cfa886
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VMessageBox.cpp
@@ -0,0 +1,161 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 VMessageBox.cpp
+** \version $Id: VMessageBox.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Provides a custom Vidalia mesage box
+*/
+
+#include "VMessageBox.h"
+
+#include "html.h"
+
+
+/** Default constructor. */
+VMessageBox::VMessageBox(QWidget *parent)
+ : QMessageBox(parent)
+{
+}
+
+/** Returns the button (0, 1, or 2) that is OR-ed with QMessageBox::Default,
+ * or 0 if none are. */
+int
+VMessageBox::defaultButton(int button0, int button1, int button2)
+{
+ Q_UNUSED(button0);
+ int defaultButton = 0;
+ if (button1 & QMessageBox::Default) {
+ defaultButton = 1;
+ } else if (button2 & QMessageBox::Default) {
+ defaultButton = 2;
+ }
+ return defaultButton;
+}
+
+/** Returns the button (0, 1, or 2) that is OR-ed with QMessageBox::Escape,
+ * or -1 if none are. */
+int
+VMessageBox::escapeButton(int button0, int button1, int button2)
+{
+ int escapeButton = -1;
+ if (button0 & QMessageBox::Escape) {
+ escapeButton = 0;
+ } else if (button1 & QMessageBox::Escape) {
+ escapeButton = 1;
+ } else if (button2 & QMessageBox::Escape) {
+ escapeButton = 2;
+ }
+ return escapeButton;
+}
+
+/** Returns the Button enum value from the given return value. */
+int
+VMessageBox::selected(int ret, int button0, int button1, int button2)
+{
+ if (ret == 0) {
+ return (button0 & QMessageBox::ButtonMask);
+ } else if (ret == 1) {
+ return (button1 & QMessageBox::ButtonMask);
+ }
+ return (button2 & QMessageBox::ButtonMask);
+}
+
+/** Converts a Button enum value to a translated string. */
+QString
+VMessageBox::buttonText(int btn)
+{
+ QString text;
+ int button = (btn & ~QMessageBox::FlagMask);
+ switch (button) {
+ case Ok: text = tr("OK"); break;
+ case Cancel: text = tr("Cancel"); break;
+ case Yes: text = tr("Yes"); break;
+ case No: text = tr("No"); break;
+ case Help: text = tr("Help"); break;
+ case Retry: text = tr("Retry"); break;
+ case ShowLog: text = tr("Show Log"); break;
+ case ShowSettings: text = tr("Show Settings"); break;
+ case Continue: text = tr("Continue"); break;
+ case Quit: text = tr("Quit"); break;
+ case Browse: text = tr("Browse"); break;
+ default: break;
+ }
+ return text;
+}
+
+/** Displays a critical message box with the given caption, message text, and
+ * visible buttons. To specify a button as a default button or an escape
+ * button, OR the Button enum value with QMessageBox::Default or
+ * QMessageBox::Escape, respectively. */
+int
+VMessageBox::critical(QWidget *parent, QString caption, QString text,
+ int button0, int button1, int button2)
+{
+ int ret = QMessageBox::critical(parent, caption, p(text),
+ VMessageBox::buttonText(button0),
+ VMessageBox::buttonText(button1),
+ VMessageBox::buttonText(button2),
+ VMessageBox::defaultButton(button0, button1, button2),
+ VMessageBox::escapeButton(button0, button1, button2));
+ return VMessageBox::selected(ret, button0, button1, button2);
+}
+
+/** Displays an question message box with the given caption, message text, and
+ * visible buttons. To specify a button as a default button or an escape
+ * button, OR the Button enum value with QMessageBox::Default or
+ * QMessageBox::Escape, respectively. */
+int
+VMessageBox::question(QWidget *parent, QString caption, QString text,
+ int button0, int button1, int button2)
+{
+ int ret = QMessageBox::question(parent, caption, p(text),
+ VMessageBox::buttonText(button0),
+ VMessageBox::buttonText(button1),
+ VMessageBox::buttonText(button2),
+ VMessageBox::defaultButton(button0, button1, button2),
+ VMessageBox::escapeButton(button0, button1, button2));
+ return VMessageBox::selected(ret, button0, button1, button2);
+}
+
+/** Displays an information message box with the given caption, message text, and
+ * visible buttons. To specify a button as a default button or an escape
+ * button, OR the Button enum value with QMessageBox::Default or
+ * QMessageBox::Escape, respectively. */
+int
+VMessageBox::information(QWidget *parent, QString caption, QString text,
+ int button0, int button1, int button2)
+{
+ int ret = QMessageBox::information(parent, caption, p(text),
+ VMessageBox::buttonText(button0),
+ VMessageBox::buttonText(button1),
+ VMessageBox::buttonText(button2),
+ VMessageBox::defaultButton(button0, button1, button2),
+ VMessageBox::escapeButton(button0, button1, button2));
+ return VMessageBox::selected(ret, button0, button1, button2);
+}
+
+/** Displays a warning message box with the given caption, message text, and
+ * visible buttons. To specify a button as a default button or an escape
+ * button, OR the Button enum value with QMessageBox::Default or
+ * QMessageBox::Escape, respectively. */
+int
+VMessageBox::warning(QWidget *parent, QString caption, QString text,
+ int button0, int button1, int button2)
+{
+ int ret = QMessageBox::warning(parent, caption, p(text),
+ VMessageBox::buttonText(button0),
+ VMessageBox::buttonText(button1),
+ VMessageBox::buttonText(button2),
+ VMessageBox::defaultButton(button0, button1, button2),
+ VMessageBox::escapeButton(button0, button1, button2));
+ return VMessageBox::selected(ret, button0, button1, button2);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VMessageBox.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VMessageBox.h
new file mode 100644
index 0000000..6d461ea
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VMessageBox.h
@@ -0,0 +1,94 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 VMessageBox.h
+** \version $Id: VMessageBox.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Provides a custom Vidalia mesage box
+*/
+
+#ifndef _VMESSAGEBOX_H
+#define _VMESSAGEBOX_H
+
+#include <QMessageBox>
+#include <QString>
+
+
+class VMessageBox : public QMessageBox
+{
+ Q_OBJECT
+
+public:
+ enum Button {
+ NoButton = 0,
+ Ok,
+ Cancel,
+ Yes,
+ No,
+ Help,
+ Retry,
+ ShowLog,
+ ShowSettings,
+ Continue,
+ Quit,
+ Browse
+ };
+
+ /** Default constructor. */
+ VMessageBox(QWidget *parent = 0);
+
+ /** Displays an critical message box with the given caption, message text,
+ * and visible buttons. To specify a button as a default button or an escape
+ * button, OR the Button enum value with QMessageBox::Default or
+ * QMessageBox::Escape, respectively. */
+ static int critical(QWidget *parent, QString caption, QString text,
+ int button0, int button1 = NoButton,
+ int button2 = NoButton);
+
+ /** Displays an information message box with the given caption, message text,
+ * and visible buttons. To specify a button as a default button or an escape
+ * button, OR the Button enum value with QMessageBox::Default or
+ * QMessageBox::Escape, respectively. */
+ static int information(QWidget *parent, QString caption, QString text,
+ int button0, int button1 = NoButton,
+ int button2 = NoButton);
+
+ /** Displays a warning message box with the given caption, message text, and
+ * visible buttons. To specify as a default button or an escape
+ * button, OR the Button enum value with QMessageBox::Default or
+ * QMessageBox::Escape, respectively. */
+ static int warning(QWidget *parent, QString caption, QString text,
+ int button0, int button1 = NoButton,
+ int button2 = NoButton);
+
+ /** Displays a warning message box with the given caption, message text, and
+ * visible buttons. To specify as a default button or an escape
+ * 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);
+
+ /** Converts a Button enum value to a translated string. */
+ static QString buttonText(int button);
+
+private:
+ /** Returns the button (0, 1, or 2) that is OR-ed with QMessageBox::Default,
+ * or 0 if none are. */
+ static int defaultButton(int button0, int button1, int button2);
+ /** Returns the button (0, 1, or 2) that is OR-ed with QMessageBox::Escape,
+ * or -1 if none are. */
+ 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);
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/Vidalia.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/Vidalia.cpp
new file mode 100644
index 0000000..76d803a
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/Vidalia.cpp
@@ -0,0 +1,518 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 Vidalia.cpp
+** \version $Id: Vidalia.cpp 4299 2010-05-20 22:04:40Z edmanm $
+** \brief Main Vidalia QApplication object
+*/
+
+#include "config.h"
+#include "Vidalia.h"
+#include "LanguageSupport.h"
+#include "VMessageBox.h"
+
+#include "stringutil.h"
+#include "html.h"
+
+#ifdef USE_MARBLE
+#include <MarbleDirs.h>
+#endif
+
+#include <QDir>
+#include <QTimer>
+#include <QTextStream>
+#include <QStyleFactory>
+#include <QShortcut>
+#include <QTranslator>
+#include <QLibraryInfo>
+#include <QSslSocket>
+
+#ifdef Q_OS_MACX
+#include <Carbon/Carbon.h>
+#endif
+#include <stdlib.h>
+
+/* Available command-line arguments. */
+#define ARG_LANGUAGE "lang" /**< Argument specifying language. */
+#define ARG_GUISTYLE "style" /**< Argument specfying GUI style. */
+#define ARG_RESET "reset" /**< Reset Vidalia's saved settings. */
+#define ARG_HELP "help" /**< Display usage informatino. */
+#define ARG_DATADIR "datadir" /**< Directory to use for data files. */
+#define ARG_PIDFILE "pidfile" /**< Location and name of our pidfile.*/
+#define ARG_LOGFILE "logfile" /**< Location of our logfile. */
+#define ARG_LOGLEVEL "loglevel" /**< Log verbosity. */
+#define ARG_READ_PASSWORD_FROM_STDIN \
+ "read-password-from-stdin" /**< Read password from stdin. */
+
+/* Static member variables */
+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. */
+Log Vidalia::_log;
+QList<QTranslator *> Vidalia::_translators;
+
+
+/** Catches debugging messages from Qt and sends them to Vidalia's logs. If Qt
+ * emits a QtFatalMsg, we will write the message to the log and then abort().
+ */
+void
+Vidalia::qt_msg_handler(QtMsgType type, const char *s)
+{
+ QString msg(s);
+ switch (type) {
+ case QtDebugMsg:
+ vDebug("QtDebugMsg: %1").arg(msg);
+ break;
+ case QtWarningMsg:
+ vNotice("QtWarningMsg: %1").arg(msg);
+ break;
+ case QtCriticalMsg:
+ vWarn("QtCriticalMsg: %1").arg(msg);
+ break;
+ case QtFatalMsg:
+ vError("QtFatalMsg: %1").arg(msg);
+ break;
+ }
+ if (type == QtFatalMsg) {
+ vError("Fatal Qt error. Aborting.");
+ abort();
+ }
+}
+
+/** Constructor. Parses the command-line arguments, resets Vidalia's
+ * configuration (if requested), and sets up the GUI style and language
+ * translation. */
+Vidalia::Vidalia(QStringList args, int &argc, char **argv)
+: QApplication(argc, argv)
+{
+ qInstallMsgHandler(qt_msg_handler);
+
+ /* Read in all our command-line arguments. */
+ parseArguments(args);
+
+ /* Check if we're supposed to reset our config before proceeding. */
+ if (_args.contains(ARG_RESET))
+ VidaliaSettings::reset();
+
+ /* See if we should load a default configuration file. */
+ if (! VidaliaSettings::settingsFileExists())
+ copyDefaultSettingsFile();
+
+ /* Handle the -loglevel and -logfile options. */
+ if (_args.contains(ARG_LOGFILE))
+ _log.open(_args.value(ARG_LOGFILE));
+ if (_args.contains(ARG_LOGLEVEL)) {
+ _log.setLogLevel(Log::stringToLogLevel(
+ _args.value(ARG_LOGLEVEL)));
+ if (!_args.contains(ARG_LOGFILE))
+ _log.open(stdout);
+ }
+ if (!_args.contains(ARG_LOGLEVEL) &&
+ !_args.contains(ARG_LOGFILE))
+ _log.setLogLevel(Log::Off);
+
+ /* Translate the GUI to the appropriate language. */
+ setLanguage(_args.value(ARG_LANGUAGE));
+ /* Set the GUI style appropriately. */
+ setStyle(_args.value(ARG_GUISTYLE));
+
+ /* Creates a TorControl object, used to talk to Tor. */
+ _torControl = new TorControl();
+
+ /* If we were built with QSslSocket support, then populate the default
+ * CA certificate store. */
+ loadDefaultCaCertificates();
+
+#ifdef USE_MARBLE
+ /* Tell Marble where to stash its generated data */
+ Marble::MarbleDirs::setMarbleDataPath(dataDirectory());
+
+#ifdef Q_OS_WIN32
+ Marble::MarbleDirs::setMarblePluginPath(vApp->applicationDirPath()
+ + "/plugins/marble");
+#endif
+#endif
+#ifdef Q_WS_MAC
+ setStyleSheet("QTreeWidget { font-size: 12pt }");
+#endif
+}
+
+/** Destructor */
+Vidalia::~Vidalia()
+{
+ delete _torControl;
+}
+
+/** Enters the main event loop and waits until exit() is called. The signal
+ * running() will be emitted when the event loop has started. */
+int
+Vidalia::run()
+{
+ QTimer::singleShot(0, vApp, SLOT(onEventLoopStarted()));
+ return vApp->exec();
+}
+
+/** Called when the application's main event loop has started. This method
+ * will emit the running() signal to indicate that the application's event
+ * loop is running. */
+void
+Vidalia::onEventLoopStarted()
+{
+ emit running();
+}
+
+#if defined(Q_OS_WIN)
+/** On Windows, we need to catch the WM_QUERYENDSESSION message
+ * so we know that it is time to shutdown. */
+bool
+Vidalia::winEventFilter(MSG *msg, long *result)
+{
+ if (msg->message == WM_QUERYENDSESSION) {
+ quit();
+ }
+ return QApplication::winEventFilter(msg, result);
+}
+#endif
+
+/** Returns true if the user wants to see usage information. */
+bool
+Vidalia::showUsage()
+{
+ return _args.contains(ARG_HELP);
+}
+
+/** Displays usage information for command-line args. */
+void
+Vidalia::showUsageMessageBox()
+{
+ QString usage;
+ QTextStream out(&usage);
+
+ out << "Available Options:" << endl;
+ out << "<table>";
+ out << trow(tcol("-"ARG_HELP) +
+ tcol(tr("Displays this usage message and exits.")));
+ out << trow(tcol("-"ARG_RESET) +
+ tcol(tr("Resets ALL stored Vidalia settings.")));
+ out << trow(tcol("-"ARG_DATADIR" <dir>") +
+ tcol(tr("Sets the directory Vidalia uses for data files.")));
+ out << trow(tcol("-"ARG_PIDFILE" <file>") +
+ tcol(tr("Sets the name and location of Vidalia's pidfile.")));
+ out << trow(tcol("-"ARG_LOGFILE" <file>") +
+ tcol(tr("Sets the name and location of Vidalia's logfile.")));
+ out << trow(tcol("-"ARG_LOGLEVEL" <level>") +
+ tcol(tr("Sets the verbosity of Vidalia's logging.") +
+ "<br>[" + Log::logLevels().join("|") +"]"));
+ out << trow(tcol("-"ARG_GUISTYLE" <style>") +
+ tcol(tr("Sets Vidalia's interface style.") +
+ "<br>[" + QStyleFactory::keys().join("|") + "]"));
+ out << trow(tcol("-"ARG_LANGUAGE" <language>") +
+ tcol(tr("Sets Vidalia's language.") +
+ "<br>[" + LanguageSupport::languageCodes().join("|") + "]"));
+ out << "</table>";
+
+ VMessageBox::information(0,
+ tr("Vidalia Usage Information"), usage, VMessageBox::Ok);
+}
+
+/** Returns true if the specified argument expects a value. */
+bool
+Vidalia::argNeedsValue(QString argName)
+{
+ return (argName == ARG_GUISTYLE ||
+ argName == ARG_LANGUAGE ||
+ argName == ARG_DATADIR ||
+ argName == ARG_PIDFILE ||
+ argName == ARG_LOGFILE ||
+ argName == ARG_LOGLEVEL);
+}
+
+/** Parses the list of command-line arguments for their argument names and
+ * values. */
+void
+Vidalia::parseArguments(QStringList args)
+{
+ QString arg, value;
+
+ /* Loop through all command-line args/values and put them in a map */
+ for (int i = 0; i < args.size(); i++) {
+ /* Get the argument name and set a blank value */
+ arg = args.at(i).toLower();
+ value = "";
+
+ /* Check if it starts with a - or -- */
+ if (arg.startsWith("-")) {
+ arg = arg.mid((arg.startsWith("--") ? 2 : 1));
+ }
+ /* Check if it takes a value and there is one on the command-line */
+ if (i < args.size()-1 && argNeedsValue(arg)) {
+ value = args.at(++i);
+ }
+ /* Place this arg/value in the map */
+ _args.insert(arg, value);
+ }
+}
+
+/** Verifies that all specified arguments were valid. */
+bool
+Vidalia::validateArguments(QString &errmsg)
+{
+ /* Check for a language that Vidalia recognizes. */
+ if (_args.contains(ARG_LANGUAGE) &&
+ !LanguageSupport::isValidLanguageCode(_args.value(ARG_LANGUAGE))) {
+ errmsg = tr("Invalid language code specified: ") + _args.value(ARG_LANGUAGE);
+ return false;
+ }
+ /* Check for a valid GUI style */
+ if (_args.contains(ARG_GUISTYLE) &&
+ !QStyleFactory::keys().contains(_args.value(ARG_GUISTYLE),
+ Qt::CaseInsensitive)) {
+ errmsg = tr("Invalid GUI style specified: ") + _args.value(ARG_GUISTYLE);
+ return false;
+ }
+ /* Check for a valid log level */
+ if (_args.contains(ARG_LOGLEVEL) &&
+ !Log::logLevels().contains(_args.value(ARG_LOGLEVEL))) {
+ errmsg = tr("Invalid log level specified: ") + _args.value(ARG_LOGLEVEL);
+ return false;
+ }
+ /* Check for a writable log file */
+ if (_args.contains(ARG_LOGFILE) && !_log.isOpen()) {
+ errmsg = tr("Unable to open log file '%1': %2")
+ .arg(_args.value(ARG_LOGFILE))
+ .arg(_log.errorString());
+ return false;
+ }
+ return true;
+}
+
+/** Sets the translation Vidalia will use. If one was specified on the
+ * command-line, we will use that. Otherwise, we'll check to see if one was
+ * saved previously. If not, we'll default to one appropriate for the system
+ * locale. */
+bool
+Vidalia::setLanguage(QString languageCode)
+{
+ /* If the language code is empty, use the previously-saved setting */
+ if (languageCode.isEmpty()) {
+ VidaliaSettings settings;
+ languageCode = settings.getLanguageCode();
+ }
+ /* Translate into the desired langauge */
+ if (retranslateUi(languageCode)) {
+ _language = languageCode;
+ return true;
+ }
+ return false;
+}
+
+/** Sets the GUI style Vidalia will use. If one was specified on the
+ * command-line, we will use that. Otherwise, we'll check to see if one was
+ * saved previously. If not, we'll default to one appropriate for the
+ * operating system. */
+bool
+Vidalia::setStyle(QString styleKey)
+{
+ /* If no style was specified, use the previously-saved setting */
+ if (styleKey.isEmpty()) {
+ VidaliaSettings settings;
+ styleKey = settings.getInterfaceStyle();
+ }
+ /* Apply the specified GUI style */
+ if (QApplication::setStyle(styleKey)) {
+ _style = styleKey;
+ return true;
+ }
+ return false;
+}
+
+/** Returns the directory Vidalia uses for its data files. */
+QString
+Vidalia::dataDirectory()
+{
+ if (_args.contains(ARG_DATADIR)) {
+ return _args.value(ARG_DATADIR);
+ }
+ return defaultDataDirectory();
+}
+
+/** Returns the default location of Vidalia's data directory. */
+QString
+Vidalia::defaultDataDirectory()
+{
+#if defined(Q_OS_WIN32)
+ return (win32_app_data_folder() + "\\Vidalia");
+#elif defined(Q_OS_MAC)
+ return (QDir::homePath() + "/Library/Vidalia");
+#else
+ return (QDir::homePath() + "/.vidalia");
+#endif
+}
+
+/** Returns the location of Vidalia's pid file. */
+QString
+Vidalia::pidFile()
+{
+ if (_args.contains(ARG_PIDFILE)) {
+ return _args.value(ARG_PIDFILE);
+ }
+ return QDir::convertSeparators(dataDirectory() + "/vidalia.pid");
+}
+
+bool
+Vidalia::readPasswordFromStdin()
+{
+ return _args.contains(ARG_READ_PASSWORD_FROM_STDIN);
+}
+
+/** Writes <b>msg</b> with severity <b>level</b> to Vidalia's log. */
+Log::LogMessage
+Vidalia::log(Log::LogLevel level, QString msg)
+{
+ return _log.log(level, msg);
+}
+
+/** Creates and binds a shortcut such that when <b>key</b> is pressed in
+ * <b>sender</b>'s context, <b>receiver</b>'s <b>slot</b> will be called. */
+void
+Vidalia::createShortcut(const QKeySequence &key, QWidget *sender,
+ QObject *receiver, const char *slot)
+{
+ QShortcut *s = new QShortcut(key, sender);
+ connect(s, SIGNAL(activated()), receiver, slot);
+}
+
+/** Creates and binds a shortcut such that when <b>key</b> is pressed in
+ * <b>sender</b>'s context, <b>receiver</b>'s <b>slot</b> will be called. */
+void
+Vidalia::createShortcut(const QString &key, QWidget *sender,
+ QObject *receiver, const char *slot)
+{
+ createShortcut(QKeySequence(key), sender, receiver, slot);
+}
+
+void
+Vidalia::removeAllTranslators()
+{
+ vInfo("Removing all currently installed UI translator objects.");
+ foreach (QTranslator *translator, _translators) {
+ QApplication::removeTranslator(translator);
+ delete translator;
+ }
+ _translators.clear();
+}
+
+bool
+Vidalia::retranslateUi(const QString &languageCode)
+{
+ QTranslator *systemQtTranslator = 0;
+ QTranslator *vidaliaQtTranslator = 0;
+ QTranslator *vidaliaTranslator = 0;
+
+ if (! LanguageSupport::isValidLanguageCode(languageCode)) {
+ vWarn("Invalid language code: %1").arg(languageCode);
+ return false;
+ }
+ if (! languageCode.compare("en", Qt::CaseInsensitive)) {
+ vNotice("Resetting UI translation to English default.");
+ _language = languageCode;
+ removeAllTranslators();
+ return true;
+ }
+
+ systemQtTranslator = new QTranslator(vApp);
+ Q_CHECK_PTR(systemQtTranslator);
+ QString qtDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+ systemQtTranslator->load(qtDir + "/qt_" + languageCode + ".qm");
+
+
+ vidaliaQtTranslator = new QTranslator(vApp);
+ Q_CHECK_PTR(vidaliaQtTranslator);
+ vidaliaQtTranslator->load(":/lang/qt_" + languageCode + ".qm");
+
+ vidaliaTranslator = new QTranslator(vApp);
+ Q_CHECK_PTR(vidaliaTranslator);
+ if (! vidaliaTranslator->load(":/lang/vidalia_" + languageCode + ".qm"))
+ goto err;
+
+ removeAllTranslators();
+ vNotice("Changing UI translation from '%1' to '%2'").arg(_language)
+ .arg(languageCode);
+ _language = languageCode;
+ QApplication::installTranslator(systemQtTranslator);
+ QApplication::installTranslator(vidaliaQtTranslator);
+ QApplication::installTranslator(vidaliaTranslator);
+ _translators << systemQtTranslator
+ << vidaliaQtTranslator
+ << vidaliaTranslator;
+
+ return true;
+
+err:
+ vWarn("Unable to set UI translation to '%1'").arg(languageCode);
+ if (systemQtTranslator)
+ delete systemQtTranslator;
+ if (vidaliaQtTranslator)
+ delete vidaliaQtTranslator;
+ if (vidaliaTranslator)
+ delete vidaliaTranslator;
+ delete vidaliaTranslator;
+ return false;
+}
+
+/** Copies a default settings file (if one exists) to Vidalia's data
+ * directory. */
+void
+Vidalia::copyDefaultSettingsFile() const
+{
+#ifdef Q_OS_MACX
+ CFURLRef confUrlRef;
+ CFStringRef pathRef;
+ const char *path;
+
+ confUrlRef = CFBundleCopyResourceURL(CFBundleGetMainBundle(),
+ CFSTR("vidalia"), CFSTR("conf"), NULL);
+ if (confUrlRef == NULL)
+ return;
+
+ pathRef = CFURLCopyFileSystemPath(confUrlRef, kCFURLPOSIXPathStyle);
+ path = CFStringGetCStringPtr(pathRef, CFStringGetSystemEncoding());
+
+ if (path) {
+ QString defaultConfFile = QString::fromLocal8Bit(path);
+ QFileInfo fi(defaultConfFile);
+ if (fi.exists()) {
+ QFileInfo out(VidaliaSettings::settingsFile());
+ if (! out.dir().exists())
+ out.dir().mkpath(".");
+ QFile::copy(defaultConfFile, out.absoluteFilePath());
+ }
+ }
+ CFRelease(confUrlRef);
+ CFRelease(pathRef);
+#endif
+}
+
+void
+Vidalia::loadDefaultCaCertificates() const
+{
+ QSslSocket::setDefaultCaCertificates(QList<QSslCertificate>());
+
+ if (! QSslSocket::addDefaultCaCertificates(":/pki/cacert_root.crt"))
+ vWarn("Failed to add the CACert CA certificate to the default CA "
+ "certificate database.");
+
+ if (! QSslSocket::addDefaultCaCertificates(":/pki/EquifaxSecureCA.crt"))
+ vWarn("Failed to add the Equifax Secure CA certificate to the default CA "
+ "certificate database.");
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/Vidalia.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/Vidalia.h
new file mode 100644
index 0000000..bec413b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/Vidalia.h
@@ -0,0 +1,164 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 vidalia.h
+** \version $Id: Vidalia.h 3886 2009-06-25 02:56:47Z edmanm $
+** \brief Main Vidalia QApplication object
+*/
+
+#ifndef _VIDALIA_H
+#define _VIDALIA_H
+
+#include "config.h"
+#include "VidaliaSettings.h"
+#include "Log.h"
+#include "TorControl.h"
+
+#include <QApplication>
+#include <QMap>
+#include <QList>
+#include <QString>
+#include <QKeySequence>
+
+#if defined(Q_OS_WIN)
+#include <windows.h>
+#include "win32.h"
+#endif
+
+/** Pointer to this Vidalia application instance. */
+#define vApp ((Vidalia *)qApp)
+
+#define vDebug(fmt) (vApp->log(Log::Debug, (fmt)))
+#define vInfo(fmt) (vApp->log(Log::Info, (fmt)))
+#define vNotice(fmt) (vApp->log(Log::Notice, (fmt)))
+#define vWarn(fmt) (vApp->log(Log::Warn, (fmt)))
+#define vError(fmt) (vApp->log(Log::Error, (fmt)))
+
+
+class Vidalia : public QApplication
+{
+ Q_OBJECT
+
+public:
+ /** Constructor. */
+ Vidalia(QStringList args, int &argc, char **argv);
+ /** Destructor. */
+ ~Vidalia();
+
+ /** Validates that all arguments were well-formed. */
+ static bool validateArguments(QString &errmsg);
+ /** Displays usage information for command-line args. */
+ static void showUsageMessageBox();
+ /** Returns true if the user wants to see usage information. */
+ static bool showUsage();
+
+ /** Sets the current language. */
+ static bool setLanguage(QString languageCode = QString());
+ /** Sets the current GUI style. */
+ static bool setStyle(QString styleKey = QString());
+
+ /** Returns the current language. */
+ static QString language() { return _language; }
+ /** Returns the current GUI style. */
+ static QString style() { return _style; }
+ /** Returns Vidalia's application version. */
+ static QString version() { return VIDALIA_VERSION; }
+
+ /** Returns Vidalia's main TorControl object. */
+ static TorControl* torControl() { return _torControl; }
+
+ /** Returns the location Vidalia uses for its data files. */
+ static QString dataDirectory();
+ /** Returns the default location of Vidalia's data directory. */
+ static QString defaultDataDirectory();
+
+ /** Returns the location of Vidalia's pid file. */
+ static QString pidFile();
+
+ /** Returns true if Vidalia should read the control password from stdin.
+ */
+ static bool readPasswordFromStdin();
+
+ /** Writes <b>msg</b> with severity <b>level</b> to Vidalia's log. */
+ static Log::LogMessage log(Log::LogLevel level, QString msg);
+
+ /** Enters the main event loop and waits until exit() is called. The signal
+ * running() will be emitted when the event loop has started. */
+ static int run();
+
+ /** Creates and binds a shortcut such that when <b>key</b> is pressed in
+ * <b>sender</b>'s context, <b>receiver</b>'s <b>slot</b> will be called. */
+ static void createShortcut(const QKeySequence &key, QWidget *sender,
+ QObject *receiver, const char *slot);
+
+ /** Creates and binds a shortcut such that when <b>key</b> is pressed in
+ * <b>sender</b>'s context, <b>receiver</b>'s <b>slot</b> will be called. */
+ static void createShortcut(const QString &key, QWidget *sender,
+ QObject *receiver, const char *slot);
+
+ /** Loads and installs all available translators for the specified
+ * <b>languageCode</b>. All currently installed QTranslator objects will be
+ * removed. Returns true if at least Vidalia's language file can be loaded
+ * for the given language. Otherwise, returns false and no change is made
+ * to the current translators.
+ */
+ static bool retranslateUi(const QString &languageCode);
+
+signals:
+ /** Emitted when the application is running and the main event loop has
+ * started. */
+ void running();
+
+protected:
+#if defined(Q_OS_WIN)
+ /** Filters Windows events, looking for events of interest */
+ bool winEventFilter(MSG *msg, long *result);
+#endif
+
+ /** Removes all currently installed QTranslators. */
+ static void removeAllTranslators();
+
+private slots:
+ /** Called when the application's main event loop has started. This method
+ * will emit the running() signal to indicate that the application's event
+ * loop is running. */
+ void onEventLoopStarted();
+
+private:
+ /** Catches debugging messages from Qt and sends them to
+ * Vidalia's logs. */
+ static void qt_msg_handler(QtMsgType type, const char *msg);
+
+ /** Parse the list of command-line arguments. */
+ void parseArguments(QStringList args);
+ /** Returns true if the specified arguments wants a value. */
+ bool argNeedsValue(QString argName);
+
+ /** Copies a default settings file (if one exists) to Vidalia's data
+ * directory.
+ */
+ void copyDefaultSettingsFile() const;
+
+ /** Clears the list of default CA certificates and adds only the ones
+ * Vidalia is interested in.
+ */
+ void loadDefaultCaCertificates() const;
+
+ static QMap<QString, QString> _args; /**< List of command-line arguments. */
+ static QString _style; /**< The current GUI style. */
+ static QString _language; /**< The current language. */
+ static TorControl* _torControl; /**< Vidalia's main TorControl object.*/
+ static Log _log; /**< Logs debugging messages to file or stdout. */
+ static QList<QTranslator *> _translators; /**< List of installed translators. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VidaliaWindow.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VidaliaWindow.cpp
new file mode 100644
index 0000000..b947264
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VidaliaWindow.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.vidalia-project.net/. No part of Vidalia, including this file,
+** may be copied, modified, propagated, or distributed except according to the
+** terms described in the LICENSE file.
+*/
+
+/*
+** \file VidaliaWindow.cpp
+** \version $Id: VidaliaWindow.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Common superclass for all Vidalia windows
+*/
+
+#include "VidaliaWindow.h"
+#include "Vidalia.h"
+
+#include <QPoint>
+#include <QSize>
+#include <QShortcut>
+#include <QByteArray>
+#include <QKeySequence>
+#include <QDesktopWidget>
+
+
+/** Default constructor. */
+VidaliaWindow::VidaliaWindow(const QString &name, QWidget *parent,
+ Qt::WFlags flags)
+ : QMainWindow(parent, flags)
+{
+ _name = name;
+ _settings = new VSettings(name);
+}
+
+/** Destructor. */
+VidaliaWindow::~VidaliaWindow()
+{
+ saveWindowState();
+ delete _settings;
+}
+
+/** Associates a shortcut key sequence with a slot. */
+void
+VidaliaWindow::setShortcut(const QString &shortcut, const char *slot)
+{
+ vApp->createShortcut(QKeySequence(shortcut), this, this, slot);
+}
+
+/** Saves the size and location of the window. */
+void
+VidaliaWindow::saveWindowState()
+{
+#if QT_VERSION >= 0x040200
+ saveSetting("Geometry", saveGeometry());
+#else
+ saveSetting("Size", size());
+ saveSetting("Position", pos());
+#endif
+}
+
+/** Restores the last size and location of the window. */
+void
+VidaliaWindow::restoreWindowState()
+{
+#if QT_VERSION >= 0x040200
+ QByteArray geometry = getSetting("Geometry", QByteArray()).toByteArray();
+ if (geometry.isEmpty())
+ adjustSize();
+ else
+ restoreGeometry(geometry);
+#else
+ QRect screen = QDesktopWidget().availableGeometry();
+
+ /* Restore the window size. */
+ QSize size = getSetting("Size", QSize()).toSize();
+ if (!size.isEmpty()) {
+ size = size.boundedTo(screen.size());
+ resize(size);
+ }
+
+ /* Restore the window position. */
+ QPoint pos = getSetting("Position", QPoint()).toPoint();
+ if (!pos.isNull() && screen.contains(pos)) {
+ move(pos);
+ }
+#endif
+}
+
+/** Gets the saved value of a property associated with this window object.
+ * If no value was saved, the default value is returned. */
+QVariant
+VidaliaWindow::getSetting(QString setting, QVariant defaultValue)
+{
+ return _settings->value(setting, defaultValue);
+}
+
+/** Saves a value associated with a property name for this window object. */
+void
+VidaliaWindow::saveSetting(QString prop, QVariant value)
+{
+ _settings->setValue(prop, value);
+}
+
+/** Overloaded QWidget::setVisible(). If this window is already visible and
+ * <b>visible</b> is true, this window will be brought to the top and given
+ * focus. If <b>visible</b> is false, then the window state will be saved and
+ * this window will be hidden. */
+void
+VidaliaWindow::setVisible(bool visible)
+{
+ if (visible) {
+ /* Bring the window to the top, if it's already open. Otherwise, make the
+ * window visible. */
+ if (isVisible()) {
+ activateWindow();
+ setWindowState(windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
+ raise();
+ } else {
+ restoreWindowState();
+ }
+ } else {
+ /* Save the last size and position of this window. */
+ saveWindowState();
+ }
+ QMainWindow::setVisible(visible);
+}
+
+/** 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
+VidaliaWindow::changeEvent(QEvent *e)
+{
+ if (e->type() == QEvent::LanguageChange) {
+ retranslateUi();
+ e->accept();
+ return;
+ }
+ QMainWindow::changeEvent(e);
+}
+
+/** Called when the user wants to change the currently visible language.
+ * Subclasses can reimplement this to update their UI. */
+void
+VidaliaWindow::retranslateUi()
+{
+ /* The default retranslateUi() implementation does nothing */
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VidaliaWindow.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VidaliaWindow.h
new file mode 100644
index 0000000..ff794f3
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/VidaliaWindow.h
@@ -0,0 +1,78 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 VidaliaWindow.h
+** \version $Id: VidaliaWindow.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Common superclass for all Vidalia windows
+*/
+
+#ifndef _VIDALIAWINDOW_H
+#define _VIDALIAWINDOW_H
+
+#include "VSettings.h"
+
+#include <QString>
+#include <QWidget>
+#include <QVariant>
+#include <QMainWindow>
+
+
+class VidaliaWindow : public QMainWindow
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. */
+ VidaliaWindow(const QString &name, QWidget *parent = 0,
+ Qt::WFlags flags = 0);
+ /** Destructor. */
+ ~VidaliaWindow();
+
+ /** Associates a shortcut key sequence with a slot. */
+ void setShortcut(const QString &shortcut, const char *slot);
+ /** Saves the size and location of the window. */
+ void saveWindowState();
+ /** Restores the last size and location of the window. */
+ void restoreWindowState();
+
+ /** Gets the saved value of a property associated with this window object.
+ * If no value was saved, the default value is returned. */
+ QVariant getSetting(QString name, QVariant defaultValue);
+ /** Saves a value associated with a setting name for this window object. */
+ void saveSetting(QString name, QVariant value);
+
+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();
+
+public slots:
+ /** Shows or hides this window. */
+ virtual void setVisible(bool visible);
+ /** Show this window. This method really just exists for subclasses to
+ * override, since QMainWindow::show() is non-virtual. */
+ virtual void showWindow() { QMainWindow::show(); }
+
+signals:
+ /** Emitted when a VidaliaWindow requests help information on the specified
+ * <b>topic</b>. */
+ void helpRequested(const QString &topic);
+
+private:
+ QString _name; /**< Name associated with this window. */
+ VSettings* _settings; /**< Object used to store window properties */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/AboutDialog.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/AboutDialog.cpp
new file mode 100644
index 0000000..028d1b8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/AboutDialog.cpp
@@ -0,0 +1,62 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not receive the LICENSE file with this file, you may obtain it from the
+** Vidalia source package distributed by the Vidalia Project at
+** http://www.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 AboutDialog.cpp
+** \version $Id: AboutDialog.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays information about Vidalia, Tor, and Qt
+*/
+
+#include "AboutDialog.h"
+#include "LicenseDialog.h"
+#include "Vidalia.h"
+
+#include <QFile>
+#include <QDialog>
+#include <QPushButton>
+
+
+/** Default Constructor. */
+AboutDialog::AboutDialog(QWidget *parent, Qt::WindowFlags flags)
+ : QDialog(parent, Qt::CustomizeWindowHint | Qt::WindowSystemMenuHint)
+{
+ ui.setupUi(this);
+
+ /* Add a "License" button to the button box at the bottom */
+ QPushButton *licenseButton;
+ licenseButton = ui.buttonBox->addButton(tr("License"),
+ QDialogButtonBox::ActionRole);
+
+ /* Get Vidalia's version number */
+ ui.lblVidaliaVersion->setText(QString("Vidalia %1").arg(Vidalia::version()));
+
+ /* Get Tor's version number or hide it if Tor isn't running */
+ if (Vidalia::torControl()->isConnected()) {
+ QString version = Vidalia::torControl()->getTorVersionString();
+ if (! version.isEmpty())
+ ui.lblTorVersion->setText(QString("Tor %1").arg(version));
+ else
+ ui.lblTorVersion->setVisible(false);
+ } else {
+ ui.lblTorVersion->setVisible(false);
+ }
+
+ /* Get Qt's version number */
+ ui.lblQtVersion->setText(QString("Qt %1").arg(QT_VERSION_STR));
+
+ /* Display the license information dialog when the "License" button
+ * is clicked. */
+ connect(licenseButton, SIGNAL(clicked()),
+ new LicenseDialog(this), SLOT(exec()));
+
+ /* Close this dialog when the "Close" button is clicked */
+ connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/AboutDialog.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/AboutDialog.h
new file mode 100644
index 0000000..8721913
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/AboutDialog.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.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 AboutDialog.h
+** \version $Id: AboutDialog.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays information about Vidalia, Tor, and Qt
+*/
+
+#ifndef _ABOUTDIALOG_H
+#define _ABOUTDIALOG_H
+
+#include "ui_AboutDialog.h"
+#include "LicenseDialog.h"
+
+
+class AboutDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor */
+ AboutDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
+
+private:
+ Ui::AboutDialog ui; /**< Qt Designer generated QObject **/
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/AboutDialog.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/AboutDialog.ui
new file mode 100644
index 0000000..cf85170
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/AboutDialog.ui
@@ -0,0 +1,108 @@
+<ui version="4.0" >
+ <class>AboutDialog</class>
+ <widget class="QDialog" name="AboutDialog" >
+ <property name="windowModality" >
+ <enum>Qt::NonModal</enum>
+ </property>
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>215</width>
+ <height>271</height>
+ </rect>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="windowTitle" >
+ <string>About Vidalia</string>
+ </property>
+ <property name="modal" >
+ <bool>false</bool>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout" >
+ <item>
+ <widget class="QLabel" name="lblVidaliaLogo" >
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>132</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="pixmap" >
+ <pixmap resource="../res/vidalia.qrc" >:/images/128x128/tor-logo.png</pixmap>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="lblVidaliaVersion" >
+ <property name="font" >
+ <font>
+ <weight>75</weight>
+ <italic>false</italic>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text" >
+ <string>Vidalia 0.2.0</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="lblTorVersion" >
+ <property name="text" >
+ <string>Tor 0.2.0.32</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="lblQtVersion" >
+ <property name="font" >
+ <font>
+ <italic>false</italic>
+ </font>
+ </property>
+ <property name="text" >
+ <string>Qt 4.4.2</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Close</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources>
+ <include location="../res/vidalia.qrc" />
+ </resources>
+ <connections/>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/LicenseDialog.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/LicenseDialog.cpp
new file mode 100644
index 0000000..26f8f9b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/LicenseDialog.cpp
@@ -0,0 +1,41 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 LicenseDialog.cpp
+** \version $Id: LicenseDialog.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays HTML-formatted license information for Vidalia and related
+** software.
+*/
+
+#include "LicenseDialog.h"
+
+#include <QFile>
+#include <QString>
+
+
+LicenseDialog::LicenseDialog(QWidget *parent)
+ : QDialog(parent)
+{
+ ui.setupUi(this);
+
+ ui.txtLicense->setHtml(loadHtml(":/docs/license.html"));
+ ui.txtCredits->setHtml(loadHtml(":/docs/credits.html"));
+}
+
+QString
+LicenseDialog::loadHtml(const QString &source) const
+{
+ QFile file(source);
+ if (! file.open(QIODevice::ReadOnly | QIODevice::Text))
+ return QString();
+ return QString(file.readAll());
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/LicenseDialog.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/LicenseDialog.h
new file mode 100644
index 0000000..c553296
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/LicenseDialog.h
@@ -0,0 +1,43 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 LicenseDialog.h
+** \version $Id: LicenseDialog.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays HTML-formatted license information for Vidalia and related
+** software.
+*/
+
+#ifndef _LICENSEDIALOG_H
+#define _LICENSEDIALOG_H
+
+#include "ui_LicenseDialog.h"
+
+
+class LicenseDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor.
+ */
+ LicenseDialog(QWidget *parent = 0);
+
+protected:
+ /** Reads and returns all HTML-formatted text from <b>source</b>.
+ */
+ virtual QString loadHtml(const QString &source) const;
+
+private:
+ Ui::LicenseDialog ui;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/LicenseDialog.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/LicenseDialog.ui
new file mode 100644
index 0000000..0b0f72d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/about/LicenseDialog.ui
@@ -0,0 +1,149 @@
+<ui version="4.0" >
+ <class>LicenseDialog</class>
+ <widget class="QDialog" name="LicenseDialog" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>701</width>
+ <height>584</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+ <string>License Information</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <item row="0" column="0" >
+ <layout class="QVBoxLayout" name="verticalLayout" >
+ <property name="sizeConstraint" >
+ <enum>QLayout::SetDefaultConstraint</enum>
+ </property>
+ <property name="margin" >
+ <number>12</number>
+ </property>
+ <item>
+ <widget class="QTabWidget" name="tabWidget" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="tabShape" >
+ <enum>QTabWidget::Rounded</enum>
+ </property>
+ <property name="currentIndex" >
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="tabLicense" >
+ <attribute name="title" >
+ <string>License</string>
+ </attribute>
+ <layout class="QGridLayout" name="gridLayout_2" >
+ <item row="0" column="0" >
+ <layout class="QVBoxLayout" name="verticalLayout_2" >
+ <item>
+ <widget class="QTextEdit" name="txtLicense" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="acceptDrops" >
+ <bool>false</bool>
+ </property>
+ <property name="undoRedoEnabled" >
+ <bool>false</bool>
+ </property>
+ <property name="readOnly" >
+ <bool>true</bool>
+ </property>
+ <property name="textInteractionFlags" >
+ <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tabCredits" >
+ <attribute name="title" >
+ <string>Credits</string>
+ </attribute>
+ <layout class="QGridLayout" name="gridLayout_3" >
+ <item row="0" column="0" >
+ <layout class="QVBoxLayout" name="verticalLayout_3" >
+ <item>
+ <widget class="QTextEdit" name="txtCredits" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="textInteractionFlags" >
+ <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Close</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>LicenseDialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>157</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>LicenseDialog</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>286</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/bwgraph/BandwidthGraph.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/bwgraph/BandwidthGraph.cpp
new file mode 100644
index 0000000..d816813
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/bwgraph/BandwidthGraph.cpp
@@ -0,0 +1,268 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 BandwidthGraph.cpp
+** \version $Id: BandwidthGraph.cpp 4054 2009-08-17 02:25:08Z edmanm $
+** \brief Displays a graph of Tor's bandwidth usage
+*/
+
+#include "BandwidthGraph.h"
+#include "Vidalia.h"
+
+#define BWGRAPH_LINE_SEND (1u<<0)
+#define BWGRAPH_LINE_RECV (1u<<1)
+#define SETTING_FILTER "LineFilter"
+#define SETTING_OPACITY "Opacity"
+#define SETTING_ALWAYS_ON_TOP "AlwaysOnTop"
+#define SETTING_STYLE "GraphStyle"
+#define DEFAULT_FILTER (BWGRAPH_LINE_SEND|BWGRAPH_LINE_RECV)
+#define DEFAULT_ALWAYS_ON_TOP false
+#define DEFAULT_OPACITY 100
+#define DEFAULT_STYLE GraphFrame::AreaGraph
+
+#define ADD_TO_FILTER(f,v,b) (f = ((b) ? ((f) | (v)) : ((f) & ~(v))))
+
+/* Define the format used for displaying the date and time */
+#define DATETIME_FMT "MMM dd hh:mm:ss"
+
+/* Images used in the graph style drop-down */
+#define IMG_AREA_GRAPH ":/images/16x16/graph-area.png"
+#define IMG_LINE_GRAPH ":/images/16x16/graph-line.png"
+
+
+/** Default constructor */
+BandwidthGraph::BandwidthGraph(QWidget *parent, Qt::WFlags flags)
+ : VidaliaWindow("BandwidthGraph", parent, flags)
+{
+ /* Invoke Qt Designer generated QObject setup routine */
+ ui.setupUi(this);
+
+ /* Ask Tor to notify us about bandwidth updates */
+ Vidalia::torControl()->setEvent(TorEvents::Bandwidth);
+ connect(Vidalia::torControl(), SIGNAL(bandwidthUpdate(quint64,quint64)),
+ this, SLOT(updateGraph(quint64,quint64)));
+
+ /* Pressing 'Esc' or 'Ctrl+W' will close the window */
+ setShortcut("Esc", SLOT(close()));
+ setShortcut("Ctrl+W", SLOT(close()));
+
+ /* Bind events to actions */
+ createActions();
+
+ /* Initialize Sent/Receive data counters */
+ reset();
+ /* Hide Bandwidth Graph Settings frame */
+ showSettingsFrame(false);
+ /* Load the previously saved settings */
+ loadSettings();
+
+ /* Turn off opacity group on unsupported platforms */
+#if defined(Q_WS_WIN)
+ if(!(QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)
+ || QSysInfo::WindowsVersion < QSysInfo::WV_2000) {
+ ui.frmOpacity->setVisible(false);
+ }
+#endif
+
+#if defined(Q_WS_X11)
+ ui.frmOpacity->setVisible(false);
+#endif
+}
+
+/** Called when the user changes the UI translation. */
+void
+BandwidthGraph::retranslateUi()
+{
+ ui.retranslateUi(this);
+}
+
+/** Binds events to actions. */
+void
+BandwidthGraph::createActions()
+{
+ connect(ui.btnToggleSettings, SIGNAL(toggled(bool)),
+ this, SLOT(showSettingsFrame(bool)));
+
+ connect(ui.btnReset, SIGNAL(clicked()),
+ this, SLOT(reset()));
+
+ connect(ui.btnSaveSettings, SIGNAL(clicked()),
+ this, SLOT(saveChanges()));
+
+ connect(ui.btnCancelSettings, SIGNAL(clicked()),
+ this, SLOT(cancelChanges()));
+
+ connect(ui.sldrOpacity, SIGNAL(valueChanged(int)),
+ this, SLOT(setOpacity(int)));
+}
+
+/** Adds new data to the graph. */
+void
+BandwidthGraph::updateGraph(quint64 bytesRead, quint64 bytesWritten)
+{
+ /* Graph only cares about kilobytes */
+ ui.frmGraph->addPoints(bytesRead/1024.0, bytesWritten/1024.0);
+}
+
+/** Loads the saved Bandwidth Graph settings. */
+void
+BandwidthGraph::loadSettings()
+{
+ /* Set window opacity slider widget */
+ ui.sldrOpacity->setValue(getSetting(SETTING_OPACITY, DEFAULT_OPACITY).toInt());
+ setOpacity(ui.sldrOpacity->value());
+
+ /* Set whether the window appears on top. */
+ ui.chkAlwaysOnTop->setChecked(getSetting(SETTING_ALWAYS_ON_TOP,
+ DEFAULT_ALWAYS_ON_TOP).toBool());
+ if (ui.chkAlwaysOnTop->isChecked()) {
+ setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+ } else {
+ setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
+ }
+
+ /* Set the line filter checkboxes accordingly */
+ uint filter = getSetting(SETTING_FILTER, DEFAULT_FILTER).toUInt();
+ ui.chkReceiveRate->setChecked(filter & BWGRAPH_LINE_RECV);
+ ui.chkSendRate->setChecked(filter & BWGRAPH_LINE_SEND);
+
+ /* Set whether we are plotting bandwidth as area graphs or not */
+ int graphStyle = getSetting(SETTING_STYLE, DEFAULT_STYLE).toInt();
+ if (graphStyle < 0 || graphStyle >= ui.cmbGraphStyle->count()) {
+ graphStyle = DEFAULT_STYLE;
+ }
+ ui.cmbGraphStyle->setCurrentIndex(graphStyle);
+ ui.frmGraph->setGraphStyle((GraphFrame::GraphStyle)graphStyle);
+
+ /* Set graph frame settings */
+ ui.frmGraph->setShowCounters(ui.chkReceiveRate->isChecked(),
+ ui.chkSendRate->isChecked());
+}
+
+/** Resets the log start time. */
+void
+BandwidthGraph::reset()
+{
+ /* Set to current time */
+ ui.statusbar->showMessage(tr("Since:") + " " +
+ QDateTime::currentDateTime()
+ .toString(DATETIME_FMT));
+ /* Reset the graph */
+ ui.frmGraph->resetGraph();
+}
+
+/** Saves the Bandwidth Graph settings and adjusts the graph if necessary. */
+void
+BandwidthGraph::saveChanges()
+{
+ /* Hide the settings frame and reset toggle button */
+ showSettingsFrame(false);
+
+ /* Save the opacity and graph style */
+ saveSetting(SETTING_OPACITY, ui.sldrOpacity->value());
+ saveSetting(SETTING_STYLE, ui.cmbGraphStyle->currentIndex());
+
+ /* Save the Always On Top setting */
+ saveSetting(SETTING_ALWAYS_ON_TOP, ui.chkAlwaysOnTop->isChecked());
+ if (ui.chkAlwaysOnTop->isChecked()) {
+ setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+ } else {
+ setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
+ }
+ setOpacity(ui.sldrOpacity->value());
+
+ /* Save the line filter values */
+ uint filter = 0;
+ ADD_TO_FILTER(filter, BWGRAPH_LINE_RECV, ui.chkReceiveRate->isChecked());
+ ADD_TO_FILTER(filter, BWGRAPH_LINE_SEND, ui.chkSendRate->isChecked());
+ saveSetting(SETTING_FILTER, filter);
+
+
+ /* Update the graph frame settings */
+ ui.frmGraph->setShowCounters(ui.chkReceiveRate->isChecked(),
+ ui.chkSendRate->isChecked());
+ ui.frmGraph->setGraphStyle((GraphFrame::GraphStyle)ui.cmbGraphStyle->currentIndex());
+
+ /* A change in window flags causes the window to disappear, so make sure
+ * it's still visible. */
+ showNormal();
+}
+
+/** Simply restores the previously saved settings. */
+void
+BandwidthGraph::cancelChanges()
+{
+ /* Hide the settings frame and reset toggle button */
+ showSettingsFrame(false);
+
+ /* Reload the settings */
+ loadSettings();
+}
+
+/** Toggles the Settings pane on and off, changes toggle button text. */
+void
+BandwidthGraph::showSettingsFrame(bool show)
+{
+ static QSize minSize = minimumSize();
+
+ QSize newSize = size();
+ if (show) {
+ /* Extend the bottom of the bandwidth graph and show the settings */
+ ui.frmSettings->setVisible(true);
+ ui.btnToggleSettings->setChecked(true);
+ ui.btnToggleSettings->setText(tr("Hide Settings"));
+
+ /* 6 = vertical spacing between the settings frame and graph frame */
+ newSize.setHeight(newSize.height() + ui.frmSettings->height() + 6);
+ } else {
+ /* Shrink the height of the bandwidth graph and hide the settings */
+ ui.frmSettings->setVisible(false);
+ ui.btnToggleSettings->setChecked(false);
+ ui.btnToggleSettings->setText(tr("Show Settings"));
+
+ /* 6 = vertical spacing between the settings frame and graph frame */
+ newSize.setHeight(newSize.height() - ui.frmSettings->height() - 6);
+ setMinimumSize(minSize);
+ }
+ resize(newSize);
+}
+
+/** Sets the opacity of the Bandwidth Graph window. */
+void
+BandwidthGraph::setOpacity(int value)
+{
+ qreal newValue = value / 100.0;
+
+ /* Opacity only supported by Mac and Win32 */
+#if defined(Q_WS_MAC)
+ this->setWindowOpacity(newValue);
+ ui.lblPercentOpacity->setText(QString::number(value));
+#elif defined(Q_WS_WIN)
+ if (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based
+ && QSysInfo::WindowsVersion >= QSysInfo::WV_2000) {
+ this->setWindowOpacity(newValue);
+ ui.lblPercentOpacity->setText(QString::number(value));
+ }
+#else
+ Q_UNUSED(newValue);
+#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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/bwgraph/BandwidthGraph.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/bwgraph/BandwidthGraph.h
new file mode 100644
index 0000000..369553b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/bwgraph/BandwidthGraph.h
@@ -0,0 +1,78 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 BandwidthGraph.h
+** \version $Id: BandwidthGraph.h 4054 2009-08-17 02:25:08Z edmanm $
+** \brief Displays a graph of Tor's bandwidth usage
+*/
+
+#ifndef _BWGRAPH_H
+#define _BWGRAPH_H
+
+#include "ui_BandwidthGraph.h"
+#include "VidaliaWindow.h"
+#include "VidaliaSettings.h"
+#include "TorControl.h"
+
+#include <QDateTime>
+#include <QEvent>
+
+/** Redraw graph every 1000ms **/
+#define REFRESH_RATE 1000
+
+
+class BandwidthGraph : public VidaliaWindow
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor */
+ BandwidthGraph(QWidget *parent = 0, Qt::WFlags flags = 0);
+
+public slots:
+ /** Overloaded QWidget.show */
+ void showWindow();
+
+protected:
+ /** Called when the user changes the UI translation. */
+ virtual void retranslateUi();
+
+private slots:
+ /** Adds new data to the graph */
+ void updateGraph(quint64 bytesRead, quint64 bytesWritten);
+ /** Called when settings button is toggled */
+ void showSettingsFrame(bool show);
+ /** Called when the settings button is toggled */
+ void setOpacity(int value);
+ /** Called when the user saves settings */
+ void saveChanges();
+ /** Called when the user cancels changes settings */
+ void cancelChanges();
+ /** Called when the reset button is pressed */
+ void reset();
+
+private:
+ /** Create and bind actions to events **/
+ void createActions();
+ /** Loads the saved Bandwidth Graph settings */
+ void loadSettings();
+
+ /** A TorControl object used to talk to Tor. */
+ TorControl* _torControl;
+ /** A VidaliaSettings object that handles getting/saving settings */
+ VidaliaSettings* _settings;
+
+ /** Qt Designer generated object */
+ Ui::BandwidthGraph ui;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/bwgraph/BandwidthGraph.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/bwgraph/BandwidthGraph.ui
new file mode 100644
index 0000000..173168c
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/bwgraph/BandwidthGraph.ui
@@ -0,0 +1,485 @@
+<ui version="4.0" >
+ <class>BandwidthGraph</class>
+ <widget class="QMainWindow" name="BandwidthGraph" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>283</width>
+ <height>138</height>
+ </rect>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="windowTitle" >
+ <string>Tor Bandwidth Usage</string>
+ </property>
+ <property name="windowIcon" >
+ <iconset resource="../res/vidalia_common.qrc" >:/images/32x32/utilities-system-monitor.png</iconset>
+ </property>
+ <widget class="QWidget" name="centralwidget" >
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="1" column="0" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="btnToggleSettings" >
+ <property name="text" >
+ <string>Show Settings</string>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>21</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnReset" >
+ <property name="text" >
+ <string>Reset</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="0" >
+ <widget class="GraphFrame" name="frmGraph" >
+ <property name="minimumSize" >
+ <size>
+ <width>120</width>
+ <height>80</height>
+ </size>
+ </property>
+ <property name="font" >
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="frameShape" >
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="frameShadow" >
+ <enum>QFrame::Plain</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QFrame" name="frmSettings" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>0</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>355</width>
+ <height>85</height>
+ </size>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>355</width>
+ <height>82</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="frameShape" >
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow" >
+ <enum>QFrame::Raised</enum>
+ </property>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>3</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QCheckBox" name="chkReceiveRate" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip" >
+ <string/>
+ </property>
+ <property name="layoutDirection" >
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="text" >
+ <string>Receive Rate</string>
+ </property>
+ <property name="checked" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkSendRate" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip" >
+ <string/>
+ </property>
+ <property name="layoutDirection" >
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="text" >
+ <string>Send Rate</string>
+ </property>
+ <property name="checked" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkAlwaysOnTop" >
+ <property name="layoutDirection" >
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="text" >
+ <string>Always on Top</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>21</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>1</number>
+ </property>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="lblGraphStyle" >
+ <property name="text" >
+ <string>Style</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="cmbGraphStyle" >
+ <item>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="icon" >
+ <iconset resource="../res/vidalia_common.qrc" >:/images/16x16/graph-line.png</iconset>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="icon" >
+ <iconset resource="../res/vidalia_common.qrc" >:/images/16x16/graph-area.png</iconset>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QFrame" name="frmOpacity" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="frameShape" >
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow" >
+ <enum>QFrame::Plain</enum>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>3</number>
+ </property>
+ <item>
+ <widget class="QSlider" name="sldrOpacity" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip" >
+ <string>Changes the transparency of the Bandwidth Graph</string>
+ </property>
+ <property name="minimum" >
+ <number>30</number>
+ </property>
+ <property name="maximum" >
+ <number>100</number>
+ </property>
+ <property name="value" >
+ <number>100</number>
+ </property>
+ <property name="sliderPosition" >
+ <number>100</number>
+ </property>
+ <property name="tracking" >
+ <bool>false</bool>
+ </property>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="invertedAppearance" >
+ <bool>false</bool>
+ </property>
+ <property name="tickPosition" >
+ <enum>QSlider::NoTicks</enum>
+ </property>
+ <property name="tickInterval" >
+ <number>10</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>0</number>
+ </property>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>21</width>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="lblPercentOpacity" >
+ <property name="minimumSize" >
+ <size>
+ <width>25</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="font" >
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="layoutDirection" >
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="text" >
+ <string>100</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label" >
+ <property name="font" >
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text" >
+ <string>% Opaque</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>21</width>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>21</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>21</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>1</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="btnSaveSettings" >
+ <property name="text" >
+ <string>Save</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnCancelSettings" >
+ <property name="text" >
+ <string>Cancel</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QStatusBar" name="statusbar" />
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>GraphFrame</class>
+ <extends>QFrame</extends>
+ <header>bwgraph/GraphFrame.h</header>
+ </customwidget>
+ </customwidgets>
+ <resources>
+ <include location="../res/vidalia_common.qrc" />
+ </resources>
+ <tabstops>
+ <tabstop>btnToggleSettings</tabstop>
+ <tabstop>btnReset</tabstop>
+ <tabstop>chkReceiveRate</tabstop>
+ <tabstop>chkSendRate</tabstop>
+ <tabstop>chkAlwaysOnTop</tabstop>
+ <tabstop>cmbGraphStyle</tabstop>
+ <tabstop>sldrOpacity</tabstop>
+ <tabstop>btnSaveSettings</tabstop>
+ <tabstop>btnCancelSettings</tabstop>
+ </tabstops>
+ <connections/>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/bwgraph/GraphFrame.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/bwgraph/GraphFrame.cpp
new file mode 100644
index 0000000..cc9fe15
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/bwgraph/GraphFrame.cpp
@@ -0,0 +1,321 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 GraphFrame.cpp
+** \version $Id: GraphFrame.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Graphs a series of send and receive data points
+*/
+
+#include "GraphFrame.h"
+
+#include <QtGlobal>
+
+
+/** Default contructor */
+GraphFrame::GraphFrame(QWidget *parent)
+: QFrame(parent)
+{
+ /* Create Graph Frame related objects */
+ _recvData = new QList<qreal>();
+ _sendData = new QList<qreal>();
+ _painter = new QPainter();
+ _graphStyle = SolidLine;
+
+ /* Initialize graph values */
+ _recvData->prepend(0);
+ _sendData->prepend(0);
+ _maxPoints = getNumPoints();
+ _showRecv = true;
+ _showSend = true;
+ _maxValue = MIN_SCALE;
+ _scaleWidth = 0;
+}
+
+/** Default destructor */
+GraphFrame::~GraphFrame()
+{
+ delete _painter;
+ delete _recvData;
+ delete _sendData;
+}
+
+/** Gets the width of the desktop, which is the maximum number of points
+ * we can plot in the graph. */
+int
+GraphFrame::getNumPoints()
+{
+ QDesktopWidget *desktop = QApplication::desktop();
+ int width = desktop->width();
+ return width;
+}
+
+/** Adds new data points to the graph. */
+void
+GraphFrame::addPoints(qreal recv, qreal send)
+{
+ /* If maximum number of points plotted, remove oldest */
+ if (_sendData->size() == _maxPoints) {
+ _sendData->removeLast();
+ _recvData->removeLast();
+ }
+
+ /* Add the points to their respective lists */
+ _sendData->prepend(send);
+ _recvData->prepend(recv);
+
+ /* Add to the total counters */
+ _totalSend += send;
+ _totalRecv += recv;
+
+ /* Check for a new maximum value */
+ if (send > _maxValue) _maxValue = send;
+ if (recv > _maxValue) _maxValue = recv;
+
+ this->update();
+}
+
+/** Clears the graph. */
+void
+GraphFrame::resetGraph()
+{
+ _recvData->clear();
+ _sendData->clear();
+ _recvData->prepend(0);
+ _sendData->prepend(0);
+ _maxValue = MIN_SCALE;
+ _totalSend = 0;
+ _totalRecv = 0;
+ this->update();
+}
+
+/** Toggles display of respective graph lines and counters. */
+void
+GraphFrame::setShowCounters(bool showRecv, bool showSend)
+{
+ _showRecv = showRecv;
+ _showSend = showSend;
+ this->update();
+}
+
+/** Overloads default QWidget::paintEvent. Draws the actual
+ * bandwidth graph. */
+void
+GraphFrame::paintEvent(QPaintEvent *event)
+{
+ Q_UNUSED(event);
+
+ /* Set current graph dimensions */
+ _rec = this->frameRect();
+
+ /* Start the painter */
+ _painter->begin(this);
+
+ /* We want antialiased lines and text */
+ _painter->setRenderHint(QPainter::Antialiasing);
+ _painter->setRenderHint(QPainter::TextAntialiasing);
+
+ /* Fill in the background */
+ _painter->fillRect(_rec, QBrush(BACK_COLOR));
+ _painter->drawRect(_rec);
+
+ /* Paint the scale */
+ paintScale();
+ /* Plot the send/receive data */
+ paintData();
+ /* Paint the send/recv totals */
+ paintTotals();
+
+ /* Stop the painter */
+ _painter->end();
+}
+
+/** Paints an integral and an outline of that integral for each data set (send
+ * and/or receive) that is to be displayed. The integrals will be drawn first,
+ * followed by the outlines, since we want the area of overlapping integrals
+ * to blend, but not the outlines of those integrals. */
+void
+GraphFrame::paintData()
+{
+ QVector<QPointF> recvPoints, sendPoints;
+
+ /* Convert the bandwidth data points to graph points */
+ recvPoints = pointsFromData(_recvData);
+ sendPoints = pointsFromData(_sendData);
+
+ if (_graphStyle == AreaGraph) {
+ /* Plot the bandwidth data as area graphs */
+ if (_showRecv)
+ paintIntegral(recvPoints, RECV_COLOR, 0.6);
+ if (_showSend)
+ paintIntegral(sendPoints, SEND_COLOR, 0.4);
+ }
+
+ /* Plot the bandwidth as solid lines. If the graph style is currently an
+ * area graph, we end up outlining the integrals. */
+ if (_showRecv)
+ paintLine(recvPoints, RECV_COLOR);
+ if (_showSend)
+ paintLine(sendPoints, SEND_COLOR);
+}
+
+/** Returns a list of points on the bandwidth graph based on the supplied set
+ * of send or receive values. */
+QVector<QPointF>
+GraphFrame::pointsFromData(QList<qreal>* list)
+{
+ QVector<QPointF> points;
+ int x = _rec.width();
+ int y = _rec.height();
+ qreal scale = (y - (y/10)) / _maxValue;
+ qreal currValue;
+
+ /* Translate all data points to points on the graph frame */
+ points << QPointF(x, y);
+ for (int i = 0; i < list->size(); i++) {
+ currValue = y - (list->at(i) * scale);
+ if (x - SCROLL_STEP < _scaleWidth) {
+ points << QPointF(_scaleWidth, currValue);
+ break;
+ }
+ points << QPointF(x, currValue);
+ x -= SCROLL_STEP;
+ }
+ points << QPointF(_scaleWidth, y);
+ return points;
+}
+
+/** Plots an integral using the data points in <b>points</b>. The area will be
+ * filled in using <b>color</b> and an alpha-blending level of <b>alpha</b>
+ * (default is opaque). */
+void
+GraphFrame::paintIntegral(QVector<QPointF> points, QColor color, qreal alpha)
+{
+ /* Save the current brush, plot the integral, and restore the old brush */
+ QBrush oldBrush = _painter->brush();
+ color.setAlphaF(alpha);
+ _painter->setBrush(QBrush(color));
+ _painter->drawPolygon(points.data(), points.size());
+ _painter->setBrush(oldBrush);
+}
+
+/** Iterates the input list and draws a line on the graph in the appropriate
+ * color. */
+void
+GraphFrame::paintLine(QVector<QPointF> points, QColor color, Qt::PenStyle lineStyle)
+{
+ /* Save the current brush, plot the line, and restore the old brush */
+ QPen oldPen = _painter->pen();
+ _painter->setPen(QPen(color, lineStyle));
+ _painter->drawPolyline(points.data(), points.size());
+ _painter->setPen(oldPen);
+}
+
+/** Paints selected total indicators on the graph. */
+void
+GraphFrame::paintTotals()
+{
+ int x = _scaleWidth + FONT_SIZE, y = 0;
+ int rowHeight = FONT_SIZE;
+
+#if !defined(Q_WS_MAC)
+ /* On Mac, we don't need vertical spacing between the text rows. */
+ rowHeight += 5;
+#endif
+
+ /* If total received is selected */
+ if (_showRecv) {
+ y = rowHeight;
+ _painter->setPen(RECV_COLOR);
+ _painter->drawText(x, y,
+ tr("Recv: ") + totalToStr(_totalRecv) +
+ " ("+tr("%1 KB/s").arg(_recvData->first(), 0, 'f', 2)+")");
+ }
+
+ /* If total sent is selected */
+ if (_showSend) {
+ y += rowHeight;
+ _painter->setPen(SEND_COLOR);
+ _painter->drawText(x, y,
+ tr("Sent: ") + totalToStr(_totalSend) +
+ " ("+tr("%1 KB/s").arg(_sendData->first(), 0, 'f', 2)+")");
+ }
+}
+
+/** Returns a formatted string with the correct size suffix. */
+QString
+GraphFrame::totalToStr(qreal total)
+{
+ /* Determine the correct size suffix */
+ if (total < 1024) {
+ /* Use KB suffix */
+ return tr("%1 KB").arg(total, 0, 'f', 2);
+ } else if (total < 1048576) {
+ /* Use MB suffix */
+ return tr("%1 MB").arg(total/1024.0, 0, 'f', 2);
+ } else {
+ /* Use GB suffix */
+ return tr("%1 GB").arg(total/1048576.0, 0, 'f', 2);
+ }
+}
+
+/** Returns the width in pixels of <b>label</b> using the current painter's
+ * font. */
+int
+GraphFrame::labelWidth(const QString &label)
+{
+ int width = 0;
+ QFontMetrics fm = fontMetrics();
+
+ for (int i = 0; i < label.length(); i++)
+ width += fm.charWidth(label, i);
+ return width;
+}
+
+/** Paints the scale on the graph. */
+void
+GraphFrame::paintScale()
+{
+ QString label[4];
+ int width[4];
+ int top = _rec.y();
+ int bottom = _rec.height();
+ int scaleWidth = 0;
+ qreal pos;
+ qreal markStep = _maxValue * .25;
+ qreal paintStep = (bottom - (bottom/8)) / 4;
+
+ /* Compute each of the y-axis labels */
+ for (int i = 0; i < 4; i++) {
+ pos = bottom - ((i+1) * paintStep);
+ label[i] = tr("%1 KB/s").arg(markStep*(i+1), 0, 'f', 2);
+ width[i] = labelWidth(label[i]);
+ scaleWidth = qMax(scaleWidth, 2+width[i]);
+ }
+
+ /* Include a 5px margin between the y-axis and its labels */
+ _scaleWidth = scaleWidth + 5;
+
+ /* Draw the y-axis labels and horizontal marks in their correctly scaled
+ * locations */
+ for (int i = 0; i < 4; i++) {
+ pos = bottom - ((i+1) * paintStep);
+ _painter->setPen(SCALE_COLOR);
+ _painter->drawText(QPointF(_scaleWidth-width[i]-5, pos), label[i]);
+
+ _painter->setPen(GRID_COLOR);
+ _painter->drawLine(QPointF(_scaleWidth, pos),
+ QPointF(_rec.width(), pos));
+ }
+
+ /* Draw the y-axis */
+ _painter->drawLine(_scaleWidth, top, _scaleWidth, bottom);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/bwgraph/GraphFrame.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/bwgraph/GraphFrame.h
new file mode 100644
index 0000000..a5e5c79
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/bwgraph/GraphFrame.h
@@ -0,0 +1,118 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 GraphFrame.h
+** \version $Id: GraphFrame.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Graphs a series of send and receive data points
+*/
+
+#ifndef _GRAPHFRAME_H
+#define _GRAPHFRAME_H
+
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QFrame>
+#include <QPainter>
+#include <QPen>
+#include <QList>
+
+#define HOR_SPC 2 /** Space between data points */
+#define MIN_SCALE 10 /** 10 kB/s is the minimum scale */
+#define SCROLL_STEP 4 /** Horizontal change on graph update */
+
+#define BACK_COLOR Qt::black
+#define SCALE_COLOR Qt::green
+#define GRID_COLOR Qt::darkGreen
+#define RECV_COLOR Qt::cyan
+#define SEND_COLOR Qt::yellow
+
+#define FONT_SIZE 11
+
+
+class GraphFrame : public QFrame
+{
+ Q_OBJECT
+
+public:
+ /** Bandwidth graph style. */
+ enum GraphStyle {
+ SolidLine = 0, /**< Plot bandwidth as solid lines. */
+ AreaGraph /**< Plot bandwidth as alpha blended area graphs. */
+ };
+
+ /** Default Constructor */
+ GraphFrame(QWidget *parent = 0);
+ /** Default Destructor */
+ ~GraphFrame();
+
+ /** Add data points. */
+ void addPoints(qreal recv, qreal send);
+ /** Clears the graph. */
+ void resetGraph();
+ /** Toggles display of data counters. */
+ void setShowCounters(bool showRecv, bool showSend);
+ /** Sets the graph style used to display bandwidth data. */
+ void setGraphStyle(GraphStyle style) { _graphStyle = style; }
+
+protected:
+ /** Overloaded QWidget::paintEvent() */
+ void paintEvent(QPaintEvent *event);
+
+private:
+ /** Returns the width in pixels of <b>label</b> using the current painter's
+ * font. */
+ int labelWidth(const QString &label);
+ /** Gets the width of the desktop, the max # of points. */
+ int getNumPoints();
+ /** Paints an integral and an outline of that integral for each data set
+ * (send and/or receive) that is to be displayed. */
+ void paintData();
+ /** Paints the send/receive totals. */
+ void paintTotals();
+ /** Paints the scale in the graph. */
+ void paintScale();
+ /** Returns a formatted string representation of total. */
+ QString totalToStr(qreal total);
+ /** Returns a list of points on the bandwidth graph based on the supplied set
+ * of send or receive values. */
+ QVector<QPointF> pointsFromData(QList<qreal>* list);
+ /** Paints a line with the data in <b>points</b>. */
+ void paintLine(QVector<QPointF> points, QColor color,
+ Qt::PenStyle lineStyle = Qt::SolidLine);
+ /** Paints an integral using the supplied data. */
+ void paintIntegral(QVector<QPointF> points, QColor color, qreal alpha = 1.0);
+
+ /** Style with which the bandwidth data will be graphed. */
+ GraphStyle _graphStyle;
+ /** A QPainter object that handles drawing the various graph elements. */
+ QPainter* _painter;
+ /** Holds the received data points. */
+ QList<qreal> *_recvData;
+ /** Holds the sent data points. */
+ QList<qreal> *_sendData;
+ /** The current dimensions of the graph. */
+ QRect _rec;
+ /** The maximum data value plotted. */
+ qreal _maxValue;
+ /** The maximum number of points to store. */
+ int _maxPoints;
+ /** The total data sent/recv. */
+ qreal _totalSend;
+ qreal _totalRecv;
+ /** Show the respective lines and counters. */
+ bool _showRecv;
+ bool _showSend;
+ /** Width (in pixels) of the scale marker area on the left side of the
+ * graph. */
+ int _scaleWidth;
+};
+
+#endif
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AbstractTorSettings.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AbstractTorSettings.cpp
new file mode 100644
index 0000000..37cac39
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AbstractTorSettings.cpp
@@ -0,0 +1,131 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 AbstractTorSettings.cpp
+** \version $Id: AbstractTorSettings.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Manages settings that need to be SETCONF'ed to Tor
+*/
+
+#include "AbstractTorSettings.h"
+
+/** Setting that gets set to <i>true</i> if any settings in the current
+ * settings group have been changed since the last time apply() was called. */
+#define SETTING_CHANGED "Changed"
+
+
+/** Constructor. All settings will be under the heading <b>group</b> and
+ * <b>torControl</b> will be used to <i>getconf</i> values from Tor. */
+AbstractTorSettings::AbstractTorSettings(const QString &group,
+ TorControl *torControl)
+: VSettings(group)
+{
+ _torControl = torControl;
+ _backupSettings = allSettings();
+
+ setDefault(SETTING_CHANGED, false);
+}
+
+/** Reverts all settings to their values at the last time apply() was
+ * called. */
+void
+AbstractTorSettings::revert()
+{
+ remove("");
+ foreach (QString key, _backupSettings.keys()) {
+ setValue(key, _backupSettings.value(key));
+ }
+}
+
+/** Returns true if any settings have changed since the last time apply()
+ * was called. */
+bool
+AbstractTorSettings::changedSinceLastApply() const
+{
+ return localValue(SETTING_CHANGED).toBool();
+}
+
+/** Sets a value indicating that the server settings have changed since
+ * apply() was last called. */
+void
+AbstractTorSettings::setChanged(bool changed)
+{
+ VSettings::setValue(SETTING_CHANGED, changed);
+ if (!changed)
+ _backupSettings = allSettings();
+}
+
+/** 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. */
+bool
+AbstractTorSettings::isEmptyValue(const QVariant &value) const
+{
+ switch (value.type()) {
+ case QVariant::String:
+ return (value.toString().isEmpty());
+ case QVariant::StringList:
+ return (value.toStringList().isEmpty());
+ case QVariant::UInt:
+ case QVariant::Int:
+ return (value.toUInt() == 0);
+ case QVariant::Invalid:
+ return true;
+ default: break;
+ }
+ return false;
+}
+
+/** Returns the value associated with <b>key</b> saved in the local
+ * configuration file. */
+QVariant
+AbstractTorSettings::localValue(const QString &key) const
+{
+ return VSettings::value(key);
+}
+
+/** Returns the value associated with <b>key</b> by querying TOr via
+ * <i>getconf key</i>. */
+QVariant
+AbstractTorSettings::torValue(const QString &key) const
+{
+ QVariant defaultVal;
+ QVariant confValue;
+
+ defaultVal = defaultValue(key);
+ if (_torControl) {
+ confValue = _torControl->getConf(key);
+ confValue.convert(defaultVal.type());
+ }
+ return (isEmptyValue(confValue) ? localValue(key) : confValue);
+}
+
+/** If Vidalia is connected to Tor, this returns the value associated with
+ * <b>key</b> by calling torValue(). Otherwise, this calls localValue() to get
+ * the locally saved value associated with <b>key</b>. */
+QVariant
+AbstractTorSettings::value(const QString &key) const
+{
+ if (_torControl && _torControl->isConnected() && !changedSinceLastApply())
+ return torValue(key);
+ return localValue(key);
+}
+
+/** Saves the value <b>val</b> for the setting <b>key</b> to the local
+ * settings file. */
+void
+AbstractTorSettings::setValue(const QString &key, const QVariant &value)
+{
+ if (value != localValue(key)) {
+ setChanged(true);
+ VSettings::setValue(key, value);
+ }
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AbstractTorSettings.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AbstractTorSettings.h
new file mode 100644
index 0000000..fc67091
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AbstractTorSettings.h
@@ -0,0 +1,81 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 AbstractTorSettings.h
+** \version $Id: AbstractTorSettings.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Manages settings that need to be SETCONF'ed to Tor
+*/
+
+#ifndef _ABSTRACTTORSETTINGS_H
+#define _ABSTRACTTORSETTINGS_H
+
+#include "VSettings.h"
+#include "TorControl.h"
+
+
+class AbstractTorSettings : public VSettings
+{
+ Q_OBJECT
+
+public:
+ /** Constructor. All settings will be under the heading <b>group</b> and
+ * <b>torControl</b> will be used to <i>getconf</i> values from Tor. */
+ AbstractTorSettings(const QString &group, TorControl *torControl = 0);
+
+ /** Sets a value indicating that the server settings have changed since
+ * apply() was last called. */
+ void setChanged(bool changed);
+ /** Returns true if any settings have changed since the last time apply()
+ * was called. */
+ virtual bool changedSinceLastApply() const;
+ /** Reverts all settings to their values at the last time apply() was
+ * called. */
+ virtual void revert();
+ /** Subclasses must implement this to <i>setconf</i> values to apply them
+ * to a running Tor instance. */
+ virtual bool apply(QString *errmsg) = 0;
+
+protected:
+ /** If Vidalia is connected to Tor, this returns the value associated with
+ * <b>key</b> by calling torValue(). Otherwise, this calls localValue()
+ * to get the locally saved value associated with <b>key</b>. */
+ virtual QVariant value(const QString &key) const;
+ /** Returns the value associated with <b>key</b> saved in the local
+ * configuration file. */
+ virtual QVariant localValue(const QString &key) const;
+ /** Returns the value associated with <b>key</b> by querying TOr via
+ * <i>getconf key</i>. */
+ virtual QVariant torValue(const QString &key) const;
+ /** Saves the value <b>val</b> for the setting <b>key</b> to the local
+ * settings file. */
+ virtual void setValue(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. */
+ bool isEmptyValue(const QVariant &value) const;
+
+protected:
+ /** Returns the TorControl object used for reading settings from or writing
+ * settings to Tor, if one was specified. Returns 0 if no TorControl object
+ * was given. */
+ TorControl* torControl() const { return _torControl; };
+
+private:
+ /** TorControl object used for reading settings from or applying settings to
+ * Tor. */
+ TorControl* _torControl;
+ /** Collection of settings values at the last time apply() was called. */
+ QMap<QString, QVariant> _backupSettings;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AdvancedPage.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AdvancedPage.cpp
new file mode 100644
index 0000000..4c15464
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AdvancedPage.cpp
@@ -0,0 +1,308 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 AdvancedPage.cpp
+** \version $Id: AdvancedPage.cpp 4023 2009-08-10 15:20:25Z edmanm $
+** \brief Advanced Tor and Vidalia configuration options
+*/
+
+#include "AdvancedPage.h"
+#include "Vidalia.h"
+#include "VMessageBox.h"
+#include "IpValidator.h"
+
+#include "file.h"
+
+#if defined(Q_WS_WIN)
+#include "TorService.h"
+#endif
+
+#include <QFile>
+#include <QFileInfo>
+#include <QHostAddress>
+
+
+/** Constructor */
+AdvancedPage::AdvancedPage(QWidget *parent)
+ : ConfigPage(parent, "Advanced")
+{
+ /* Invoke the Qt Designer generated object setup routine */
+ ui.setupUi(this);
+
+ /* Create TorSettings object */
+ _settings = new TorSettings(Vidalia::torControl());
+
+ /* Set validators for the control port and IP address fields */
+ ui.lineControlAddress->setValidator(new IpValidator(this));
+ ui.lineControlPort->setValidator(new QIntValidator(1, 65535, this));
+
+ /* Bind event to actions */
+ connect(ui.btnBrowseTorConfig, SIGNAL(clicked()), this, SLOT(browseTorConfig()));
+ connect(ui.btnBrowseTorDataDirectory, SIGNAL(clicked()),
+ this, SLOT(browseTorDataDirectory()));
+ connect(ui.cmbAuthMethod, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(authMethodChanged(int)));
+ connect(ui.chkRandomPassword, SIGNAL(toggled(bool)),
+ ui.linePassword, SLOT(setDisabled(bool)));
+
+ /* Hide platform specific features */
+#if defined(Q_WS_WIN)
+#if 0
+ ui.grpService->setVisible(TorService::isSupported());
+#endif
+#endif
+}
+
+/** Destructor */
+AdvancedPage::~AdvancedPage()
+{
+ delete _settings;
+}
+
+/** Called when the user changes the UI translation. */
+void
+AdvancedPage::retranslateUi()
+{
+ ui.retranslateUi(this);
+}
+
+/** Applies the network configuration settings to Tor. Returns true if the
+ * settings were applied successfully. Otherwise, <b>errmsg</b> is set
+ * and false is returned. */
+bool
+AdvancedPage::apply(QString &errmsg)
+{
+ return _settings->apply(&errmsg);
+}
+
+/** Reverts the Tor configuration settings to their values at the last
+ * time they were successfully applied to Tor. */
+bool
+AdvancedPage::changedSinceLastApply()
+{
+ return _settings->changedSinceLastApply();
+}
+
+/** Returns true if the user has changed their advanced Tor settings since
+ * the last time they were applied to Tor. */
+void
+AdvancedPage::revert()
+{
+ return _settings->revert();
+}
+
+/** Saves all settings for this page. */
+bool
+AdvancedPage::save(QString &errmsg)
+{
+ /* Validate the control listener address */
+ QHostAddress controlAddress(ui.lineControlAddress->text());
+ if (controlAddress.isNull()) {
+ errmsg = tr("'%1' is not a valid IP address.")
+ .arg(ui.lineControlAddress->text());
+ return false;
+ }
+
+ /* Validate the selected authentication options */
+ TorSettings::AuthenticationMethod authMethod =
+ indexToAuthMethod(ui.cmbAuthMethod->currentIndex());
+ if (authMethod == TorSettings::PasswordAuth
+ && ui.linePassword->text().isEmpty()
+ && !ui.chkRandomPassword->isChecked()) {
+ errmsg = tr("You selected 'Password' authentication, but did not "
+ "specify a password.");
+ return false;
+ }
+
+ /* Only remember the torrc and datadir values if Vidalia started Tor, or
+ * if the user changed the displayed values. */
+ if (!Vidalia::torControl()->isVidaliaRunningTor()) {
+ QString torrc = ui.lineTorConfig->text();
+ if (torrc != _settings->getTorrc())
+ _settings->setTorrc(torrc);
+
+ QString dataDir = ui.lineTorDataDirectory->text();
+ if (dataDir != _settings->getDataDirectory())
+ _settings->setDataDirectory(dataDir);
+ } else {
+ _settings->setTorrc(ui.lineTorConfig->text());
+ _settings->setDataDirectory(ui.lineTorDataDirectory->text());
+ }
+
+ _settings->setControlAddress(controlAddress);
+ _settings->setControlPort(ui.lineControlPort->text().toUShort());
+
+ _settings->setAuthenticationMethod(authMethod);
+ _settings->setUseRandomPassword(ui.chkRandomPassword->isChecked());
+ if (authMethod == TorSettings::PasswordAuth
+ && !ui.chkRandomPassword->isChecked())
+ _settings->setControlPassword(ui.linePassword->text());
+
+#if 0
+#if defined(Q_WS_WIN)
+ /* Install or uninstall the Tor service as necessary */
+ setupService(ui.chkUseService->isChecked());
+#endif
+#endif
+
+ return true;
+}
+
+/** Loads previously saved settings. */
+void
+AdvancedPage::load()
+{
+ ui.lineControlAddress->setText(_settings->getControlAddress().toString());
+ ui.lineControlPort->setText(QString::number(_settings->getControlPort()));
+ ui.lineTorConfig->setText(_settings->getTorrc());
+ ui.lineTorDataDirectory->setText(_settings->getDataDirectory());
+
+ ui.cmbAuthMethod->setCurrentIndex(
+ authMethodToIndex(_settings->getAuthenticationMethod()));
+ ui.chkRandomPassword->setChecked(_settings->useRandomPassword());
+ if (!ui.chkRandomPassword->isChecked())
+ ui.linePassword->setText(_settings->getControlPassword());
+
+#if 0
+#if defined(Q_WS_WIN)
+ TorService s;
+ ui.chkUseService->setChecked(s.isInstalled());
+#endif
+#endif
+}
+
+/** Called when the user selects a different authentication method from the
+ * combo box. */
+void
+AdvancedPage::authMethodChanged(int index)
+{
+ bool usePassword = (indexToAuthMethod(index) == TorSettings::PasswordAuth);
+ ui.linePassword->setEnabled(usePassword && !ui.chkRandomPassword->isChecked());
+ ui.chkRandomPassword->setEnabled(usePassword);
+}
+
+/** Returns the authentication method for the given <b>index</b>. */
+TorSettings::AuthenticationMethod
+AdvancedPage::indexToAuthMethod(int index)
+{
+ switch (index) {
+ case 0: return TorSettings::NullAuth;
+ case 1: return TorSettings::CookieAuth;
+ case 2: return TorSettings::PasswordAuth;
+ default: break;
+ }
+ return TorSettings::UnknownAuth;
+}
+
+/** Returns the index in the authentication methods combo box for the given
+ * authentication <b>method</b>. */
+int
+AdvancedPage::authMethodToIndex(TorSettings::AuthenticationMethod method)
+{
+ switch (method) {
+ case TorSettings::NullAuth: return 0;
+ case TorSettings::CookieAuth: return 1;
+ default: break;
+ }
+ return 2;
+}
+
+/** Open a QFileDialog to browse for Tor config file. */
+void
+AdvancedPage::browseTorConfig()
+{
+ /* Prompt the user to select a file or create a new one */
+ QString filename = QFileDialog::getOpenFileName(this,
+ tr("Select Tor Configuration File"),
+ QFileInfo(ui.lineTorConfig->text()).filePath(),
+ tr("Tor Configuration File (torrc);;All Files (*)"));
+
+ /* Make sure a filename was selected */
+ if (filename.isEmpty()) {
+ return;
+ }
+
+ /* Check if the file exists */
+ QFile torrcFile(filename);
+ if (!QFileInfo(filename).exists()) {
+ /* The given file does not exist. Should we create it? */
+ int response = VMessageBox::question(this,
+ tr("File Not Found"),
+ tr("%1 does not exist. Would you like to create it?")
+ .arg(filename),
+ VMessageBox::Yes, VMessageBox::No);
+
+ if (response == VMessageBox::No) {
+ /* Don't create it. Just bail. */
+ return;
+ }
+ /* Attempt to create the specified file */
+ QString errmsg;
+ if (!touch_file(filename, false, &errmsg)) {
+ VMessageBox::warning(this,
+ tr("Failed to Create File"),
+ tr("Unable to create %1 [%2]").arg(filename)
+ .arg(errmsg),
+ VMessageBox::Ok);
+ return;
+ }
+ }
+ ui.lineTorConfig->setText(filename);
+}
+
+/** Opens a QFileDialog for the user to browse to or create a directory for
+ * Tor's DataDirectory. */
+void
+AdvancedPage::browseTorDataDirectory()
+{
+ QString dataDir = QFileDialog::getExistingDirectory(this,
+ tr("Select a Directory to Use for Tor Data"),
+ ui.lineTorDataDirectory->text());
+
+ if (!dataDir.isEmpty())
+ ui.lineTorDataDirectory->setText(dataDir);
+}
+
+#if 0
+#if defined(Q_WS_WIN)
+/** Installs or removes the Tor service as necessary. */
+void
+AdvancedPage::setupService(bool useService)
+{
+ TorService service;
+ bool isInstalled = service.isInstalled();
+
+ if (!useService && isInstalled) {
+ /* Uninstall if we don't want to use it anymore */
+ Vidalia::torControl()->stop();
+
+ if (!service.remove()) {
+ VMessageBox::critical(this,
+ tr("Unable to remove Tor Service"),
+ tr("Vidalia was unable to remove the Tor service.\n\n"
+ "You may need to remove it manually."),
+ VMessageBox::Ok, VMessageBox::Cancel);
+ }
+ } else if (useService && !isInstalled) {
+ /* Install if we want to start using a service */
+ if (!service.install(_settings->getExecutable(),
+ _settings->getTorrc(),
+ _settings->getControlPort())) {
+ VMessageBox::critical(this,
+ tr("Unable to install Tor Service"),
+ tr("Vidalia was unable to install the Tor service."),
+ VMessageBox::Ok, VMessageBox::Cancel);
+ }
+ }
+}
+#endif
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AdvancedPage.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AdvancedPage.h
new file mode 100644
index 0000000..66d01a8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AdvancedPage.h
@@ -0,0 +1,86 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 AdvancedPage.h
+** \version $Id: AdvancedPage.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Advanced Tor and Vidalia configuration options
+*/
+
+#ifndef _ADVANCEDPAGE_H
+#define _ADVANCEDPAGE_H
+
+#include "ui_AdvancedPage.h"
+#include "ConfigPage.h"
+#include "TorSettings.h"
+
+#include <QFileDialog>
+
+
+class AdvancedPage : public ConfigPage
+{
+ Q_OBJECT
+
+public:
+ /** Default Constructor */
+ AdvancedPage(QWidget *parent = 0);
+ /** Default Destructor */
+ ~AdvancedPage();
+ /** Saves the changes on this page */
+ bool save(QString &errmsg);
+ /** Loads the settings for this page */
+ void load();
+
+ /** Applies the network configuration settings to Tor. Returns true if the
+ * settings were applied successfully. Otherwise, <b>errmsg</b> is set
+ * and false is returned. */
+ bool apply(QString &errmsg);
+ /** Reverts the Tor configuration settings to their values at the last
+ * time they were successfully applied to Tor. */
+ void revert();
+ /** Returns true if the user has changed their advanced Tor settings since
+ * the last time they were applied to Tor. */
+ bool changedSinceLastApply();
+ /** Called when the user changes the UI translation. */
+ virtual void retranslateUi();
+
+private slots:
+ /** Called when the user selects a different authentication method from the
+ * combo box. */
+ void authMethodChanged(int index);
+ /** Called when the user clicks "Browse" to choose location of Tor config
+ * file */
+ void browseTorConfig();
+ /** Called when the user clicks "Browse" to choose the location of Tor's
+ * data directory. */
+ void browseTorDataDirectory();
+
+private:
+ /** Returns the authentication method for the given <b>index</b>. */
+ TorSettings::AuthenticationMethod indexToAuthMethod(int index);
+ /** Returns the index in the authentication methods combo box for the given
+ * authentication <b>method</b>. */
+ int authMethodToIndex(TorSettings::AuthenticationMethod method);
+
+#if 0
+#if defined(Q_WS_WIN)
+ /** Installs or removes the Tor service as necessary */
+ void setupService(bool useService);
+#endif
+#endif
+
+ /** A TorSettings object used to save/load settings */
+ TorSettings* _settings;
+ /** Qt Designer generated object */
+ Ui::AdvancedPage ui;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AdvancedPage.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AdvancedPage.ui
new file mode 100644
index 0000000..8cd6021
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AdvancedPage.ui
@@ -0,0 +1,353 @@
+<ui version="4.0" >
+ <class>AdvancedPage</class>
+ <widget class="QWidget" name="AdvancedPage" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>507</width>
+ <height>543</height>
+ </rect>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="grpControlPort" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="title" >
+ <string>Control Port</string>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>2</number>
+ </property>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="label_6" >
+ <property name="text" >
+ <string>Authentication:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QLabel" name="label_5" >
+ <property name="text" >
+ <string>Address:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" colspan="3" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>2</number>
+ </property>
+ <item>
+ <widget class="QComboBox" name="cmbAuthMethod" >
+ <property name="minimumSize" >
+ <size>
+ <width>120</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="sizeAdjustPolicy" >
+ <enum>QComboBox::AdjustToContents</enum>
+ </property>
+ <item>
+ <property name="text" >
+ <string>None</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Cookie</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Password</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="linePassword" >
+ <property name="echoMode" >
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkRandomPassword" >
+ <property name="text" >
+ <string>Randomly Generate</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="1" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLineEdit" name="lineControlAddress" >
+ <property name="maximumSize" >
+ <size>
+ <width>120</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="maxLength" >
+ <number>16</number>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label" >
+ <property name="text" >
+ <string>:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineControlPort" >
+ <property name="minimumSize" >
+ <size>
+ <width>75</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>75</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="maxLength" >
+ <number>5</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="2" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="grpTorConfigFile" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="title" >
+ <string>Tor Configuration File</string>
+ </property>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLineEdit" name="lineTorConfig" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="cursor" >
+ <cursor>4</cursor>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip" >
+ <string>Start the Tor software with the specified configuration file (torrc)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnBrowseTorConfig" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip" >
+ <string>Select path to your configuration file</string>
+ </property>
+ <property name="text" >
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="grpTorDataDirectory" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="title" >
+ <string>Data Directory</string>
+ </property>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLineEdit" name="lineTorDataDirectory" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="cursor" >
+ <cursor>4</cursor>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip" >
+ <string>Store data for the Tor software in the following directory</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnBrowseTorDataDirectory" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip" >
+ <string>Select the directory used to store data for the Tor software</string>
+ </property>
+ <property name="text" >
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>489</width>
+ <height>141</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <tabstops>
+ <tabstop>lineControlAddress</tabstop>
+ <tabstop>lineControlPort</tabstop>
+ <tabstop>cmbAuthMethod</tabstop>
+ <tabstop>linePassword</tabstop>
+ <tabstop>chkRandomPassword</tabstop>
+ <tabstop>lineTorConfig</tabstop>
+ <tabstop>btnBrowseTorConfig</tabstop>
+ <tabstop>lineTorDataDirectory</tabstop>
+ <tabstop>btnBrowseTorDataDirectory</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AppearancePage.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AppearancePage.cpp
new file mode 100644
index 0000000..9543522
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AppearancePage.cpp
@@ -0,0 +1,89 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 AppearancePage.cpp
+** \version $Id: AppearancePage.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays Vidalia language and style settings
+*/
+
+#include "AppearancePage.h"
+#include "Vidalia.h"
+#include "VMessageBox.h"
+
+
+/** Default Constructor */
+AppearancePage::AppearancePage(QWidget *parent)
+ : ConfigPage(parent, "Appearance")
+{
+ /* Invoke Designer-generated object setup routine */
+ ui.setupUi(this);
+
+ /* Create VidaliaSettings object */
+ _settings = new VidaliaSettings();
+
+ /* Populate combo boxes */
+ foreach (QString code, LanguageSupport::languageCodes()) {
+ ui.cmboLanguage->addItem(LanguageSupport::languageName(code),
+ code);
+ }
+ foreach (QString style, QStyleFactory::keys()) {
+ ui.cmboStyle->addItem(style, style.toLower());
+ }
+}
+
+/** Destructor */
+AppearancePage::~AppearancePage()
+{
+ delete _settings;
+}
+
+/** Called when the user changes the UI translation. */
+void
+AppearancePage::retranslateUi()
+{
+ ui.retranslateUi(this);
+}
+
+/** Saves the changes on this page */
+bool
+AppearancePage::save(QString &errmsg)
+{
+ QString prevLanguage = _settings->getLanguageCode();
+ QString languageCode =
+ LanguageSupport::languageCode(ui.cmboLanguage->currentText());
+
+ /* Set the new language */
+ if (prevLanguage != languageCode) {
+ if (! Vidalia::retranslateUi(languageCode)) {
+ errmsg = tr("Vidalia was unable to load the selected "
+ "language translation.");
+ return false;
+ }
+ _settings->setLanguageCode(languageCode);
+ }
+
+ /* Set the new style */
+ Vidalia::setStyle(ui.cmboStyle->currentText());
+ _settings->setInterfaceStyle(ui.cmboStyle->currentText());
+ return true;
+}
+
+/** Loads the settings for this page */
+void
+AppearancePage::load()
+{
+ int index = ui.cmboLanguage->findData(_settings->getLanguageCode());
+ ui.cmboLanguage->setCurrentIndex(index);
+
+ index = ui.cmboStyle->findData(Vidalia::style().toLower());
+ ui.cmboStyle->setCurrentIndex(index);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AppearancePage.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AppearancePage.h
new file mode 100644
index 0000000..1ba9711
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AppearancePage.h
@@ -0,0 +1,53 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 AppearancePage.h
+** \version $Id: AppearancePage.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays Vidalia language and style settings
+*/
+
+#ifndef _APPEARANCEPAGE_H
+#define _APPEARANCEPAGE_H
+
+#include "ui_AppearancePage.h"
+#include "VidaliaSettings.h"
+#include "LanguageSupport.h"
+#include "ConfigPage.h"
+
+#include <QStyleFactory>
+#include <QLineEdit>
+
+
+class AppearancePage : public ConfigPage
+{
+ Q_OBJECT
+
+public:
+ /** Default Constructor */
+ AppearancePage(QWidget *parent = 0);
+ /** Default Destructor */
+ ~AppearancePage();
+ /** Saves the changes on this page */
+ bool save(QString &errmsg);
+ /** Loads the settings for this page */
+ void load();
+ /** Called when the user changes the UI translation. */
+ virtual void retranslateUi();
+
+private:
+ /** A VidaliaSettings object used for saving/loading settings */
+ VidaliaSettings* _settings;
+
+ /** Qt Designer generated object */
+ Ui::AppearancePage ui;
+};
+
+#endif
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AppearancePage.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AppearancePage.ui
new file mode 100644
index 0000000..169bae0
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/AppearancePage.ui
@@ -0,0 +1,130 @@
+<ui version="4.0" >
+ <class>AppearancePage</class>
+ <widget class="QWidget" name="AppearancePage" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>500</width>
+ <height>395</height>
+ </rect>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <layout class="QVBoxLayout" >
+ <item>
+ <widget class="QGroupBox" name="grpLanguage" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="title" >
+ <string>Language</string>
+ </property>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QComboBox" name="cmboLanguage" >
+ <property name="minimumSize" >
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip" >
+ <string>Choose the language used in Vidalia</string>
+ </property>
+ <property name="editable" >
+ <bool>false</bool>
+ </property>
+ <property name="iconSize" >
+ <size>
+ <width>24</width>
+ <height>16</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>300</width>
+ <height>16</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="grpStyle" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip" >
+ <string/>
+ </property>
+ <property name="title" >
+ <string>Style</string>
+ </property>
+ <layout class="QGridLayout" >
+ <item row="0" column="1" >
+ <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="0" column="0" >
+ <widget class="QComboBox" name="cmboStyle" >
+ <property name="minimumSize" >
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip" >
+ <string>Choose Vidalia's interface style</string>
+ </property>
+ <property name="editable" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>476</width>
+ <height>161</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeDownloader.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeDownloader.cpp
new file mode 100644
index 0000000..4d37f27
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeDownloader.cpp
@@ -0,0 +1,162 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 BridgeDownloader.cpp
+** \version $Id: BridgeDownloader.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Downloads a list of new bridge addresses via HTTPS
+*/
+
+#include "BridgeDownloader.h"
+#include "Vidalia.h"
+
+#include <QSslSocket>
+
+#define BRIDGEDB_HOST "bridges.torproject.org"
+#define BRIDGEDB_PORT 443
+
+
+BridgeDownloader::BridgeDownloader(QObject *parent)
+ : QObject(parent),
+ _requestId(0)
+{
+ _https = new QHttp(BRIDGEDB_HOST, QHttp::ConnectionModeHttps,
+ BRIDGEDB_PORT, this);
+
+ connect(_https, SIGNAL(stateChanged(int)),
+ this, SLOT(httpsStateChanged(int)));
+ connect(_https, SIGNAL(requestFinished(int, bool)),
+ this, SLOT(httpsRequestFinished(int, bool)));
+ connect(_https, SIGNAL(dataReadProgress(int, int)),
+ this, SIGNAL(downloadProgress(int, int)));
+ connect(_https, SIGNAL(sslErrors(QList<QSslError>)),
+ this, SLOT(sslErrors(QList<QSslError>)));
+}
+
+void
+BridgeDownloader::setProxy(const QString &host, int port,
+ const QString &username, const QString &password)
+{
+ _https->setProxy(host, port, username, password);
+}
+
+bool
+BridgeDownloader::downloadBridges(BridgeDownloadMethod method)
+{
+ if (! isMethodSupported(method))
+ return false;
+
+ switch (method) {
+ case DownloadMethodHttps:
+ startHttpsDownload();
+ break;
+
+ default:
+ break;
+ }
+ return true;
+}
+
+bool
+BridgeDownloader::isMethodSupported(BridgeDownloadMethod method)
+{
+ switch (method) {
+ case DownloadMethodHttps:
+ return QSslSocket::supportsSsl();
+
+ default:
+ break;
+ }
+ return false;
+}
+
+void
+BridgeDownloader::startHttpsDownload()
+{
+ emit statusChanged(tr("Starting HTTPS bridge request..."));
+ emit downloadProgress(0, 0);
+
+ _requestId = _https->get("/?format=plain");
+ vInfo("Sending an HTTPS bridge request to %1:%2 (id %3).").arg(BRIDGEDB_HOST)
+ .arg(BRIDGEDB_PORT)
+ .arg(_requestId);
+}
+
+void
+BridgeDownloader::cancelBridgeRequest()
+{
+ _https->abort();
+}
+
+void
+BridgeDownloader::httpsStateChanged(int state)
+{
+ switch (state) {
+ case QHttp::Connecting:
+ emit statusChanged(tr("Connecting to %1:%2...").arg(BRIDGEDB_HOST)
+ .arg(BRIDGEDB_PORT));
+ break;
+
+ case QHttp::Sending:
+ emit statusChanged(tr("Sending an HTTPS request for bridges..."));
+ break;
+
+ case QHttp::Reading:
+ emit statusChanged(tr("Downloading a list of bridges..."));
+ break;
+
+ default:
+ break;
+ }
+}
+
+void
+BridgeDownloader::httpsRequestFinished(int id, bool error)
+{
+ if (id != _requestId)
+ return;
+
+ if (error) {
+ QString errorString = _https->errorString();
+ vWarn("Bridge request failed (id %1): %2").arg(id).arg(errorString);
+
+ emit bridgeRequestFailed(errorString);
+ } else {
+ QByteArray response = _https->readAll();
+ vInfo("Bridge request complete (id %1): received %2 bytes.").arg(id)
+ .arg(response.size());
+
+ QStringList bridges, lines = QString(response).split("\n");
+ foreach (QString line, lines) {
+ line = line.trimmed();
+ if (line.startsWith("bridge ", Qt::CaseInsensitive))
+ bridges << line;
+ }
+ emit bridgeRequestFinished(bridges);
+ }
+ _https->close();
+}
+
+void
+BridgeDownloader::sslErrors(const QList<QSslError> &sslErrors)
+{
+ QString errorString;
+ QStringList errorStrings;
+
+ vWarn("%1 SSL error(s) when requesting bridge information (id %2):")
+ .arg(sslErrors.size())
+ .arg(_requestId);
+ foreach (QSslError sslError, sslErrors) {
+ errorString = sslError.errorString();
+ errorStrings << errorString;
+ vWarn(" SSL Error: %1").arg(errorString);
+ }
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeDownloader.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeDownloader.h
new file mode 100644
index 0000000..68c61b1
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeDownloader.h
@@ -0,0 +1,126 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 BridgeDownloader.h
+** \version $Id: BridgeDownloader.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Downloads a list of new bridge addresses via HTTPS
+*/
+
+#ifndef _BRIDGEDOWNLOADER_H
+#define _BRIDGEDOWNLOADER_H
+
+#include <QHttp>
+#include <QSslError>
+#include <QStringList>
+
+
+class BridgeDownloader : public QObject
+{
+ Q_OBJECT
+
+public:
+ /** Available bridge download methods. */
+ enum BridgeDownloadMethod {
+ DownloadMethodHttps, /** Download via an HTTPS connection. */
+ };
+
+ /** Default constructor.
+ */
+ BridgeDownloader(QObject *parent = 0);
+
+ /** Initiates a request for a set of bridges using the specified
+ * download <b>method</b>. Returns true if the request was initiated
+ * successfully, or false on error.
+ */
+ bool downloadBridges(BridgeDownloadMethod method);
+
+ /** Enables HTTPS proxy support, using the proxy server <b>host</b> on
+ * port <b>port</b>. A <b>username</b> and <b>password</b> can also
+ * optionally be supplied, if required by the proxy.
+ */
+ void setProxy(const QString &host, int port,
+ const QString &username = QString(),
+ const QString &password = QString());
+
+ /** Returns true if <b>method</b> is supported by the currently
+ * available Qt libraries.
+ */
+ static bool isMethodSupported(BridgeDownloadMethod method);
+
+public slots:
+ /** Cancels any pending bridge download requests.
+ */
+ void cancelBridgeRequest();
+
+signals:
+ /** Emitted when the underlying QHttp object reads data from an HTTPS
+ * response. <b>done</b> indicates how many bytes out of <b>total</b>
+ * have been read so far. Note that <b>total</b> may be 0 if the expected
+ * total size of the response is not known.
+ */
+ void downloadProgress(int done, int total);
+
+ /** Emitted when the status of the bridge request changes. <b>status</b>
+ * describes the new current state of the request.
+ */
+ void statusChanged(const QString &status);
+
+ /** Emitted when the previous request for bridge addresses completes
+ * successfully. The QStringList <b>bridges</b> contains a (possibly empty)
+ * list of bridge addresses parsed from the received response.
+ */
+ void bridgeRequestFinished(const QStringList &bridges);
+
+ /** Emitted when the previous request for bridge addresses fails. The
+ * QString <b>error</b> is a human-readable string describing the error
+ * encountered.
+ */
+ void bridgeRequestFailed(const QString &error);
+
+private slots:
+ /** Called when the state of the underlying QHttp object changes. A
+ * statusChanged() signal is emitted with the appropriate text
+ * describing the new state of the request.
+ */
+ void httpsStateChanged(int state);
+
+ /** Called when the underlying QHttp object used to make the bridge
+ * request completes. <b>error</b> is set to false if the request was
+ * successful, or true if the request failed. If <b>id</b> does not
+ * match the request ID previously returned by QHttp::get(), then the
+ * signal is ignored since it is the result of a close() or abort()
+ * request.
+ */
+ void httpsRequestFinished(int id, bool error);
+
+ /** Called when the HTTPS connection encounters one or more
+ * <b>sslErrors</b>. Currently the errors are just logged and
+ * bridgeRequestFailed() is <i>not</i> emitted, since QHttp will also
+ * emit
+ */
+ void sslErrors(const QList<QSslError> &sslErrors);
+
+private:
+ /** Initiates an HTTPS connection to bridges.torproject.org to start
+ * downloading a set of bridges.
+ */
+ void startHttpsDownload();
+
+ /** Used to connect to the bridge database, send an HTTPS request for
+ * new bridge addresses and then read the response. */
+ QHttp* _https;
+
+ /** Unique numeric identifier of the current bridge request. */
+ int _requestId;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeDownloaderProgressDialog.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeDownloaderProgressDialog.cpp
new file mode 100644
index 0000000..a92553d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeDownloaderProgressDialog.cpp
@@ -0,0 +1,91 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 BridgeDownloaderProgressDialog.cpp
+** \version $Id: BridgeDownloaderProgressDialog.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays the progress of a request for bridge addresses
+*/
+
+#include "BridgeDownloaderProgressDialog.h"
+
+#include <QTimer>
+
+
+BridgeDownloaderProgressDialog::BridgeDownloaderProgressDialog(QWidget *parent)
+ : QDialog(parent)
+{
+ ui.setupUi(this);
+
+ connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton *)),
+ this, SLOT(buttonClicked(QAbstractButton *)));
+
+ setModal(true);
+}
+
+void
+BridgeDownloaderProgressDialog::setVisible(bool visible)
+{
+ if (visible) {
+ ui.progressBar->setRange(0, 0);
+ ui.buttonBox->setStandardButtons(QDialogButtonBox::Cancel);
+ }
+ QDialog::setVisible(visible);
+}
+
+void
+BridgeDownloaderProgressDialog::setStatus(const QString &status)
+{
+ ui.lblStatus->setText(status);
+}
+
+void
+BridgeDownloaderProgressDialog::setDownloadProgress(int done, int total)
+{
+ ui.progressBar->setRange(0, total);
+ ui.progressBar->setValue(done);
+}
+
+void
+BridgeDownloaderProgressDialog::bridgeRequestFinished(const QStringList &bridges)
+{
+ Q_UNUSED(bridges);
+
+ accept();
+}
+
+void
+BridgeDownloaderProgressDialog::bridgeRequestFailed(const QString &error)
+{
+ ui.lblStatus->setText(tr("Unable to download bridges: %1").arg(error));
+
+ ui.progressBar->setRange(0, 1);
+ ui.progressBar->setValue(1);
+
+ ui.buttonBox->setStandardButtons(QDialogButtonBox::Cancel
+ | QDialogButtonBox::Retry
+ | QDialogButtonBox::Help);
+}
+
+void
+BridgeDownloaderProgressDialog::buttonClicked(QAbstractButton *button)
+{
+ int standardButton = ui.buttonBox->standardButton(button);
+ if (standardButton == QDialogButtonBox::Retry) {
+ setStatus(tr("Retrying bridge request..."));
+ setDownloadProgress(0, 0);
+ ui.buttonBox->setStandardButtons(QDialogButtonBox::Cancel);
+
+ QTimer::singleShot(1000, this, SIGNAL(retry()));
+ } else {
+ done(standardButton);
+ }
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeDownloaderProgressDialog.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeDownloaderProgressDialog.h
new file mode 100644
index 0000000..e4f6913
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeDownloaderProgressDialog.h
@@ -0,0 +1,84 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 BridgeDownloaderProgressDialog.h
+** \version $Id: BridgeDownloaderProgressDialog.h 3879 2009-06-23 22:53:29Z edmanm $
+** \brief Displays the progress of a request for bridge addresses
+*/
+
+#ifndef _BRIDGEDOWNLOADERPROGRESSDIALOG_H
+#define _BRIDGEDOWNLOADERPROGRESSDIALOG_H
+
+#include "ui_BridgeDownloaderProgressDialog.h"
+
+#include <QDialog>
+
+
+class BridgeDownloaderProgressDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor.
+ */
+ BridgeDownloaderProgressDialog(QWidget *parent = 0);
+
+public slots:
+ /** Sets the status message text in the dialog to <b>status</b>.
+ */
+ void setStatus(const QString &status);
+
+ /** Updates the bridge download progress bar to <b>value</b> out of
+ * <b>maximum</b> steps. If <b>value</b> and <b>maximum</b> are both 0,
+ * then a "busy" progress bar is displayed.
+ */
+ void setDownloadProgress(int value, int maximum);
+
+ /** Called when the bridge download completes successfully and discards
+ * the progress dialog with an Accept result code. <b>bridges</b>
+ * contains the list of bridges downloaded, but is currently ignored.
+ */
+ void bridgeRequestFinished(const QStringList &bridges);
+
+ /** Called when the bridge download fails. The string <b>error</b>
+ * provides a human-readable description of the reason the download
+ * failed, which is displayed for the user.
+ */
+ void bridgeRequestFailed(const QString &error);
+
+signals:
+ /** Emitted when the user clicks the "Retry" button after a previous
+ * bridge request has failed.
+ */
+ void retry();
+
+protected:
+ /** Overloaded method called when the progress dialog is first shown in
+ * order to initialize the progress bar, status text and dialog button
+ * box.
+ */
+ virtual void setVisible(bool visible);
+
+private slots:
+ /** Called when <b>button</b> is clicked in the progress dialog's
+ * QDialogButtonBox. Dismisses the dialog and sets the result code to
+ * the QDialogButtonBox::StandardButton enum value indicated by
+ * <b>button</b>.
+ */
+ void buttonClicked(QAbstractButton *button);
+
+private:
+ /**< Qt Designer generated object. */
+ Ui::BridgeDownloaderProgressDialog ui;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeDownloaderProgressDialog.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeDownloaderProgressDialog.ui
new file mode 100644
index 0000000..84210a6
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeDownloaderProgressDialog.ui
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>BridgeDownloaderProgressDialog</class>
+ <widget class="QDialog" name="BridgeDownloaderProgressDialog">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>366</width>
+ <height>105</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Downloading Bridges</string>
+ </property>
+ <property name="windowIcon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/network-workgroup.png</normaloff>:/images/32x32/network-workgroup.png</iconset>
+ </property>
+ <property name="modal">
+ <bool>true</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0" rowspan="2">
+ <widget class="QLabel" name="lblPixmap">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="pixmap">
+ <pixmap resource="../res/vidalia.qrc">:/images/48x48/network-workgroup.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLabel" name="lblStatus">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QProgressBar" name="progressBar">
+ <property name="value">
+ <number>0</number>
+ </property>
+ <property name="textVisible">
+ <bool>false</bool>
+ </property>
+ <property name="format">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="2">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources>
+ <include location="../res/vidalia.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeUsageDialog.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeUsageDialog.cpp
new file mode 100644
index 0000000..c50d5b4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeUsageDialog.cpp
@@ -0,0 +1,81 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 BridgeUsageDialog.cpp
+** \version $Id: BridgeUsageDialog.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays a summary of bridge usage information, including client
+** geographic location history.
+*/
+
+#include "BridgeUsageDialog.h"
+#include "CountryInfo.h"
+
+#include <QHeaderView>
+#include <QTreeWidgetItem>
+#include <QPixmap>
+
+
+BridgeUsageDialog::BridgeUsageDialog(QWidget *parent)
+ : QDialog(parent)
+{
+ ui.setupUi(this);
+ ui.treeClientSummary->setHeaderLabels(QStringList() << QString("")
+ << tr("Country")
+ << tr("# Clients"));
+}
+
+void
+BridgeUsageDialog::showEvent(QShowEvent *e)
+{
+ QHeaderView *header = ui.treeClientSummary->header();
+ header->setResizeMode(0, QHeaderView::ResizeToContents);
+ header->resizeSection(1, 220);
+ header->setResizeMode(2, QHeaderView::ResizeToContents);
+
+ QDialog::showEvent(e);
+}
+
+void
+BridgeUsageDialog::update(const QDateTime &timeStarted,
+ const QHash<QString,int> &countrySummary)
+{
+ QTreeWidgetItem *item;
+ int minClients, maxClients;
+ QString countryName;
+ QPixmap flag;
+
+ /* Set the header with the TimeStarted value converted to local time */
+ ui.lblClientSummary->setText(tr("Clients from the following countries have "
+ "used your relay since %1")
+ .arg(timeStarted.toLocalTime().toString()));
+
+ /* Populate the table of client country statistics */
+ foreach (QString countryCode, countrySummary.keys()) {
+ maxClients = countrySummary.value(countryCode);
+ minClients = maxClients-7;
+
+ flag = QPixmap(":/images/flags/" + countryCode.toLower() + ".png");
+ if (flag.isNull())
+ flag = QPixmap(":/images/flags/unknown.png");
+
+ countryName = CountryInfo::countryName(countryCode);
+ if (countryName.isEmpty())
+ countryName = countryCode;
+
+ item = new QTreeWidgetItem();
+ item->setIcon(0, QIcon(flag));
+ item->setText(1, countryName);
+ item->setText(2, QString("%1-%2").arg(minClients).arg(maxClients));
+ ui.treeClientSummary->addTopLevelItem(item);
+ }
+ ui.treeClientSummary->sortItems(2, Qt::DescendingOrder);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeUsageDialog.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeUsageDialog.h
new file mode 100644
index 0000000..7821261
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeUsageDialog.h
@@ -0,0 +1,53 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 BridgeUsageDialog.h
+** \version $Id: BridgeUsageDialog.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays a summary of bridge usage information, including client
+** geographic location history.
+*/
+
+#ifndef _BRIDGEUSAGEDIALOG_H
+#define _BRIDGEUSAGEDIALOG_H
+
+#include "ui_BridgeUsageDialog.h"
+
+#include <QDialog>
+#include <QDateTime>
+#include <QHash>
+
+
+class BridgeUsageDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor.
+ */
+ BridgeUsageDialog(QWidget *parent = 0);
+
+ /** Updates the dialog with current bridge usage information.
+ */
+ void update(const QDateTime &timeStarted,
+ const QHash<QString,int> &countrySummary);
+
+protected:
+ /** Called when the dialog is displayed. Adjusts the size of the column
+ * headers.
+ */
+ void showEvent(QShowEvent *e);
+
+private:
+ Ui::BridgeUsageDialog ui;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeUsageDialog.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeUsageDialog.ui
new file mode 100644
index 0000000..66ef1df
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/BridgeUsageDialog.ui
@@ -0,0 +1,110 @@
+<ui version="4.0" >
+ <class>BridgeUsageDialog</class>
+ <widget class="QDialog" name="BridgeUsageDialog" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>444</width>
+ <height>408</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+ <string>Bridge Usage Summary</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2" >
+ <item>
+ <widget class="QGroupBox" name="groupBox" >
+ <property name="title" >
+ <string>Client Summary</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout" >
+ <item>
+ <widget class="QLabel" name="lblClientSummary" >
+ <property name="text" >
+ <string></string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QTreeWidget" name="treeClientSummary" >
+ <property name="alternatingRowColors" >
+ <bool>false</bool>
+ </property>
+ <property name="sortingEnabled" >
+ <bool>true</bool>
+ </property>
+ <column>
+ <property name="text" >
+ <string></string>
+ </property>
+ </column>
+ <column>
+ <property name="text" >
+ <string>Country</string>
+ </property>
+ </column>
+ <column>
+ <property name="text" >
+ <string># Clients</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Close</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>BridgeUsageDialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>157</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>BridgeUsageDialog</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>286</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigDialog.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigDialog.cpp
new file mode 100644
index 0000000..8e16198
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigDialog.cpp
@@ -0,0 +1,300 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 ConfigDialog.cpp
+** \version $Id: ConfigDialog.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Contains a series of Vidalia and Tor configuration pages
+*/
+
+#include "ConfigDialog.h"
+#include "GeneralPage.h"
+#include "NetworkPage.h"
+#include "ServerPage.h"
+#include "AdvancedPage.h"
+#include "AppearancePage.h"
+#include "ServicePage.h"
+#include "VMessageBox.h"
+#include "ServerSettings.h"
+#include "NetworkSettings.h"
+#include "Vidalia.h"
+
+#include "html.h"
+
+
+/* Images for toolbar icons */
+#define IMAGE_GENERAL ":/images/32x32/preferences-system.png"
+#define IMAGE_NETWORK ":/images/32x32/preferences-system-network.png"
+#define IMAGE_SERVER ":/images/32x32/preferences-system-network-sharing.png"
+#define IMAGE_APPEARANCE ":/images/32x32/preferences-desktop-locale.png"
+#define IMAGE_ADVANCED ":/images/32x32/applications-system.png"
+#define IMAGE_HELP ":/images/32x32/system-help.png"
+#define IMAGE_SERVICE ":/images/32x32/services.png"
+
+
+/** Constructor */
+ConfigDialog::ConfigDialog(QWidget* parent)
+: VidaliaWindow("ConfigDialog", parent)
+{
+ /* Invoke the Qt Designer generated QObject setup routine */
+ ui.setupUi(this);
+
+ /* Override the QDialogButtonBox button text so we can use our own
+ * translations. */
+ QPushButton *button = ui.buttonBox->button(QDialogButtonBox::Ok);
+ if (button) {
+ Vidalia::createShortcut(QKeySequence(Qt::Key_Return),
+ this, button, SLOT(click()));
+ }
+ button = ui.buttonBox->button(QDialogButtonBox::Cancel);
+ if (button) {
+ Vidalia::createShortcut("Esc", this, button, SLOT(click()));
+ Vidalia::createShortcut("Ctrl+W", this, button, SLOT(click()));
+ }
+
+ /* Connect the button box signals to the appropriate slots */
+ connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(saveChanges()));
+ connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(close()));
+ connect(ui.buttonBox, SIGNAL(helpRequested()), this, SLOT(help()));
+ connect(Vidalia::torControl(), SIGNAL(authenticated()),
+ this, SLOT(applyChanges()));
+
+ /* Create the config pages and actions */
+ QActionGroup *grp = new QActionGroup(this);
+ GeneralPage *generalPage = new GeneralPage(ui.stackPages);
+ ui.stackPages->add(generalPage,
+ createPageAction(QIcon(IMAGE_GENERAL),
+ tr("General"), "General", grp));
+ connect(generalPage, SIGNAL(checkForUpdates()),
+ this, SLOT(onCheckForUpdates()));
+
+ ui.stackPages->add(new NetworkPage(ui.stackPages),
+ createPageAction(QIcon(IMAGE_NETWORK),
+ tr("Network"), "Network", grp));
+
+ ui.stackPages->add(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));
+
+ ui.stackPages->add(new AdvancedPage(ui.stackPages),
+ createPageAction(QIcon(IMAGE_ADVANCED),
+ tr("Advanced"), "Advanced", grp));
+
+ foreach (ConfigPage *page, ui.stackPages->pages()) {
+ connect(page, SIGNAL(helpRequested(QString)),
+ this, SLOT(help(QString)));
+ }
+
+ /* Create the toolbar */
+ ui.toolBar->addActions(grp->actions());
+ ui.toolBar->addSeparator();
+ connect(grp, SIGNAL(triggered(QAction *)),
+ ui.stackPages, SLOT(showPage(QAction *)));
+
+ /* Create and bind the Help button */
+ QAction *helpAct = new QAction(QIcon(IMAGE_HELP), tr("Help"), ui.toolBar);
+ helpAct->setData("Help");
+ addAction(helpAct, SLOT(help()));
+
+ /* Select the first action */
+ grp->actions()[0]->setChecked(true);
+
+#if defined(Q_WS_WIN)
+ helpAct->setShortcut(QString("F1"));
+#else
+ helpAct->setShortcut(QString("Ctrl+?"));
+#endif
+}
+
+/** Creates a new action associated with a config page. */
+QAction*
+ConfigDialog::createPageAction(const QIcon &img, const QString &text,
+ const QString &data, QActionGroup *group)
+{
+ QAction *action = new QAction(img, text, group);
+ action->setData(data);
+ action->setCheckable(true);
+ return action;
+}
+
+/** Adds the given action to the toolbar and hooks its triggered() signal to
+ * the specified slot (if given). */
+void
+ConfigDialog::addAction(QAction *action, const char *slot)
+{
+ ui.toolBar->addAction(action);
+ connect(action, SIGNAL(triggered()), this, slot);
+}
+
+/** Shows the config dialog with focus set to the given page. */
+void
+ConfigDialog::showWindow(Page page)
+{
+ /* Load saved settings */
+ loadSettings();
+ /* Show the dialog. */
+ VidaliaWindow::showWindow();
+ /* Set the focus to the specified page. */
+ ui.stackPages->setCurrentIndex((int)page);
+}
+
+/** Called when the user changes the UI translation. */
+void
+ConfigDialog::retranslateUi()
+{
+ ui.retranslateUi(this);
+ foreach (ConfigPage *page, ui.stackPages->pages()) {
+ page->retranslateUi();
+ }
+ foreach (QAction *action, ui.toolBar->actions()) {
+ action->setText(tr(qPrintable(action->data().toString()), "ConfigDialog"));
+ }
+ ui.buttonBox->setStandardButtons(ui.buttonBox->standardButtons());
+}
+
+/** Loads the saved ConfigDialog settings. */
+void
+ConfigDialog::loadSettings()
+{
+ /* Call each config page's load() method to load its data */
+ foreach (ConfigPage *page, ui.stackPages->pages()) {
+ page->load();
+ }
+}
+
+/** Saves changes made to settings. If Tor is running and Vidalia is
+ * connected, we will also attempt to apply the changes to Tor. */
+void
+ConfigDialog::saveChanges()
+{
+ QString errmsg;
+
+ /* Call each config page's save() method to save its data */
+ foreach (ConfigPage *page, ui.stackPages->pages()) {
+ if (!page->save(errmsg)) {
+ /* Display the offending page */
+ ui.stackPages->setCurrentPage(page);
+
+ /* Show the user what went wrong */
+ VMessageBox::warning(this,
+ tr("Error Saving Settings"),
+ p(tr("Vidalia was unable to save your %1 settings.")
+ .arg(tr(qPrintable(page->title()), "ConfigDialog"))) + p(errmsg),
+ VMessageBox::Ok);
+
+ /* Don't process the rest of the pages */
+ return;
+ }
+ }
+ if (Vidalia::torControl()->isConnected())
+ applyChanges();
+ else
+ close();
+}
+
+/** Called after Vidalia has authenticated to Tor and applies any changes
+ * made since the last time they were applied. */
+void
+ConfigDialog::applyChanges()
+{
+ QString errmsg;
+ bool appliedChanges = false;
+
+ foreach (ConfigPage *page, ui.stackPages->pages()) {
+ if (!page->changedSinceLastApply())
+ continue;
+ if (!page->apply(errmsg)) {
+ /* Failed to apply the changes to Tor */
+ int ret = VMessageBox::warning(this,
+ tr("Error Applying Settings"),
+ p(tr("Vidalia was unable to apply your %1 settings "
+ "to Tor.").arg(page->title()))
+ + p(errmsg),
+ VMessageBox::ShowSettings|VMessageBox::Default,
+ VMessageBox::Cancel|VMessageBox::Escape);
+ if (ret == VMessageBox::ShowSettings) {
+ /* Show the user the page with the bad settings */
+ showWindow();
+ ui.stackPages->setCurrentPage(page);
+ } else {
+ /* The user clicked 'Cancel', so revert the failed settings */
+ page->revert();
+ close();
+ }
+ return;
+ }
+ appliedChanges = true;
+ }
+ if (appliedChanges)
+ saveConf();
+ close();
+}
+
+/** Sends Tor a SAVECONF to write its configuration to disk. If the SAVECONF
+ * is successful, then all settings are considered to be applied. */
+void
+ConfigDialog::saveConf()
+{
+ TorControl *tc = Vidalia::torControl();
+ if (tc->saveConf()) {
+ ServerSettings(tc).setChanged(false);
+ NetworkSettings(tc).setChanged(false);
+ TorSettings(tc).setChanged(false);
+ }
+}
+
+/** Shows help information for whichever settings page the user is currently
+ * viewing. */
+void
+ConfigDialog::help()
+{
+ Page currentPage = static_cast<Page>(ui.stackPages->currentIndex());
+
+ switch (currentPage) {
+ case Network:
+ help("config.network"); break;
+ case Server:
+ help("server"); break;
+ case Appearance:
+ help("config.appearance"); break;
+ case Advanced:
+ help("config.advanced"); break;
+ case Service:
+ help("config.services"); break;
+ default:
+ help("config.general"); break;
+ }
+}
+
+/** Stub method that relays the checkForUpdates() signal from the General
+ * settings page to the owner of the config dialog (MainWindow). */
+void
+ConfigDialog::onCheckForUpdates()
+{
+ emit checkForUpdates();
+}
+
+
+/** Called when a ConfigPage in the dialog requests help on a specific
+ * <b>topic</b>. */
+void
+ConfigDialog::help(const QString &topic)
+{
+ emit helpRequested(topic);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigDialog.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigDialog.h
new file mode 100644
index 0000000..f9ec59e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigDialog.h
@@ -0,0 +1,93 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 ConfigDialog.h
+** \version $Id: ConfigDialog.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Contains a series of Vidalia and Tor configuration pages
+*/
+
+#ifndef _CONFIGDIALOG_H
+#define _CONFIGDIALOG_H
+
+#include "ui_ConfigDialog.h"
+#include "VidaliaWindow.h"
+
+#include <QMainWindow>
+#include <QFileDialog>
+
+
+class ConfigDialog : public VidaliaWindow
+{
+ Q_OBJECT
+
+public:
+ /** Config dialog pages. */
+ enum Page {
+ General = 0, /** General configuration page. */
+ Network, /** Network configuration page. */
+ Server, /** Server configuration page. */
+ Appearance, /** Appearance configuration page. */
+ Advanced, /** Advanced configuration page. */
+ Service /** Service Configuration page */
+ };
+
+ /** Default Constructor */
+ ConfigDialog(QWidget *parent = 0);
+
+public slots:
+ /** Shows the config dialog with focus set to the given page. */
+ void showWindow(Page page = General);
+
+signals:
+ /** Emitted when the user clicks "Check Now" to initiate a check
+ * for software updates. */
+ void checkForUpdates();
+
+protected:
+ /** Called when the user changes the UI translation. */
+ virtual void retranslateUi();
+
+private slots:
+ /** Called when user clicks "Save Settings". Saves their settings to
+ * Vidalia's configuration file. */
+ void saveChanges();
+ /** Called after Vidalia has authenticated to Tor and applies any changes
+ * made since the last time they were applied. */
+ void applyChanges();
+ /** Sends Tor a SAVECONF to write its configuration to disk. If the
+ * SAVECONF is successful, then all settings are considered to be
+ * applied. */
+ void saveConf();
+ /** Called when a ConfigPage in the dialog requests help on a specific
+ * <b>topic</b>. */
+ void help(const QString &topic);
+ /** Shows general help information for whichever settings page the user is
+ * currently viewing. */
+ void help();
+ /** 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();
+ /** Creates a new action for a config page. */
+ QAction* createPageAction(const QIcon &img, const QString &text,
+ const QString &data, QActionGroup *group);
+ /** Adds a new action to the toolbar. */
+ void addAction(QAction *action, const char *slot = 0);
+
+ /** Qt Designer generated object */
+ Ui::ConfigDialog ui;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigDialog.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigDialog.ui
new file mode 100644
index 0000000..e7c3ae4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigDialog.ui
@@ -0,0 +1,94 @@
+<ui version="4.0" >
+ <class>ConfigDialog</class>
+ <widget class="QMainWindow" name="ConfigDialog" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>600</width>
+ <height>400</height>
+ </rect>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="windowTitle" >
+ <string>Settings</string>
+ </property>
+ <property name="windowIcon" >
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/preferences-system.png</iconset>
+ </property>
+ <property name="iconSize" >
+ <size>
+ <width>48</width>
+ <height>48</height>
+ </size>
+ </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="ConfigPageStack" native="1" name="stackPages" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <widget class="QWidget" native="1" name="widget" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
+ </widget>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QStatusBar" name="statusbar" />
+ <widget class="QToolBar" name="toolBar" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="movable" >
+ <bool>false</bool>
+ </property>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <attribute name="toolBarArea" >
+ <number>4</number>
+ </attribute>
+ </widget>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>ConfigPageStack</class>
+ <extends>QStackedPageWidget</extends>
+ <header>config/ConfigPageStack.h</header>
+ </customwidget>
+ </customwidgets>
+ <resources>
+ <include location="../res/vidalia_common.qrc" />
+ </resources>
+ <connections/>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigPage.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigPage.h
new file mode 100644
index 0000000..b046306
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigPage.h
@@ -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.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 ConfigPage.h
+** \version $Id: ConfigPage.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Pure-virtual class for a configuration page
+*/
+
+#ifndef _CONFIGPAGE_H
+#define _CONFIGPAGE_H
+
+#include <QWidget>
+
+
+class ConfigPage : public QWidget
+{
+ Q_OBJECT
+
+public:
+ /** Default Constructor */
+ ConfigPage(QWidget *parent = 0, const QString title = QString())
+ : QWidget(parent), _title(title) {}
+
+ /** Returns the title of this configuration page. */
+ QString title() const { return _title; }
+
+ /** Pure virtual method. Subclassed pages load their config settings here. */
+ virtual void load() = 0;
+ /** Pure virtual method. Subclassed pages save their config settings here
+ * and return true if everything was saved successfully. */
+ virtual bool save(QString &errmsg) = 0;
+
+ /** Subclassed pages can overload this method to return true if they
+ * contain settings that have been modified since they were last applied to
+ * Tor. The default implementation always returns false. */
+ virtual bool changedSinceLastApply() {
+ return false;
+ }
+ /** Subclassed pages can overload this method to apply any settings to
+ * Tor that have been modified since they were last applied (e.g., the
+ * changes were made while Tor was not running). Returns true if the changes
+ * were applied successfully. */
+ virtual bool apply(QString &errmsg) {
+ Q_UNUSED(errmsg);
+ return true;
+ }
+ /** Subclassed pages can overload this method to revert any cancelled
+ * settings. */
+ virtual void revert() {}
+
+ virtual void retranslateUi() {}
+
+signals:
+ /** Signal emitted when a ConfigPage requests help information on a given
+ * <b>topic</b>. */
+ void helpRequested(const QString &topic);
+
+private:
+ QString _title; /**< Title of this configuration page. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigPageStack.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigPageStack.cpp
new file mode 100644
index 0000000..56259b6
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigPageStack.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.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 ConfigPageStack.cpp
+** \version $Id: ConfigPageStack.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief A collection of configuration pages
+*/
+
+#include "ConfigPageStack.h"
+
+#include <QAction>
+
+
+/** Default constructor. */
+ConfigPageStack::ConfigPageStack(QWidget *parent)
+: QStackedWidget(parent)
+{
+}
+
+/** Adds a page to the stack. */
+void
+ConfigPageStack::add(ConfigPage *page, QAction *action)
+{
+ _pages.insert(action, page);
+ insertWidget(count(), page);
+}
+
+/** Sets the current config page and checks its action. */
+void
+ConfigPageStack::setCurrentPage(ConfigPage *page)
+{
+ foreach (QAction *action, _pages.keys(page)) {
+ action->setChecked(true);
+ }
+ setCurrentWidget(page);
+}
+
+/** Sets the current config page index and checks its action. */
+void
+ConfigPageStack::setCurrentIndex(int index)
+{
+ setCurrentPage((ConfigPage *)widget(index));
+}
+
+/** Shows the config page associated with the activated action. */
+void
+ConfigPageStack::showPage(QAction *pageAction)
+{
+ setCurrentWidget(_pages.value(pageAction));
+}
+
+/** Returns a list of all pages in the stack. The order of the pages in the
+ * returned QList is the same as the order in which the pages were initially
+ * added to the stack. */
+QList<ConfigPage *>
+ConfigPageStack::pages() const
+{
+ QList<ConfigPage *> pages;
+ for (int i = 0; i < count(); i++)
+ pages << dynamic_cast<ConfigPage *>(widget(i));
+ return pages;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigPageStack.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigPageStack.h
new file mode 100644
index 0000000..b944ab3
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ConfigPageStack.h
@@ -0,0 +1,56 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 ConfigPageStack.h
+** \version $Id: ConfigPageStack.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief A collection of configuration pages
+*/
+
+#ifndef _CONFIGPAGESTACK_H
+#define _CONFIGPAGESTACK_H
+
+#include "ConfigPage.h"
+
+#include <QStackedWidget>
+#include <QHash>
+
+
+class ConfigPageStack : public QStackedWidget
+{
+ Q_OBJECT
+
+public:
+ /** Constructor. */
+ ConfigPageStack(QWidget *parent = 0);
+
+ /** Adds a configuration page to the stack. */
+ void add(ConfigPage *page, QAction *action);
+ /** Sets the current config page and checks its action. */
+ void setCurrentPage(ConfigPage *page);
+ /** Sets the current config page index and checks its action. */
+ void setCurrentIndex(int index);
+
+ /** Returns a list of all pages in the stack. The order of the pages in the
+ * returned QList is the same as the order in which the pages were
+ * initially added to the stack. */
+ QList<ConfigPage *> pages() const;
+
+public slots:
+ /** Displays the page associated with the activated action. */
+ void showPage(QAction *pageAction);
+
+private:
+ /** Maps an action to a config page. */
+ QHash<QAction*, ConfigPage*> _pages;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/DomainValidator.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/DomainValidator.cpp
new file mode 100644
index 0000000..64b6d5d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/DomainValidator.cpp
@@ -0,0 +1,30 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 DomainValidator.cpp
+** \version $Id: DomainValidator.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Validates that a given domain name is (probably) valid
+*/
+
+#include "DomainValidator.h"
+
+
+/** Regular expression to validate that input is a valid IP address. */
+#define DOMAIN_REGEXP \
+"^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}$"
+
+
+/** Constructor. */
+DomainValidator::DomainValidator(QObject *parent)
+: QRegExpValidator(QRegExp(DOMAIN_REGEXP), parent)
+{
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/DomainValidator.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/DomainValidator.h
new file mode 100644
index 0000000..299a322
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/DomainValidator.h
@@ -0,0 +1,33 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 DomainValidator.h
+** \version $Id: DomainValidator.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Validates that a given domain name is (probably) valid
+*/
+
+#ifndef _DOMAINVALIDATOR_H
+#define _DOMAINVALIDATOR_H
+
+#include <QRegExpValidator>
+
+
+class DomainValidator : public QRegExpValidator
+{
+ Q_OBJECT
+
+public:
+ /** Constructor. */
+ DomainValidator(QObject *parent);
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ExitPolicy.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ExitPolicy.cpp
new file mode 100644
index 0000000..5758fcb
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ExitPolicy.cpp
@@ -0,0 +1,165 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 ExitPolicy.cpp
+** \version $Id: ExitPolicy.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Collection of Policy objects representing an exit policy
+*/
+
+#include "ExitPolicy.h"
+
+#include <QStringList>
+
+
+/** Default constructor. */
+ExitPolicy::ExitPolicy()
+{
+}
+
+/** Constructor. Creates an exit policy based on the given type. */
+ExitPolicy::ExitPolicy(SpecialExitPolicy exitPolicy)
+{
+ if (exitPolicy == Middleman) {
+ _exitPolicy << Policy(Policy::RejectAll);
+ } else if (exitPolicy == Default) {
+ _exitPolicy << Policy("reject *:25")
+ << Policy("reject *:119")
+ << Policy("reject *:135-139")
+ << Policy("reject *:445")
+ << Policy("reject *:465")
+ << Policy("reject *:587")
+ << Policy("reject *:1214")
+ << Policy("reject *:4661-4666")
+ << Policy("reject *:6346-6429")
+ << Policy("reject *:6699")
+ << Policy("reject *:6881-6999")
+ << Policy("accept *:*");
+ }
+}
+
+/** Parses the given string for a comma-delimited list of policies and
+ * adds them to this this policy. */
+ExitPolicy::ExitPolicy(QString exitPolicy)
+{
+ if (!exitPolicy.isEmpty()) {
+ QStringList policyList = exitPolicy.split(",");
+ foreach(QString policy, policyList) {
+ addPolicy(Policy(policy));
+ }
+ }
+}
+
+/** Adds a policy to this exit policy. */
+void
+ExitPolicy::addPolicy(Policy policy)
+{
+ if (!contains(policy)) {
+ _exitPolicy << policy;
+ }
+}
+
+/** Removes a policy from this exit policy. */
+void
+ExitPolicy::removePolicy(Policy policy)
+{
+ for (int i = 0; i < _exitPolicy.size(); i++) {
+ if (policy == _exitPolicy.at(i)) {
+ _exitPolicy.removeAt(i);
+ return;
+ }
+ }
+}
+
+/** Adds the ports specified in <b>portList</b> to a list of ports accepted
+ * by this exit policy. Ports may be given either individually or as ranges. */
+void
+ExitPolicy::addAcceptedPorts(QStringList portList)
+{
+ foreach (QString port, portList) {
+ addPolicy(Policy("accept *:" + port));
+ }
+}
+
+/** Returns true if this exit policy accepts all ports specified in
+ * <b>portList</b>. Ports in <b>portList</b> may be given either individually
+ * or in ranges (e.g., "6660-6669"). */
+bool
+ExitPolicy::acceptsPorts(QStringList portList)
+{
+ foreach (QString port, portList) {
+ if (!contains(Policy("accept *:" + port))) {
+ return false;
+ }
+ }
+ return true;
+}
+
+/** Adds the ports specified in <b>portList</b> to a list of ports rejected
+ * by this exit policy. Ports may be given either individually or as ranges. */
+void
+ExitPolicy::addRejectedPorts(QStringList portList)
+{
+ foreach (QString port, portList) {
+ addPolicy(Policy("reject *:" + port));
+ }
+}
+
+/** Returns true if this exit policy rejects all ports specified in
+ * <b>portList</b>. Ports in <b>portList</b> may be given either individually
+ * or in ranges (e.g., "6660-6669"). */
+bool
+ExitPolicy::rejectsPorts(QStringList portList)
+{
+ foreach (QString port, portList) {
+ if (!contains(Policy("reject *:" + port))) {
+ return false;
+ }
+ }
+ return true;
+}
+
+/** Returns true if this exit policy contains the given policy. */
+bool
+ExitPolicy::contains(Policy policy)
+{
+ Policy acceptAll(Policy::AcceptAll);
+ Policy rejectAll(Policy::RejectAll);
+
+ /* Check for this policy item in the explicitly defined policies */
+ foreach (Policy p, _exitPolicy) {
+ if (p.matches(policy)) {
+ return true;
+ }
+ if ((p == acceptAll) || (p == rejectAll)) {
+ /* This exit policy replaces the default policy, so stop checking */
+ return false;
+ }
+ }
+ /* Now check the default exit policy */
+ foreach (Policy p, ExitPolicy(Default).policyList()) {
+ if (p.matches(policy)) {
+ return true;
+ }
+ }
+ return false;
+}
+
+/** Converts the exit policy to a format Tor understands. */
+QString
+ExitPolicy::toString()
+{
+ QStringList policyList;
+ foreach (Policy policy, _exitPolicy) {
+ policyList << policy.toString();
+ }
+ return policyList.join(",");
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ExitPolicy.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ExitPolicy.h
new file mode 100644
index 0000000..33b3737
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ExitPolicy.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.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 ExitPolicy.h
+** \version $Id: ExitPolicy.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Collection of Policy objects representing an exit policy
+*/
+
+#ifndef _EXITPOLICY_H
+#define _EXITPOLICY_H
+
+#include "Policy.h"
+
+#include <QList>
+#include <QString>
+#include <QStringList>
+
+
+class ExitPolicy
+{
+public:
+ /** Special exit policy types. */
+ enum SpecialExitPolicy {
+ Default, /**< Specifies the default exit policy. */
+ Middleman /**< Specifies a middleman-only exit policy. */
+ };
+
+ /** Default constructor. */
+ ExitPolicy();
+ /** Creates an exit policy of the given special type. */
+ ExitPolicy(SpecialExitPolicy exitPolicy);
+ /** Creates an exit policy from the given comma-delimited list of policies. */
+ ExitPolicy(QString exitPolicy);
+
+ /** Adds the ports specified in <b>portList</b> to a list of ports accepted
+ * by this exit policy. Ports may be given either individually or as ranges. */
+ void addAcceptedPorts(QStringList portList);
+ /** Returns true if this exit policy accepts all ports specified in
+ * <b>portList</b>. Ports in <b>portList</b> may be given either individually
+ * or as ranges. */
+ bool acceptsPorts(QStringList portList);
+ /** Adds the ports specified in <b>portList</b> to a list of ports rejected
+ * by this exit policy. Ports may be given either individually or as ranges. */
+ void addRejectedPorts(QStringList portList);
+ /** Returns true if this exit policy rejects all ports specified in
+ * <b>portList</b>. Ports in <b>portList</b> may be given either individually
+ * or as ranges. */
+ bool rejectsPorts(QStringList portList);
+
+ /** Adds a rule to the exit policy. */
+ void addPolicy(Policy policy);
+ /** Removes a rule from the exit policy. */
+ void removePolicy(Policy policy);
+ /** Checks if the current exit policy contains the given rule. */
+ bool contains(Policy policy);
+
+ /** Returns the list of policies for this exit policy. */
+ QList<Policy> policyList() { return _exitPolicy; }
+
+ /** Converts the exit policy to a format Tor understands. */
+ QString toString();
+
+private:
+ /** A collection of policies forming the exit policy. */
+ QList<Policy> _exitPolicy;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/GeneralPage.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/GeneralPage.cpp
new file mode 100644
index 0000000..af3fef5
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/GeneralPage.cpp
@@ -0,0 +1,150 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 GeneralPage.cpp
+** \version $Id: GeneralPage.cpp 4132 2009-09-24 02:28:18Z edmanm $
+** \brief General Tor and Vidalia configuration options
+*/
+
+#include "config.h"
+#include "GeneralPage.h"
+
+#include "stringutil.h"
+
+#include <QDateTime>
+
+
+/** Constructor */
+GeneralPage::GeneralPage(QWidget *parent)
+: ConfigPage(parent, "General")
+{
+ /* Invoke the Qt Designer generated object setup routine */
+ ui.setupUi(this);
+
+ /* Create settings objects */
+ _vidaliaSettings = new VidaliaSettings;
+ _torSettings = new TorSettings;
+
+ /* 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)
+ /* Hide platform specific features */
+ ui.chkRunVidaliaAtSystemStartup->setVisible(false);
+ ui.lineHorizontalSeparator->setVisible(false);
+#endif
+#if !defined(USE_AUTOUPDATE)
+ ui.grpSoftwareUpdates->setVisible(false);
+#endif
+}
+
+/** Destructor */
+GeneralPage::~GeneralPage()
+{
+ delete _vidaliaSettings;
+ delete _torSettings;
+}
+
+/** Called when the user changes the UI translation. */
+void
+GeneralPage::retranslateUi()
+{
+ ui.retranslateUi(this);
+}
+
+/** Displays a file dialog allowing the user to browse for an executable
+ * file. <b>caption</b> will be displayed in the dialog's title bar and
+ * <b>file</b>, if specified, is the default file selected in the dialog.
+ */
+QString
+GeneralPage::browseExecutable(const QString &caption, const QString &file)
+{
+#if defined(Q_OS_WIN32)
+ QString filter = tr("Executables (*.exe)");
+#else
+ QString filter = "";
+#endif
+
+ QString filePath = QFileDialog::getOpenFileName(this, caption, file, filter);
+ return QDir::convertSeparators(filePath);
+}
+
+/** Open a QFileDialog to browse for a Tor executable file. */
+void
+GeneralPage::browseTorExecutable()
+{
+ QString filePath = browseExecutable(tr("Select Path to Tor"),
+ ui.lineTorExecutable->text());
+ if (! filePath.isEmpty())
+ 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)
+{
+ QString torExecutable = ui.lineTorExecutable->text();
+ if (torExecutable.isEmpty()) {
+ 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;
+}
+
+/** Loads previously saved settings */
+void
+GeneralPage::load()
+{
+ ui.chkRunVidaliaAtSystemStartup->setChecked(
+ _vidaliaSettings->runVidaliaOnBoot());
+
+ 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
+GeneralPage::updateNow()
+{
+ emit checkForUpdates();
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/GeneralPage.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/GeneralPage.h
new file mode 100644
index 0000000..51af83b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/GeneralPage.h
@@ -0,0 +1,72 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 GeneralPage.h
+** \version $Id: GeneralPage.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief General Tor and Vidalia configuration options
+*/
+
+#ifndef _GENERALPAGE_H
+#define _GENERALPAGE_H
+
+#include "ui_GeneralPage.h"
+#include "ConfigPage.h"
+#include "VidaliaSettings.h"
+#include "TorSettings.h"
+
+#include <QFileDialog>
+
+
+class GeneralPage : public ConfigPage
+{
+ Q_OBJECT
+
+public:
+ /** Default Constructor */
+ GeneralPage(QWidget *parent = 0);
+ /** Default Destructor */
+ ~GeneralPage();
+ /** Saves the changes on this page */
+ bool save(QString &errmsg);
+ /** Loads the settings for this page */
+ void load();
+ /** Called when the user changes the UI translation. */
+ virtual void retranslateUi();
+
+signals:
+ /** Emitted when the user clicks the "Check Now" button. */
+ void checkForUpdates();
+
+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();
+
+private:
+ /** Displays a file dialog allowing the user to browse for an executable
+ * file. <b>caption</b> will be displayed in the dialog's title bar and <b>
+ * file</b>, if specified, is the default file selected in the dialog. */
+ QString browseExecutable(const QString &caption,
+ const QString &file = QString());
+
+ /** A VidaliaSettings object used for saving/loading vidalia settings */
+ VidaliaSettings *_vidaliaSettings;
+ /** A TorSettings ovject used for saving/loading tor settings */
+ TorSettings *_torSettings;
+ /** Qt Designer generated object */
+ Ui::GeneralPage ui;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/GeneralPage.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/GeneralPage.ui
new file mode 100644
index 0000000..e46b222
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/GeneralPage.ui
@@ -0,0 +1,219 @@
+<ui version="4.0" >
+ <class>GeneralPage</class>
+ <widget class="QWidget" name="GeneralPage" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>492</width>
+ <height>402</height>
+ </rect>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <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" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="grpTorLocation" >
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="title" >
+ <string>Tor</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout" >
+ <item>
+ <widget class="QCheckBox" name="chkRunTorAtVidaliaStartup" >
+ <property name="text" >
+ <string>Start the Tor software when Vidalia starts</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="QLineEdit" name="lineTorExecutable" />
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnBrowseTorExecutable" >
+ <property name="text" >
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </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" >
+ <string>Software Updates</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout" >
+ <item>
+ <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" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnUpdateNow" >
+ <property name="text" >
+ <string>Check Now</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </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>
+ </widget>
+ <resources>
+ <include location="../res/vidalia.qrc" />
+ </resources>
+ <connections/>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/IpValidator.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/IpValidator.cpp
new file mode 100644
index 0000000..2971e81
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/IpValidator.cpp
@@ -0,0 +1,51 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 IpValidator.cpp
+** \version $Id: IpValidator.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Validates an entered IP address
+*/
+
+#include "IpValidator.h"
+
+/** Regular expression to validate that input is a valid IP address. */
+#define IP_REGEXP "\\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"\
+ "\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"\
+ "\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"\
+ "\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\b"
+
+#define MATCH_ALL "*" /**< Match all IP addresses. */
+
+
+/** Constructor. */
+IpValidator::IpValidator(QObject *parent)
+: QRegExpValidator(QRegExp(IP_REGEXP), parent)
+{
+}
+
+/** Validates the given input is either a valid IP or a "*". */
+QValidator::State
+IpValidator::validate(QString &input, int &pos) const
+{
+ if (input == MATCH_ALL) {
+ return QValidator::Acceptable;
+ }
+ return QRegExpValidator::validate(input, pos);
+}
+
+/** Validates the given input from position 0. */
+QValidator::State
+IpValidator::validate(QString &input) const
+{
+ int discard = 0;
+ return validate(input, discard);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/IpValidator.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/IpValidator.h
new file mode 100644
index 0000000..f64e1e9
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/IpValidator.h
@@ -0,0 +1,35 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 IpValidator.h
+** \version $Id: IpValidator.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Validates an entered IP address
+*/
+
+#ifndef _IPVALIDATOR_H
+#define _IPVALIDATOR_H
+
+#include <QRegExpValidator>
+
+
+class IpValidator : public QRegExpValidator
+{
+public:
+ /** Constructor. */
+ IpValidator(QObject *parent);
+ /** Validates the given input from position 0. */
+ QValidator::State validate(QString &input) const;
+ /** Validates the given input is either a valid IP or a "*". */
+ QValidator::State validate(QString &input, int &pos) const;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NetworkPage.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NetworkPage.cpp
new file mode 100644
index 0000000..d181b5d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NetworkPage.cpp
@@ -0,0 +1,481 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 NetworkPage.cpp
+** \version $Id: NetworkPage.cpp 4141 2009-10-04 17:39:14Z edmanm $
+** \brief Network and firewall configuration options
+*/
+
+#include "NetworkPage.h"
+#include "NetworkSettings.h"
+#include "VMessageBox.h"
+#include "Vidalia.h"
+#include "BridgeDownloaderProgressDialog.h"
+#include "DomainValidator.h"
+
+#include "stringutil.h"
+
+#include <QMenu>
+#include <QIntValidator>
+#include <QClipboard>
+#include <QHostAddress>
+#include <QRegExp>
+#include <QMessageBox>
+
+#define IMG_COPY ":/images/22x22/edit-copy.png"
+
+
+/** Constructor */
+NetworkPage::NetworkPage(QWidget *parent)
+: ConfigPage(parent, "Network")
+{
+ /* Invoke the Qt Designer generated object setup routine */
+ ui.setupUi(this);
+
+ connect(ui.btnAddBridge, SIGNAL(clicked()), this, SLOT(addBridge()));
+ connect(ui.btnRemoveBridge, SIGNAL(clicked()), this, SLOT(removeBridge()));
+ connect(ui.btnCopyBridge, SIGNAL(clicked()),
+ this, SLOT(copySelectedBridgesToClipboard()));
+ connect(ui.listBridges, SIGNAL(customContextMenuRequested(QPoint)),
+ this, SLOT(bridgeContextMenuRequested(QPoint)));
+ connect(ui.listBridges, SIGNAL(itemSelectionChanged()),
+ this, SLOT(bridgeSelectionChanged()));
+ connect(ui.lineBridge, SIGNAL(returnPressed()), this, SLOT(addBridge()));
+ connect(ui.lblHelpFindBridges, SIGNAL(linkActivated(QString)),
+ this, SLOT(onLinkActivated(QString)));
+ connect(ui.btnFindBridges, SIGNAL(clicked()), this, SLOT(findBridges()));
+ connect(ui.cmboProxyType, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(proxyTypeChanged(int)));
+
+ ui.lineProxyAddress->setValidator(new DomainValidator(this));
+ ui.lineProxyPort->setValidator(new QIntValidator(1, 65535, this));
+
+ vApp->createShortcut(QKeySequence(QKeySequence::Copy),
+ ui.listBridges, this,
+ SLOT(copySelectedBridgesToClipboard()));
+
+ if (! BridgeDownloader::isMethodSupported(BridgeDownloader::DownloadMethodHttps)) {
+ ui.btnFindBridges->setVisible(false);
+ ui.lblHelpFindBridges->setText(
+ tr("<a href=\"bridges.finding\">How can I find bridges?</a>"));
+ _bridgeDownloader = 0;
+ } else {
+ _bridgeDownloader = new BridgeDownloader(this);
+ connect(_bridgeDownloader, SIGNAL(bridgeRequestFinished(QStringList)),
+ this, SLOT(bridgeRequestFinished(QStringList)));
+ }
+
+#if defined(Q_WS_MAC)
+ /* On OS X, the network page looks better without frame titles. Everywhere
+ * else needs titles or else there's a break in the frame border. */
+ ui.grpProxySettings->setTitle("");
+ ui.grpFirewallSettings->setTitle("");
+ ui.grpBridgeSettings->setTitle("");
+#endif
+}
+
+/** Called when the user changes the UI translation. */
+void
+NetworkPage::retranslateUi()
+{
+ ui.retranslateUi(this);
+}
+
+/** Applies the network configuration settings to Tor. Returns true if the *
+ * settings were applied successfully. Otherwise, <b>errmsg</b> is set and *
+ * false is returned. */
+bool
+NetworkPage::apply(QString &errmsg)
+{
+ return NetworkSettings(Vidalia::torControl()).apply(&errmsg);
+}
+
+/** Returns true if the user has changed their server settings since the *
+ * last time they were applied to Tor. */
+bool
+NetworkPage::changedSinceLastApply()
+{
+ return NetworkSettings(Vidalia::torControl()).changedSinceLastApply();
+}
+
+/** Reverts the server configuration settings to their values at the last *
+ * time they were successfully applied to Tor. */
+void
+NetworkPage::revert()
+{
+ NetworkSettings settings(Vidalia::torControl());
+ settings.revert();
+}
+
+/** Called when a link in a label is clicked. <b>url</b> is the target of
+ * the clicked link. */
+void
+NetworkPage::onLinkActivated(const QString &url)
+{
+ emit helpRequested(url);
+}
+
+/** Verifies that <b>bridge</b> is a valid bridge identifier and places a
+ * normalized identifier in <b>out</b>. The normalized identifier will have
+ * all spaces removed from the fingerprint portion (if any) and all
+ * hexadecimal characters converted to uppercase. Returns true if
+ * <b>bridge</b> is a valid bridge identifier, false otherwise. */
+bool
+NetworkPage::validateBridge(const QString &bridge, QString *out)
+{
+ QString temp = bridge;
+ if (temp.startsWith("bridge ", Qt::CaseInsensitive))
+ temp = temp.remove(0, 7); /* remove "bridge " */
+
+ QStringList parts = temp.split(" ", QString::SkipEmptyParts);
+ if (parts.isEmpty())
+ return false;
+
+ QString s = parts.at(0);
+ QRegExp re("(\\d{1,3}\\.){3}\\d{1,3}(:\\d{1,5})?");
+ if (re.exactMatch(s)) {
+ if (s.endsWith(":"))
+ return false;
+
+ int index = s.indexOf(":");
+ QString host = s.mid(0, index);
+ if (QHostAddress(host).isNull()
+ || QHostAddress(host).protocol() != QAbstractSocket::IPv4Protocol) {
+ return false;
+ }
+ if (index > 0) {
+ QString port = s.mid(index + 1);
+ if (port.toUInt() < 1 || port.toUInt() > 65535)
+ return false;
+ }
+
+ temp = s;
+ if (parts.size() > 1) {
+ QString fp = static_cast<QStringList>(parts.mid(1)).join("");
+ if (fp.length() != 40 || !string_is_hex(fp))
+ return false;
+ temp += " " + fp.toUpper();
+ }
+ } else {
+ return false;
+ }
+ *out = temp;
+ return true;
+}
+
+/** Adds a bridge to the bridge list box. */
+void
+NetworkPage::addBridge()
+{
+ QString bridge;
+ QString input = ui.lineBridge->text().trimmed();
+
+ if (input.isEmpty())
+ return;
+ if (!validateBridge(input, &bridge)) {
+ VMessageBox::warning(this,
+ tr("Invalid Bridge"),
+ tr("The specified bridge identifier is not valid."),
+ VMessageBox::Ok|VMessageBox::Default);
+ return;
+ }
+ if (!ui.listBridges->findItems(bridge, Qt::MatchFixedString).isEmpty())
+ return; /* duplicate bridge */
+
+ ui.listBridges->addItem(bridge);
+ ui.lineBridge->clear();
+}
+
+/** Removes one or more selected bridges from the bridge list box. */
+void
+NetworkPage::removeBridge()
+{
+ qDeleteAll(ui.listBridges->selectedItems());
+}
+
+/** Copies all selected bridges to the clipboard. */
+void
+NetworkPage::copySelectedBridgesToClipboard()
+{
+ QString contents;
+
+ foreach (QListWidgetItem *item, ui.listBridges->selectedItems()) {
+#if defined(Q_WS_WIN)
+ contents += item->text() + "\r\n";
+#else
+ contents += item->text() + "\n";
+#endif
+ }
+ if (!contents.isEmpty())
+ vApp->clipboard()->setText(contents.trimmed());
+}
+
+/** Called when the user right-clicks on a bridge and displays a context
+ * menu. */
+void
+NetworkPage::bridgeContextMenuRequested(const QPoint &pos)
+{
+ QMenu menu(this);
+
+ QListWidgetItem *item = ui.listBridges->itemAt(pos);
+ if (!item)
+ return;
+
+ QAction *copyAction =
+ new QAction(QIcon(IMG_COPY), tr("Copy (Ctrl+C)"), &menu);
+ connect(copyAction, SIGNAL(triggered()),
+ this, SLOT(copySelectedBridgesToClipboard()));
+
+ menu.addAction(copyAction);
+ menu.exec(ui.listBridges->mapToGlobal(pos));
+}
+
+/** Called when the user changes which bridges they have selected. */
+void
+NetworkPage::bridgeSelectionChanged()
+{
+ bool enabled = !ui.listBridges->selectedItems().isEmpty();
+ ui.btnCopyBridge->setEnabled(enabled);
+ ui.btnRemoveBridge->setEnabled(enabled);
+}
+
+/** Saves changes made to settings on the Firewall settings page. */
+bool
+NetworkPage::save(QString &errmsg)
+{
+ NetworkSettings settings(Vidalia::torControl());
+ QString addr;
+ QString user, pass;
+ NetworkSettings::ProxyType proxy = NetworkSettings::NoProxy;
+ QStringList bridgeList;
+ QList<quint16> reachablePorts;
+ bool ok;
+
+ if (ui.chkUseProxy->isChecked()) {
+ if (ui.lineProxyAddress->text().isEmpty()
+ || ui.lineProxyPort->text().isEmpty()) {
+ errmsg = tr("You must specify both an IP address or hostname and a "
+ "port number to configure Tor to use a proxy to access "
+ "the Internet.");
+ return false;
+ }
+ if (ui.cmboProxyType->currentIndex() < 0) {
+ errmsg = tr("You must select the proxy type.");
+ return false;
+ }
+ }
+ if (ui.chkFascistFirewall->isChecked()
+ && ui.lineReachablePorts->text().isEmpty()) {
+ errmsg = tr("You must specify one or more ports to which your "
+ "firewall allows you to connect.");
+ return false;
+ }
+
+ if (ui.chkUseProxy->isChecked()) {
+ if (!ui.lineProxyAddress->text().isEmpty()) {
+ addr = ui.lineProxyAddress->text();
+ if (!ui.lineProxyPort->text().isEmpty())
+ addr += ":" + ui.lineProxyPort->text();
+ }
+
+ user = ui.lineProxyUsername->text();
+ pass = ui.lineProxyPassword->text();
+
+ QVariant data;
+ int type;
+
+ data = ui.cmboProxyType->itemData(ui.cmboProxyType->currentIndex());
+ Q_ASSERT(data.isValid());
+ type = data.toInt();
+ Q_ASSERT(type >= NetworkSettings::ProxyTypeMin &&
+ type <= NetworkSettings::ProxyTypeMax);
+ proxy = static_cast<NetworkSettings::ProxyType>(type);
+ }
+
+ settings.setProxyType(proxy);
+ settings.setProxyAddress(addr);
+ settings.setProxyUsername(user);
+ settings.setProxyPassword(pass);
+
+ /* Save the reachable port settings */
+ settings.setFascistFirewall(ui.chkFascistFirewall->isChecked());
+ foreach (QString portString,
+ ui.lineReachablePorts->text().split(",", QString::SkipEmptyParts)) {
+ quint32 port = portString.toUInt(&ok);
+ if (!ok || port < 1 || port > 65535) {
+ errmsg = tr("'%1' is not a valid port number.").arg(portString);
+ return false;
+ }
+ reachablePorts << (quint16)port;
+ }
+ settings.setReachablePorts(reachablePorts);
+
+ /* Save the bridge settings */
+ settings.setUseBridges(ui.chkUseBridges->isChecked());
+ for (int i = 0; i < ui.listBridges->count(); i++)
+ bridgeList << ui.listBridges->item(i)->text();
+ settings.setBridgeList(bridgeList);
+
+ return true;
+}
+
+/** Loads previously saved settings */
+void
+NetworkPage::load()
+{
+ NetworkSettings settings(Vidalia::torControl());
+ QStringList reachablePortStrings;
+ NetworkSettings::ProxyType proxyType;
+
+ /* Load proxy settings */
+ proxyType = settings.getProxyType();
+ ui.chkUseProxy->setChecked(proxyType != NetworkSettings::NoProxy);
+ 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());
+
+ /* 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. */
+ ui.cmboProxyType->clear();
+ if (!vApp->torControl()->isRunning()
+ || vApp->torControl()->getTorVersion() >= 0x020201) {
+ ui.cmboProxyType->addItem(tr("SOCKS 4"), NetworkSettings::Socks4Proxy);
+ ui.cmboProxyType->addItem(tr("SOCKS 5"), NetworkSettings::Socks5Proxy);
+ } else if (proxyType == NetworkSettings::Socks4Proxy
+ || proxyType == NetworkSettings::Socks5Proxy) {
+ /* Disable proxy if the settings include a SOCKS proxy and our version of
+ * Tor is not compatible. */
+ proxyType = NetworkSettings::NoProxy;
+ ui.chkUseProxy->setChecked(false);
+ }
+ ui.cmboProxyType->addItem(tr("HTTP"), NetworkSettings::HttpProxy);
+ ui.cmboProxyType->addItem(tr("HTTP / HTTPS"),
+ NetworkSettings::HttpHttpsProxy);
+
+ ui.cmboProxyType->setCurrentIndex(ui.cmboProxyType->findData(proxyType));
+
+ /* Load firewall settings */
+ 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.listBridges->clear();
+ ui.listBridges->addItems(settings.getBridgeList());
+}
+
+/** Called when the user clicks the "Find Bridges Now" button.
+ * Attempts to establish an HTTPS connection to bridges.torproject.org
+ * and download one or more bridge addresses. */
+void
+NetworkPage::findBridges()
+{
+ BridgeDownloaderProgressDialog *dlg = new BridgeDownloaderProgressDialog(this);
+
+ connect(_bridgeDownloader, SIGNAL(statusChanged(QString)),
+ dlg, SLOT(setStatus(QString)));
+ connect(_bridgeDownloader, SIGNAL(downloadProgress(int, int)),
+ dlg, SLOT(setDownloadProgress(int, int)));
+ connect(_bridgeDownloader, SIGNAL(bridgeRequestFailed(QString)),
+ dlg, SLOT(bridgeRequestFailed(QString)));
+ connect(_bridgeDownloader, SIGNAL(bridgeRequestFinished(QStringList)),
+ dlg, SLOT(bridgeRequestFinished(QStringList)));
+ connect(dlg, SIGNAL(retry()), this, SLOT(startBridgeRequest()));
+
+ startBridgeRequest();
+ switch (dlg->exec()) {
+ case QDialogButtonBox::Cancel:
+ _bridgeDownloader->cancelBridgeRequest();
+ break;
+
+ case QDialogButtonBox::Help:
+ emit helpRequested("bridges.finding");
+ break;
+ }
+
+ delete dlg;
+}
+
+/** Starts a new request for additional bridge addresses. */
+void
+NetworkPage::startBridgeRequest()
+{
+ if (ui.chkUseProxy->isChecked() &&
+ ui.cmboProxyType->currentIndex() == NetworkSettings::HttpHttpsProxy) {
+ _bridgeDownloader->setProxy(ui.lineProxyAddress->text(),
+ ui.lineProxyPort->text().toUInt(),
+ ui.lineProxyUsername->text(),
+ ui.lineProxyPassword->text());
+ }
+
+ _bridgeDownloader->downloadBridges(BridgeDownloader::DownloadMethodHttps);
+}
+
+/** Called when a previous bridge request initiated by the findBridges()
+ * method has completed. <b>bridges</b> contains a list of all bridges
+ * received. */
+void
+NetworkPage::bridgeRequestFinished(const QStringList &bridges)
+{
+ bool foundNewBridges = false;
+ QString normalized;
+
+ foreach (QString bridge, bridges) {
+ if (! validateBridge(bridge, &normalized))
+ continue;
+
+ QString address = normalized.split(" ").at(0);
+ if (ui.listBridges->findItems(address, Qt::MatchContains).isEmpty()) {
+ ui.listBridges->addItem(normalized);
+ foundNewBridges = true;
+ }
+ }
+
+ if (! foundNewBridges) {
+ QMessageBox dlg(this);
+ dlg.setIcon(QMessageBox::Information);
+ dlg.setText(tr("No new bridges are currently available. You can either "
+ "wait a while and try again, or try another method of "
+ "finding new bridges."));
+ dlg.setInformativeText(tr("Click Help to see other methods of finding "
+ "new bridges."));
+ dlg.setStandardButtons(QMessageBox::Ok | QMessageBox::Help);
+
+ if (dlg.exec() == QMessageBox::Help)
+ emit helpRequested("bridges.finding");
+ }
+}
+
+/** Disable proxy username and password fields when the user wants to use
+ * a SOCKS 4 proxy. */
+void
+NetworkPage::proxyTypeChanged(int selection)
+{
+ QVariant data = ui.cmboProxyType->itemData(selection);
+
+ if (data.isValid()
+ && data.toInt() == NetworkSettings::Socks4Proxy) {
+ ui.lineProxyUsername->setEnabled(false);
+ ui.lineProxyPassword->setEnabled(false);
+ } else {
+ ui.lineProxyUsername->setEnabled(true);
+ ui.lineProxyPassword->setEnabled(true);
+ }
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NetworkPage.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NetworkPage.h
new file mode 100644
index 0000000..66892b1
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NetworkPage.h
@@ -0,0 +1,101 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 NetworkPage.h
+** \version $Id: NetworkPage.h 4140 2009-10-03 21:49:21Z edmanm $
+** \brief Network and firewall configuration options
+*/
+
+#ifndef _NETWORKPAGE_H
+#define _NETWORKPAGE_H
+
+#include "ui_NetworkPage.h"
+#include "ConfigPage.h"
+#include "Vidalia.h"
+#include "BridgeDownloader.h"
+
+#include <QPoint>
+
+
+class NetworkPage : public ConfigPage
+{
+ Q_OBJECT
+
+public:
+ /** Default Constructor */
+ NetworkPage(QWidget *parent = 0);
+
+ /** Saves the changes on this page */
+ bool save(QString &errmsg);
+ /** Loads the settings for this page */
+ void load();
+
+ /** Applies the network configuration settings to Tor. Returns true if the
+ * settings were applied successfully. Otherwise, <b>errmsg</b> is set and
+ * false is returned. */
+ bool apply(QString &errmsg);
+ /** Reverts the server configuration settings to their values at the last
+ * time they were successfully applied to Tor. */
+ void revert();
+ /** Returns true if the user has changed their server settings since the
+ * last time they were applied to Tor. */
+ bool changedSinceLastApply();
+ /** Called when the user changes the UI translation. */
+ virtual void retranslateUi();
+
+private slots:
+ /** Adds a bridge to the bridge list box. */
+ void addBridge();
+ /** Removes one or more selected bridges from the bridge list box. */
+ void removeBridge();
+ /** Copies all selected bridges to the clipboard. */
+ void copySelectedBridgesToClipboard();
+ /** Called when the user right-clicks on a bridge and displays a context
+ * menu. */
+ void bridgeContextMenuRequested(const QPoint &pos);
+ /** Called when the user changes which bridges they have selected. */
+ void bridgeSelectionChanged();
+ /** Called when a link in a label is clicked. <b>url</b> is the target of
+ * the clicked link.*/
+ void onLinkActivated(const QString &url);
+ /** Called when the user clicks the "Find Bridges Now" button. Calls
+ * startBridgeRequest() to start a new request for additional bridge
+ * addresses, and displays a progress dialog for the user. */
+ void findBridges();
+ /** Starts a new request for additional bridge addresses. */
+ void startBridgeRequest();
+ /** Called when a previous bridge request initiated by the findBridges()
+ * method has completed. <b>bridges</b> contains a list of all bridges
+ * received. */
+ void bridgeRequestFinished(const QStringList &bridges);
+
+ /** Disable proxy username and password fields when the user wants to use
+ * a SOCKS 4 proxy. */
+ void proxyTypeChanged(int selection);
+
+private:
+ /** Verifies that <b>bridge</b> is a valid bridge identifier and places a
+ * normalized identifier in <b>out</b>. The normalized identifier will have
+ * all spaces removed from the fingerprint portion (if any) and all
+ * hexadecimal characters converted to uppercase. Returns true if
+ * <b>bridge</b> is a valid bridge identifier, false otherwise. */
+ bool validateBridge(const QString &bridge, QString *out);
+
+ /** Helper class used to facilitate downloading one or more bridge
+ * addresses. */
+ BridgeDownloader* _bridgeDownloader;
+
+ /** Qt Designer generated object */
+ Ui::NetworkPage ui;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NetworkPage.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NetworkPage.ui
new file mode 100644
index 0000000..164fc08
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NetworkPage.ui
@@ -0,0 +1,527 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>NetworkPage</class>
+ <widget class="QWidget" name="NetworkPage">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>616</width>
+ <height>659</height>
+ </rect>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <layout class="QVBoxLayout">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>9</number>
+ </property>
+ <item>
+ <widget class="QCheckBox" name="chkUseProxy">
+ <property name="toolTip">
+ <string>Check if your local network requires a proxy to access the Internet</string>
+ </property>
+ <property name="text">
+ <string>I use a proxy to access the Internet</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="grpProxySettings">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>136</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>136</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Proxy Settings</string>
+ </property>
+ <layout class="QGridLayout">
+ <property name="margin">
+ <number>9</number>
+ </property>
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="lblProxyAddress">
+ <property name="text">
+ <string>Address:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" colspan="2">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLineEdit" name="lineProxyAddress"/>
+ </item>
+ <item>
+ <widget class="QLabel" name="lblProxyPort">
+ <property name="text">
+ <string>Port:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineProxyPort">
+ <property name="maximumSize">
+ <size>
+ <width>75</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="maxLength">
+ <number>5</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="lblProxyUsername">
+ <property name="text">
+ <string>Username:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" colspan="2">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLineEdit" name="lineProxyUsername"/>
+ </item>
+ <item>
+ <widget class="QLabel" name="lblProxyPassword">
+ <property name="text">
+ <string>Password:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineProxyPassword">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="2">
+ <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="2" column="0">
+ <widget class="QLabel" name="lblProxyType">
+ <property name="text">
+ <string>Type:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="cmboProxyType"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkFascistFirewall">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Check to only connect to relays using ports allowed by your firewall</string>
+ </property>
+ <property name="text">
+ <string>My firewall only lets me connect to certain ports</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="grpFirewallSettings">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>75</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Firewall Settings</string>
+ </property>
+ <layout class="QHBoxLayout">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>9</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="lblReachablePorts">
+ <property name="text">
+ <string>Allowed Ports:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineReachablePorts">
+ <property name="inputMask">
+ <string/>
+ </property>
+ <property name="text">
+ <string>80, 443</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkUseBridges">
+ <property name="toolTip">
+ <string>Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network</string>
+ </property>
+ <property name="text">
+ <string>My ISP blocks connections to the Tor network</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="grpBridgeSettings">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>200</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Bridge Settings</string>
+ </property>
+ <layout class="QVBoxLayout">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>9</number>
+ </property>
+ <item>
+ <layout class="QHBoxLayout">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="lblAddBridge">
+ <property name="text">
+ <string>Add a Bridge:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <layout class="QVBoxLayout">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLineEdit" name="lineBridge">
+ <property name="maxLength">
+ <number>100</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QListWidget" name="listBridges">
+ <property name="contextMenuPolicy">
+ <enum>Qt::CustomContextMenu</enum>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QToolButton" name="btnAddBridge">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/list-add.png</normaloff>:/images/22x22/list-add.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="btnRemoveBridge">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Remove the selected bridges from the list</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/list-remove.png</normaloff>:/images/22x22/list-remove.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="btnCopyBridge">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Copy the selected bridges to the clipboard</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/edit-copy.png</normaloff>:/images/22x22/edit-copy.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <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>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QPushButton" name="btnFindBridges">
+ <property name="text">
+ <string>Find Bridges Now</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="lblHelpFindBridges">
+ <property name="cursor">
+ <cursorShape>PointingHandCursor</cursorShape>
+ </property>
+ <property name="text">
+ <string><a href="bridges.finding">How else can I find bridges?</a></string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <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>
+ </widget>
+ <tabstops>
+ <tabstop>chkUseProxy</tabstop>
+ <tabstop>lineProxyAddress</tabstop>
+ <tabstop>lineProxyPort</tabstop>
+ <tabstop>lineProxyUsername</tabstop>
+ <tabstop>lineProxyPassword</tabstop>
+ <tabstop>chkFascistFirewall</tabstop>
+ <tabstop>lineReachablePorts</tabstop>
+ <tabstop>chkUseBridges</tabstop>
+ <tabstop>lineBridge</tabstop>
+ <tabstop>btnAddBridge</tabstop>
+ <tabstop>btnRemoveBridge</tabstop>
+ <tabstop>btnCopyBridge</tabstop>
+ <tabstop>listBridges</tabstop>
+ </tabstops>
+ <resources>
+ <include location="../res/vidalia.qrc"/>
+ </resources>
+ <connections>
+ <connection>
+ <sender>chkFascistFirewall</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>grpFirewallSettings</receiver>
+ <slot>setVisible(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>222</x>
+ <y>21</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>222</x>
+ <y>82</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>chkUseProxy</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>grpProxySettings</receiver>
+ <slot>setVisible(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>222</x>
+ <y>143</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>222</x>
+ <y>216</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>chkUseBridges</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>grpBridgeSettings</receiver>
+ <slot>setVisible(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>283</x>
+ <y>302</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>283</x>
+ <y>419</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NetworkSettings.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NetworkSettings.cpp
new file mode 100644
index 0000000..c5ff636
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NetworkSettings.cpp
@@ -0,0 +1,340 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 NetworkSettings.cpp
+** \version $Id: NetworkSettings.cpp 4140 2009-10-03 21:49:21Z edmanm $
+** \brief Settings for configuring an HTTP/HTTPS proxy or bridges
+*/
+
+#include "NetworkSettings.h"
+
+#define SETTING_FASCIST_FIREWALL "FascistFirewall"
+#define SETTING_REACHABLE_ADDRESSES "ReachableAddresses"
+
+/* Vidalia-specific proxy options */
+#define SETTING_PROXY_TYPE "ProxyType"
+#define SETTING_PROXY_ADDRESS "ProxyAddress"
+#define SETTING_PROXY_USERNAME "ProxyUsername"
+#define SETTING_PROXY_PASSWORD "ProxyPassword"
+
+/* Tor's proxy options */
+#define SETTING_HTTP_PROXY "HttpProxy"
+#define SETTING_HTTP_PROXY_AUTH "HttpProxyAuthenticator"
+#define SETTING_HTTPS_PROXY "HttpsProxy"
+#define SETTING_HTTPS_PROXY_AUTH "HttpsProxyAuthenticator"
+#define SETTING_SOCKS4_PROXY "Socks4Proxy"
+#define SETTING_SOCKS5_PROXY "Socks5Proxy"
+#define SETTING_SOCKS5_USERNAME "Socks5ProxyUsername"
+#define SETTING_SOCKS5_PASSWORD "Socks5ProxyPassword"
+
+#define SETTING_USE_BRIDGES "UseBridges"
+#define SETTING_BRIDGE_LIST "Bridge"
+#define SETTING_UPDATE_BRIDGES "UpdateBridgesFromAuthority"
+#define SETTING_TUNNEL_DIR_CONNS "TunnelDirConns"
+#define SETTING_PREFER_TUNNELED_DIR_CONNS "PreferTunneledDirConns"
+
+
+/** Default constructor */
+NetworkSettings::NetworkSettings(TorControl *torControl)
+: AbstractTorSettings("Network", torControl)
+{
+ setDefault(SETTING_PROXY_TYPE, NoProxy);
+ setDefault(SETTING_PROXY_ADDRESS, "");
+ setDefault(SETTING_PROXY_USERNAME, "");
+ setDefault(SETTING_PROXY_PASSWORD, "");
+ setDefault(SETTING_USE_BRIDGES, false);
+ setDefault(SETTING_BRIDGE_LIST, QStringList());
+ setDefault(SETTING_FASCIST_FIREWALL, false);
+ setDefault(SETTING_TUNNEL_DIR_CONNS, true);
+ setDefault(SETTING_REACHABLE_ADDRESSES,
+ QStringList() << "*:80" << "*:443");
+}
+
+/** Applies the current network 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
+NetworkSettings::apply(QString *errmsg)
+{
+ QMultiHash<QString, QString> conf;
+ quint32 torVersion = torControl()->getTorVersion();
+
+ conf.insert(SETTING_REACHABLE_ADDRESSES,
+ (getFascistFirewall() ?
+ localValue(SETTING_REACHABLE_ADDRESSES).toStringList().join(",") : ""));
+
+ QString socks4, socks5, http, https;
+ QString addr, user, pass, auth;
+
+ addr = localValue(SETTING_PROXY_ADDRESS).toString();
+ user = localValue(SETTING_PROXY_USERNAME).toString();
+ pass = localValue(SETTING_PROXY_PASSWORD).toString();
+
+ if (!user.isEmpty() || !pass.isEmpty())
+ auth = QString("%1:%2").arg(user).arg(pass);
+
+ switch (getProxyType()) {
+ case NoProxy:
+ break;
+ case Socks4Proxy:
+ socks4 = addr;
+ break;
+ case Socks5Proxy:
+ socks5 = addr;
+ break;
+ case HttpProxy:
+ http = addr;
+ break;
+ case HttpHttpsProxy:
+ http = addr;
+ https = http;
+ 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);
+ }
+
+ conf.insert(SETTING_HTTP_PROXY, http);
+ conf.insert(SETTING_HTTPS_PROXY, https);
+ conf.insert(SETTING_HTTP_PROXY_AUTH, auth);
+ conf.insert(SETTING_HTTPS_PROXY_AUTH, auth);
+
+ if (getUseBridges()) {
+ /* 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");
+ } 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");
+ }
+
+ 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");
+ foreach (QString bridge, bridges) {
+ conf.insert(SETTING_BRIDGE_LIST, bridge);
+ }
+ } else {
+ conf.insert(SETTING_USE_BRIDGES, "0");
+ conf.insert(SETTING_BRIDGE_LIST, "");
+ conf.insert(SETTING_UPDATE_BRIDGES, "0");
+ }
+ }
+ return torControl()->setConf(conf, errmsg);
+}
+
+/** Returns true if we need to set ReachableAddresses because we're behind a
+ * restrictive firewall that limits the ports Tor can connect to. */
+bool
+NetworkSettings::getFascistFirewall()
+{
+ return localValue(SETTING_FASCIST_FIREWALL).toBool();
+}
+
+/** Sets to <b>fascistFirewall</b> whether Tor should only create outgoing
+ * connections to the list of ports specified in setReachablePorts().
+ * \sa setReachablePorts() */
+void
+NetworkSettings::setFascistFirewall(bool fascistFirewall)
+{
+ setValue(SETTING_FASCIST_FIREWALL, fascistFirewall);
+}
+
+/** Returns a list of ports to be specified in ReachableAddresses. */
+QList<quint16>
+NetworkSettings::getReachablePorts()
+{
+ QList<quint16> reachablePorts;
+ QStringList lineList;
+ bool ok;
+
+ lineList = value(SETTING_REACHABLE_ADDRESSES).toStringList();
+ foreach (QString line, lineList) {
+ foreach (QString address, line.split(",", QString::SkipEmptyParts)) {
+ QStringList parts = address.split(":");
+ if (parts.size() >= 2) {
+ quint16 port = parts.at(1).toUInt(&ok);
+ if (ok)
+ reachablePorts << port;
+ }
+ }
+ }
+ return reachablePorts;
+}
+
+/** Sets the list of ports that will be specified in ReachableAddresses to
+ * <b>reachablePorts</b>. */
+void
+NetworkSettings::setReachablePorts(const QList<quint16> &reachablePorts)
+{
+ if (!reachablePorts.isEmpty()) {
+ QStringList portList;
+ foreach (quint16 port, reachablePorts) {
+ portList << "*:" + QString::number(port);
+ }
+ setValue(SETTING_REACHABLE_ADDRESSES, portList);
+ }
+}
+
+/** Returns the proxy type Tor is using, or NoProxy if it makes direct
+ * connections. */
+NetworkSettings::ProxyType
+NetworkSettings::getProxyType()
+{
+ QString type = value(SETTING_PROXY_TYPE).toString();
+ return proxyTypeFromString(type);
+}
+
+/** Set the type of proxy Tor should use to <b>type</b>. */
+void
+NetworkSettings::setProxyType(ProxyType type)
+{
+ setValue(SETTING_PROXY_TYPE, proxyTypeToString(type));
+}
+
+/** Returns the address of the proxy server Tor makes connections through. */
+QString
+NetworkSettings::getProxyAddress()
+{
+ return value(SETTING_PROXY_ADDRESS).toString();
+}
+
+/** Sets the proxy address and port to <b>addr</b>. */
+void
+NetworkSettings::setProxyAddress(const QString &addr)
+{
+ setValue(SETTING_PROXY_ADDRESS, addr);
+}
+
+/** Returns the username used to login to the proxy server. */
+QString
+NetworkSettings::getProxyUsername()
+{
+ return value(SETTING_PROXY_USERNAME).toString();
+}
+
+/** Sets the proxy server username to <b>user</b>. */
+void
+NetworkSettings::setProxyUsername(const QString &user)
+{
+ setValue(SETTING_PROXY_USERNAME, user);
+}
+
+/** Returns the password used to login to the proxy server. */
+QString
+NetworkSettings::getProxyPassword()
+{
+ return value(SETTING_PROXY_PASSWORD).toString();
+}
+
+/** Sets the proxy server password to <b>pass</b>. */
+void
+NetworkSettings::setProxyPassword(const QString &pass)
+{
+ setValue(SETTING_PROXY_PASSWORD, pass);
+}
+
+/** Returns true if Tor should try to use bridge nodes to access the Tor
+ * network. */
+bool
+NetworkSettings::getUseBridges()
+{
+ return value(SETTING_USE_BRIDGES).toBool();
+}
+
+/** Sets to <b>useBridges</b> whether Tor should try to use bridge nodes
+ * to access the Tor network. */
+void
+NetworkSettings::setUseBridges(bool useBridges)
+{
+ setValue(SETTING_USE_BRIDGES, useBridges);
+}
+
+/** Returns a list of bridge nodes Tor should use. */
+QStringList
+NetworkSettings::getBridgeList()
+{
+ return value(SETTING_BRIDGE_LIST).toStringList();
+}
+
+/** Sets to <b>bridgeList</b> the list of bridge nodes Tor should use. */
+void
+NetworkSettings::setBridgeList(const QStringList &bridgeList)
+{
+ setValue(SETTING_BRIDGE_LIST, bridgeList);
+}
+
+/** Returns true if Tor is configured to try to tunnel its directory
+ * connections through a one-hop circuit. */
+bool
+NetworkSettings::getTunnelDirConns()
+{
+ return value(SETTING_TUNNEL_DIR_CONNS).toBool();
+}
+
+/** Converts the ProxyType <b>type</b> to a string to store in the
+ * configuration file. */
+QString
+NetworkSettings::proxyTypeToString(ProxyType type)
+{
+ QString ret;
+
+ switch (type) {
+ case Socks4Proxy:
+ ret = "socks4";
+ break;
+ case Socks5Proxy:
+ ret = "socks5";
+ break;
+ case HttpProxy:
+ ret = "http";
+ break;
+ case HttpHttpsProxy:
+ ret = "httphttps";
+ break;
+ case NoProxy:
+ default:
+ ret = "none";
+ break;
+ }
+
+ return ret;
+}
+
+/** Converts the proxy type string <b>type</b> to its ProxyType counterpart. */
+NetworkSettings::ProxyType
+NetworkSettings::proxyTypeFromString(const QString &type)
+{
+ QString str = type.toLower();
+
+ if (str == "socks4")
+ return Socks4Proxy;
+ if (str == "socks5")
+ return Socks5Proxy;
+ if (str == "http")
+ return HttpProxy;
+ if (str == "httphttps")
+ return HttpHttpsProxy;
+
+ return NoProxy;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NetworkSettings.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NetworkSettings.h
new file mode 100644
index 0000000..2bb0840
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NetworkSettings.h
@@ -0,0 +1,112 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 NetworkSettings.h
+** \version $Id: NetworkSettings.h 4140 2009-10-03 21:49:21Z edmanm $
+** \brief Settings for configuring an HTTP/HTTPS proxy or bridges
+*/
+
+#ifndef _NETWORKSETTINGS_H
+#define _NETWORKSETTINGS_H
+
+#include "AbstractTorSettings.h"
+
+#include <QList>
+#include <QStringList>
+
+
+class NetworkSettings : public AbstractTorSettings
+{
+ Q_OBJECT
+
+public:
+ enum ProxyType
+ {
+ ProxyTypeMin = -1,
+ NoProxy = -1, /**< Have Tor connect directly to the Internet. */
+ Socks4Proxy = 0, /**< Use a SOCKS 4 proxy for OR connections. */
+ Socks5Proxy = 1, /**< Use a SOCKS 5 proxy for OR connections. */
+ HttpProxy = 2, /**< Use an HTTP proxy for non-tunneled dir fetches. */
+ HttpHttpsProxy = 3, /**< Use HTTP proxy for both dir and OR connections. */
+ ProxyTypeMax = 3
+ };
+
+public:
+ /** Default constructor. */
+ NetworkSettings(TorControl *torControl);
+
+ /** Applies the current network 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 apply(QString *errmsg = 0);
+
+ /** Returns true if we need to set ReachableAddresses because we're behind a
+ * restrictive firewall that limits the ports Tor can connect to. */
+ bool getFascistFirewall();
+ /** Sets to <b>fascistFirewall</b> whether Tor should only create outgoing
+ * connections to the list of ports specified to setReachablePorts().
+ * \sa setReachablePorts() */
+ void setFascistFirewall(bool fascistFirewall);
+
+ /** Returns a list of ports to be specified in ReachableAddresses. */
+ QList<quint16> getReachablePorts();
+ /** Sets the list of ports that will be specified in ReachableAddresses to
+ * <b>reachablePorts</b>. */
+ void setReachablePorts(const QList<quint16> &reachablePorts);
+
+ /** Returns the proxy type Tor is using, or NoProxy if it makes direct
+ * connections. */
+ ProxyType getProxyType();
+ /** Set the type of proxy Tor should use to <b>type</b>. */
+ void setProxyType(ProxyType type);
+
+ /** Returns the address of the proxy server Tor makes connections through. */
+ QString getProxyAddress();
+ /** Sets the proxy address and port to <b>addr</b>. */
+ void setProxyAddress(const QString &addr);
+
+ /** Returns the username used to login to the proxy server. */
+ QString getProxyUsername();
+ /** Sets the proxy server username to <b>user</b>. */
+ void setProxyUsername(const QString &user);
+
+ /** Returns the password used to login to the proxy server. */
+ QString getProxyPassword();
+ /** Sets the proxy server password to <b>pass</b>. */
+ void setProxyPassword(const QString &pass);
+
+ /** Returns true if Tor should try to use bridge nodes to access the Tor
+ * network. */
+ bool getUseBridges();
+ /** Sets to <b>useBridges</b> whether Tor should try to use bridge nodes
+ * to access the Tor network. */
+ void setUseBridges(bool useBridges);
+
+ /** Returns a list of bridge nodes Tor should use. */
+ QStringList getBridgeList();
+ /** Sets to <b>bridgeList</b> the list of bridge nodes Tor should use. */
+ void setBridgeList(const QStringList &bridgeList);
+
+ /** Returns true if Tor is configured to try to tunnel its directory
+ * connections through a one-hop circuit. */
+ bool getTunnelDirConns();
+
+private:
+ /** Converts the ProxyType <b>type</b> to a string to store in the
+ * configuration file. */
+ QString proxyTypeToString(ProxyType type);
+
+ /** Converts the proxy type string <b>type</b> to its ProxyType counterpart. */
+ ProxyType proxyTypeFromString(const QString &type);
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NicknameValidator.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NicknameValidator.cpp
new file mode 100644
index 0000000..760fade
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NicknameValidator.cpp
@@ -0,0 +1,44 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 NicknameValidator.cpp
+** \version $Id: NicknameValidator.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Validates that a server nickname contains only valid characters
+*/
+
+#include "NicknameValidator.h"
+#include "stringutil.h"
+
+/** Set of characters that are valid in a server's nickname. */
+#define VALID_NICKNAME_CHARS \
+ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+
+
+/** Constructor. */
+NicknameValidator::NicknameValidator(QObject *parent)
+ : QValidator(parent)
+{
+}
+
+/** Validates the given input contains only valid nickname characters starting
+ * at the specified position. */
+QValidator::State
+NicknameValidator::validate(QString &input, int &pos) const
+{
+ Q_UNUSED(pos);
+
+ /* Make sure the input only contains valid characters. If any characters
+ * were removed, then we know the input contained invalid characters. */
+ QString validString = ensure_valid_chars(input, VALID_NICKNAME_CHARS);
+ return (validString.length() == input.length() ? QValidator::Acceptable
+ : QValidator::Invalid);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NicknameValidator.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NicknameValidator.h
new file mode 100644
index 0000000..43f3c43
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/NicknameValidator.h
@@ -0,0 +1,35 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 NicknameValidator.h
+** \version $Id: NicknameValidator.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Validates that a server nickname contains only valid characters
+*/
+
+#ifndef _NICKNAMEVALIDATOR_H
+#define _NICKNAMEVALIDATOR_H
+
+#include <QValidator>
+
+
+class NicknameValidator : public QValidator
+{
+ Q_OBJECT
+
+public:
+ /** Constructor. */
+ NicknameValidator(QObject *parent);
+ /** Validates the given input at the specified position. */
+ QValidator::State validate(QString &input, int &pos) const;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/Policy.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/Policy.cpp
new file mode 100644
index 0000000..cec1302
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/Policy.cpp
@@ -0,0 +1,196 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 Policy.cpp
+** \version $Id: Policy.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Exit policy parsing
+*/
+
+#include "Policy.h"
+
+#include <QStringList>
+
+
+/** Default constructor. Creates an AcceptAll policy. */
+Policy::Policy()
+{
+ _action = Accept;
+ _address = QHostAddress::Any;
+ _fromPort = _toPort = 0;
+ _mask = 0;
+}
+
+/** Constructor. Creates a new Policy object from the given string. */
+Policy::Policy(QString policy)
+{
+ /* Set the defaults */
+ _action = Accept;
+ _address = QHostAddress::Any;
+ _fromPort = _toPort = 0;
+ _mask = 0;
+
+ /* Parse the given string to override the defaults. */
+ fromString(policy);
+}
+
+/** Constructor. Creates a new Policy object from the string parts. */
+Policy::Policy(QString action, QString address, QString ports)
+{
+ /* Set the defaults */
+ _action = Accept;
+ _address = QHostAddress::Any;
+ _fromPort = _toPort = 0;
+ _mask = 0;
+
+ fromString(action + " " + address + ":" + ports);
+}
+
+/** Constructor. Creates a new Policy object depending on the specified
+ * special policy type. */
+Policy::Policy(SpecialPolicy policy)
+{
+ _action = (policy == AcceptAll ? Accept : Reject);
+ _address = QHostAddress::Any;
+ _fromPort = _toPort = 0;
+ _mask = 0;
+}
+
+/** Constructor. Creates a new policy object based on the given rules. */
+Policy::Policy(Action action, QHostAddress addr, uchar mask,
+ quint16 fromPort, quint16 toPort)
+{
+ _action = action;
+ _address = addr;
+ _mask = mask;
+ _fromPort = fromPort;
+ _toPort = (toPort >= fromPort ? toPort : fromPort);
+}
+
+/** Returns true if this policy is identical to <b>policy</b>. */
+bool
+Policy::operator==(const Policy &policy) const
+{
+ return ((this->_action == policy._action) &&
+ (this->_address == policy._address) &&
+ (this->_mask == policy._mask) &&
+ (this->_fromPort == policy._fromPort) &&
+ (this->_toPort == policy._toPort));
+}
+
+/** Returns true if this policy matches <b>policy</b>. For example, if this
+ * policy is "reject *:6660-6669" and <b>policy</b> is "reject *:6662-6664",
+ * this will return true. For strict comparison, use the == operator. */
+bool
+Policy::matches(const Policy &policy) const
+{
+ /* This doesn't take into account addr/mask matches yet */
+ return ((this->_action == policy._action) &&
+ (this->_address == policy._address) &&
+ (this->_mask == policy._mask) &&
+ (this->_fromPort <= policy._fromPort) &&
+ (this->_toPort >= policy._toPort));
+}
+
+/** Parses the given exit policy string. */
+void
+Policy::fromString(QString policy)
+{
+ /* Separate the action and the address/mask/port info */
+ QStringList ruleParts = policy.split(" ");
+ _action = toAction(ruleParts.at(0));
+
+ /* If some address/mask/port stuff was specified, parse it. */
+ if (ruleParts.size() > 1) {
+ QStringList addrParts = ruleParts.at(1).split(":");
+
+ /* Parse the address and mask (if specified) */
+ QString addr = addrParts.at(0);
+ _address.setAddress(addr.mid(0, addr.indexOf("/")));
+ if (_address.isNull()) {
+ _address = QHostAddress::Any;
+ }
+ if (addr.contains("/")) {
+ _mask = addr.mid(addr.indexOf("/")+1).toUInt();
+ }
+
+ /* Parse the specified port range (if specified) */
+ if (addrParts.size() > 1) {
+ QString ports = addrParts.at(1);
+ _fromPort = ports.mid(0, ports.indexOf("-")).toUInt();
+ if (ports.contains("-")) {
+ _toPort = ports.mid(ports.indexOf("-")+1).toUInt();
+ } else {
+ _toPort = _fromPort;
+ }
+ }
+ }
+}
+
+/** Converts this policy to a form Tor understands. The format is:
+ * "accept|reject ADDR[/MASK][:PORT]"
+ *
+ * PORT can be a single port number, an interval of ports "FROM_PORT-TO_PORT",
+ * or "*". If PORT is omitted, that means "*"
+ */
+QString
+Policy::toString() const
+{
+ QString act = (_action == Accept ? "accept" : "reject");
+ return act + " " + address() + ":" + ports();
+}
+
+/** Converts the given action to a string. This function tolerates both the
+ * translated and untranslated forms of the string "accept" and "reject". */
+Policy::Action
+Policy::toAction(QString action)
+{
+ action = action.toLower();
+ if (action == tr("accept") || action == "accept") {
+ return Accept;
+ }
+ return Reject;
+}
+
+/** Returns the action associated with this policy. NOTE: This string will be
+ * translated to whatever the current language setting is. */
+QString
+Policy::action() const
+{
+ return (_action == Accept ? tr("accept") : tr("reject"));
+}
+
+/** Returns the address (and mask, if specified) for this policy. */
+QString
+Policy::address() const
+{
+ QString addrString;
+
+ if (_mask) {
+ addrString = _address.toString() + "/" + QString::number(_mask);
+ } else if (_address == QHostAddress::Any || _address.isNull()) {
+ addrString = "*";
+ } else {
+ addrString = _address.toString();
+ }
+ return addrString;
+}
+
+/** Returns the port (or port range, if specified) for this policy. */
+QString
+Policy::ports() const
+{
+ QString ports = (_fromPort ? QString::number(_fromPort) : "*");
+ if (_fromPort && (_toPort > _fromPort)) {
+ ports += "-" + QString::number(_toPort);
+ }
+ return ports;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/Policy.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/Policy.h
new file mode 100644
index 0000000..a250537
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/Policy.h
@@ -0,0 +1,81 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 Policy.h
+** \version $Id: Policy.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Exit policy parsing
+*/
+
+#ifndef _POLICY_H
+#define _POLICY_H
+
+#include <QCoreApplication>
+#include <QString>
+#include <QHostAddress>
+
+
+class Policy
+{
+ Q_DECLARE_TR_FUNCTIONS(Policy)
+
+public:
+ /** A set of possible actions for a policy */
+ enum Action {
+ Accept, /**< Connections matching this policy will be accepted. */
+ Reject /**< Connections matching this policy will be rejected. */
+ };
+ /** Special rule types. */
+ enum SpecialPolicy {
+ AcceptAll, /**< Accepts all connections. Equivalent to "accept *:*". */
+ RejectAll /**< Rejects all connections. Equivalent to "reject *:*". */
+ };
+
+ /** Default constructor. Creates an AcceptAll policy. */
+ Policy();
+ /** Parses the given policy, represented as a string. */
+ Policy(QString policy);
+ /** Parses the given portions of a policy string. */
+ Policy(QString action, QString address, QString ports);
+ /** Creates a policy of the given special type. */
+ Policy(SpecialPolicy policy);
+ /** Creates a policy using the specified information. */
+ Policy(Action action, QHostAddress addr, uchar mask,
+ quint16 fromPort, quint16 toPort = 0);
+
+ /** Returns true if this policy matches <b>policy</b>. */
+ bool matches(const Policy &policy) const;
+ /** Returns true if this policy is identical to <b>policy</b>. */
+ bool operator==(const Policy &policy) const;
+
+ /** Parses the given policy string. */
+ void fromString(QString policy);
+ /** Converts this policy to a format Tor understands. */
+ QString toString() const;
+ /** Converts a string action to an Action enum value. */
+ static Action toAction(QString action);
+
+ /** Returns the action taken when this policy matches an address. */
+ QString action() const;
+ /** Returns the host address (including mask, if set) for this policy. */
+ QString address() const;
+ /** Returns the port or port range for this policy. */
+ QString ports() const;
+
+private:
+ Action _action; /**< The action to take for this policy. */
+ QHostAddress _address; /**< Addresses to which this policy applies. */
+ quint16 _fromPort; /**< Start of a port range. */
+ quint16 _toPort; /**< End of a port range. */
+ uchar _mask; /**< Address mask. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/PortValidator.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/PortValidator.cpp
new file mode 100644
index 0000000..b6841dc
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/PortValidator.cpp
@@ -0,0 +1,39 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 PortValidator.cpp
+** \version $Id: PortValidator.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Validates that a number is a valid port number
+*/
+
+#include "PortValidator.h"
+
+#define MIN_PORT 1 /**< Minimum valid port. */
+#define MAX_PORT 65535 /**< Maximum valid port. */
+#define MATCH_ALL "*" /**< Matches all ports. */
+
+
+/** Constructor. */
+PortValidator::PortValidator(QObject *parent)
+ : QIntValidator(MIN_PORT, MAX_PORT, parent)
+{
+}
+
+/** Validates that the given port is either a valid port or a "*". */
+QValidator::State
+PortValidator::validate(QString &input, int &pos) const
+{
+ if (input == MATCH_ALL) {
+ return QValidator::Acceptable;
+ }
+ return QIntValidator::validate(input, pos);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/PortValidator.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/PortValidator.h
new file mode 100644
index 0000000..32d4904
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/PortValidator.h
@@ -0,0 +1,35 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 PortValidator.h
+** \version $Id: PortValidator.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Validates that a number is a valid port number
+*/
+
+#ifndef _PORTVALIDATOR_H
+#define _PORTVALIDATOR_H
+
+#include <QIntValidator>
+
+
+class PortValidator : public QIntValidator
+{
+ Q_OBJECT
+
+public:
+ /** Constructor. */
+ PortValidator(QObject *parent);
+ /** Validates that the given port is either a valid port or a "*". */
+ QValidator::State validate(QString &input, int &pos) const;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServerPage.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServerPage.cpp
new file mode 100644
index 0000000..15098bc
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServerPage.cpp
@@ -0,0 +1,612 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 ServerPage.cpp
+** \version $Id: ServerPage.cpp 4143 2009-10-12 00:59:22Z edmanm $
+** \brief Tor server configuration options
+*/
+
+#include "config.h"
+#include "ServerPage.h"
+#include "Vidalia.h"
+#include "VMessageBox.h"
+#include "ConfigDialog.h"
+#include "IpValidator.h"
+#include "PortValidator.h"
+#include "DomainValidator.h"
+#include "NicknameValidator.h"
+#include "BridgeUsageDialog.h"
+
+#include "html.h"
+#include "stringutil.h"
+
+#if defined(USE_MINIUPNPC)
+#include "UPNPTestDialog.h"
+#endif
+
+
+#include <QClipboard>
+#include <QMessageBox>
+
+/* These are completely made up values (in bytes/sec). */
+#define CABLE256_AVG_RATE (32*1024)
+#define CABLE256_MAX_RATE (64*1024)
+#define CABLE512_AVG_RATE (64*1024)
+#define CABLE512_MAX_RATE (128*1024)
+#define CABLE768_AVG_RATE (96*1024)
+#define CABLE768_MAX_RATE (192*1024)
+#define T1_AVG_RATE (192*1024)
+#define T1_MAX_RATE (384*1024)
+#define HIGHBW_AVG_RATE (5120*1024)
+#define HIGHBW_MAX_RATE (10240*1024)
+/** Minimum allowed bandwidth rate (20KB) */
+#define MIN_BANDWIDTH_RATE 20
+/** Maximum bandwidth rate. This is limited to 2147483646 bytes,
+ * or 2097151 kilobytes. (2147483646/1024) */
+#define MAX_BANDWIDTH_RATE 2097151
+
+/** Ports represented by the "Websites" checkbox. (80) */
+#define PORTS_HTTP (QStringList() << "80")
+/** Ports represented by the "Secure Websites" checkbox. (443) */
+#define PORTS_HTTPS (QStringList() << "443")
+/** Ports represented by the "Retrieve Mail" checkbox. (110,143,993,995) */
+#define PORTS_MAIL (QStringList() << "110" << "143" << "993" << "995")
+/** Ports represented by the "Instant Messaging" checkbox.
+ * (703,1863,5050,5190,5222,8300,8888) */
+#define PORTS_IM (QStringList() << "706" << "1863" << "5050" << "5190" \
+ << "5222" << "5223" << "8300" << "8888")
+/** Ports represented by the "Internet Relay Chat" checkbox.
+ * (6660-6669,6697,7000-7001) */
+#define PORTS_IRC (QStringList() << "6660-6669" << "6697" << "7000-7001")
+
+
+/** Constructor */
+ServerPage::ServerPage(QWidget *parent)
+: ConfigPage(parent, "Server")
+{
+ /* Invoke the Qt Designer generated object setup routine */
+ ui.setupUi(this);
+
+ /* Create ServerSettings object */
+ _settings = new ServerSettings(Vidalia::torControl());
+
+ /* Bind events to actions */
+ connect(ui.btnRateHelp, SIGNAL(clicked()), this, SLOT(bandwidthHelp()));
+ connect(ui.btnExitHelp, SIGNAL(clicked()), this, SLOT(exitPolicyHelp()));
+ connect(ui.btnUpnpHelp, SIGNAL(clicked()), this, SLOT(upnpHelp()));
+ connect(ui.cmboRate, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(rateChanged(int)));
+ connect(ui.lineAvgRateLimit, SIGNAL(editingFinished()),
+ this, SLOT(customRateChanged()));
+ connect(ui.lineMaxRateLimit, SIGNAL(editingFinished()),
+ this, SLOT(customRateChanged()));
+ connect(ui.rdoClientMode, SIGNAL(toggled(bool)),
+ this, SLOT(serverModeChanged(bool)));
+ connect(ui.rdoServerMode, SIGNAL(toggled(bool)),
+ this, SLOT(serverModeChanged(bool)));
+ connect(ui.rdoBridgeMode, SIGNAL(toggled(bool)),
+ this, SLOT(serverModeChanged(bool)));
+ connect(Vidalia::torControl(), SIGNAL(authenticated()),
+ this, SLOT(onAuthenticated()));
+ connect(Vidalia::torControl(), SIGNAL(disconnected()),
+ this, SLOT(onDisconnected()));
+ connect(ui.btnCopyBridgeIdentity, SIGNAL(clicked()),
+ this, SLOT(copyBridgeIdentity()));
+ connect(ui.lblBridgeUsage, SIGNAL(linkActivated(QString)),
+ this, SLOT(linkActivated(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));
+ ui.lineDirPort->setValidator(new QIntValidator(1, 65535, this));
+ ui.lineAvgRateLimit->setValidator(
+ new QIntValidator(MIN_BANDWIDTH_RATE, MAX_BANDWIDTH_RATE, this));
+ ui.lineMaxRateLimit->setValidator(
+ new QIntValidator(MIN_BANDWIDTH_RATE, MAX_BANDWIDTH_RATE, this));
+
+#if defined(USE_MINIUPNPC)
+ connect(ui.btnTestUpnp, SIGNAL(clicked()), this, SLOT(testUpnp()));
+#else
+ ui.chkEnableUpnp->setVisible(false);
+ ui.btnTestUpnp->setVisible(false);
+#endif
+}
+
+/** Destructor */
+ServerPage::~ServerPage()
+{
+ delete _settings;
+}
+
+/** Called when the user changes the UI translation. */
+void
+ServerPage::retranslateUi()
+{
+ ui.retranslateUi(this);
+}
+
+/** Called when Vidalia has authenticated to Tor. If the user's Tor is not
+ * recent enough, this disables the bridge server option and displays a
+ * warning if the user had previously configured Tor as a bridge. */
+void
+ServerPage::onAuthenticated()
+{
+ quint32 torVersion = Vidalia::torControl()->getTorVersion();
+ if (torVersion < 0x020008) {
+ ui.rdoBridgeMode->setEnabled(false);
+ if (ui.rdoBridgeMode->isChecked()) {
+ int ret = VMessageBox::warning(this,
+ tr("Bridge Support Unavailable"),
+ p(tr("You have configured Tor to act as a bridge relay "
+ "for censored users, but your version of Tor does not "
+ "support bridges.")) +
+ p(tr("Please upgrade your Tor software or configure Tor to "
+ "act as a normal Tor relay.")),
+ VMessageBox::ShowSettings|VMessageBox::Default,
+ VMessageBox::Cancel);
+ if (ret == VMessageBox::ShowSettings) {
+ ConfigDialog *dialog = dynamic_cast<ConfigDialog *>(window());
+ if (dialog)
+ dialog->showWindow(ConfigDialog::Server);
+ }
+ }
+ }
+}
+
+/** Called when Vidalia disconnects from Tor. This method reenables the bridge
+ * server option. */
+void
+ServerPage::onDisconnected()
+{
+ ui.rdoBridgeMode->setEnabled(true);
+}
+
+/** Copies the user's bridge relay identity to the clipboard. */
+void
+ServerPage::copyBridgeIdentity()
+{
+ QString bridge = ui.lblBridgeIdentity->text();
+ if (!bridge.isEmpty())
+ vApp->clipboard()->setText(bridge);
+}
+
+/** Loads the user's bridge relay identity into the appropriate widgets. If
+ * the user's bridge is not running, then "Not Running" will be displayed.
+ * Otherwise, either the bridge's "address:port", "fingerprint", or
+ * "address:port fingerprint" will be displayed, depending on whether our
+ * GETCONF and GETINFO commands are successful. */
+void
+ServerPage::loadBridgeIdentity()
+{
+ TorControl *tc = Vidalia::torControl();
+ QString bridge, address, orPort, fingerprint;
+
+ if (tc->isConnected()) {
+ tc->getInfo("address", address);
+ tc->getInfo("fingerprint", fingerprint);
+ tc->getConf("ORPort", orPort);
+
+ if (!address.isEmpty() && !orPort.isEmpty() && orPort != "0")
+ bridge = address + ":" + orPort + " ";
+ if (!fingerprint.isEmpty())
+ bridge += fingerprint;
+ bridge = bridge.trimmed();
+ }
+
+ ui.lblBridgeIdentity->setText(bridge.isEmpty()
+ ? tr("Your bridge relay is not running.")
+ : bridge);
+ ui.lblYourBridgeRelayIs->setEnabled(!bridge.isEmpty());
+ ui.lblBridgeIdentity->setEnabled(!bridge.isEmpty());
+ ui.btnCopyBridgeIdentity->setEnabled(!bridge.isEmpty());
+}
+
+/** Called when the user toggles any one of the server mode radio buttons
+ * and hides or displays the server configuration tabs appropriately. */
+void
+ServerPage::serverModeChanged(bool enabled)
+{
+ Q_UNUSED(enabled);
+ bool bridgeEnabled = ui.rdoBridgeMode->isChecked();
+
+ /* Show the tab menu only if the user is running a normal relay or a bridge
+ * relay. */
+ ui.tabsMenu->setVisible(ui.rdoServerMode->isChecked() || bridgeEnabled);
+
+ /* Disable the Exit Policies tab when bridge relay mode is selected */
+ ui.tabsMenu->setTabEnabled(2, !bridgeEnabled);
+
+ /* Display the widgets that show the user their bridge identity if bridge
+ * relay mode is selected. */
+ ui.lblYourBridgeRelayIs->setVisible(bridgeEnabled);
+ ui.lblBridgeIdentity->setVisible(bridgeEnabled);
+ ui.btnCopyBridgeIdentity->setVisible(bridgeEnabled);
+ ui.chkPublishBridgeAddress->setVisible(bridgeEnabled);
+ ui.lblBridgeUsage->setVisible(bridgeEnabled
+ && Vidalia::torControl()->isConnected());
+}
+
+/** Returns true if the user has changed their server settings since the
+ * last time they were applied to Tor. */
+bool
+ServerPage::changedSinceLastApply()
+{
+ return _settings->changedSinceLastApply();
+}
+
+/** Applies the server configuration settings to Tor. Returns true if the
+ * settings were applied successfully. Otherwise, <b>errmsg</b> is
+ * set and false is returned. */
+bool
+ServerPage::apply(QString &errmsg)
+{
+ return _settings->apply(&errmsg);
+}
+
+/** Returns true if the user has changed their server settings since the
+ * last time they were applied to Tor. */
+void
+ServerPage::revert()
+{
+ _settings->revert();
+}
+
+/** Saves changes made to settings on the Server settings page. */
+bool
+ServerPage::save(QString &errmsg)
+{
+ /* Force the bandwidth rate limits to validate */
+ customRateChanged();
+
+ if (ui.rdoServerMode->isChecked() || ui.rdoBridgeMode->isChecked()) {
+ /* A server must have an ORPort and a nickname */
+ if (ui.lineServerPort->text().isEmpty() ||
+ ui.lineServerNickname->text().isEmpty()) {
+ errmsg = tr("You must specify at least a relay nickname and port.");
+ return false;
+ }
+ /* If the bandwidth rates aren't set, use some defaults before saving */
+ if (ui.lineAvgRateLimit->text().isEmpty()) {
+ ui.lineAvgRateLimit->setText(QString::number(2097152/1024) /* 2MB */);
+ }
+ if (ui.lineMaxRateLimit->text().isEmpty()) {
+ ui.lineMaxRateLimit->setText(QString::number(5242880/1024) /* 5MB */);
+ }
+ }
+
+ /* "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.rdoBridgeMode->isChecked());
+ _settings->setBridgeEnabled(ui.rdoBridgeMode->isChecked());
+ if (ui.rdoBridgeMode->isChecked())
+ _settings->setPublishServerDescriptor(ui.chkPublishBridgeAddress->isChecked());
+
+ /* Save the rest of the server settings. */
+ _settings->setDirectoryMirror(ui.chkMirrorDirectory->isChecked());
+ _settings->setNickname(ui.lineServerNickname->text());
+ _settings->setORPort(ui.lineServerPort->text().toUInt());
+ _settings->setDirPort(ui.lineDirPort->text().toUInt());
+ _settings->setContactInfo(ui.lineServerContact->text());
+ saveBandwidthLimits();
+ saveExitPolicies();
+
+#if defined(USE_MINIUPNPC)
+ _settings->setUpnpEnabled(ui.chkEnableUpnp->isChecked());
+#endif
+
+ return true;
+}
+
+/** Loads previously saved settings */
+void
+ServerPage::load()
+{
+ if (_settings->isBridgeEnabled())
+ ui.rdoBridgeMode->setChecked(true);
+ else if (_settings->isServerEnabled())
+ ui.rdoServerMode->setChecked(true);
+ else
+ ui.rdoClientMode->setChecked(true);
+
+ ui.lineServerNickname->setText(_settings->getNickname());
+ ui.lineServerPort->setText(QString::number(_settings->getORPort()));
+ ui.lineDirPort->setText(QString::number(_settings->getDirPort()));
+ ui.lineServerContact->setText(_settings->getContactInfo());
+ ui.chkMirrorDirectory->setChecked(_settings->isDirectoryMirror());
+ ui.lblBridgeUsage->setVisible(_settings->isBridgeEnabled()
+ && Vidalia::torControl()->isConnected());
+ ui.chkPublishBridgeAddress->setChecked(_settings->publishServerDescriptor());
+
+ loadBandwidthLimits();
+ loadExitPolicies();
+ loadBridgeIdentity();
+
+#if defined(USE_MINIUPNPC)
+ ui.chkEnableUpnp->setChecked(_settings->isUpnpEnabled());
+#endif
+}
+
+/** Shows exit policy related help information */
+void
+ServerPage::exitPolicyHelp()
+{
+ emit helpRequested("server.exitpolicy");
+}
+
+/** Shows the bandwidth rate limiting help information */
+void
+ServerPage::bandwidthHelp()
+{
+ emit helpRequested("server.bandwidth");
+}
+
+/** Loads the server's bandwidth average and burst limits. */
+void
+ServerPage::loadBandwidthLimits()
+{
+ quint32 avgRate = _settings->getBandwidthAvgRate();
+ quint32 maxRate = _settings->getBandwidthBurstRate();
+
+ if (avgRate == CABLE256_AVG_RATE &&
+ maxRate == CABLE256_MAX_RATE) {
+ /* Cable/DSL 256 Kbps */
+ ui.cmboRate->setCurrentIndex(CableDsl256);
+ } else if (avgRate == CABLE512_AVG_RATE &&
+ maxRate == CABLE512_MAX_RATE) {
+ /* Cable/DSL 512 Kbps */
+ ui.cmboRate->setCurrentIndex(CableDsl512);
+ } else if (avgRate == CABLE768_AVG_RATE &&
+ maxRate == CABLE768_MAX_RATE) {
+ /* Cable/DSL 768 Kbps */
+ ui.cmboRate->setCurrentIndex(CableDsl768);
+ } else if (avgRate == T1_AVG_RATE &&
+ maxRate == T1_MAX_RATE) {
+ /* T1/Cable/DSL 1.5 Mbps */
+ ui.cmboRate->setCurrentIndex(T1CableDsl1500);
+ } else if (avgRate == HIGHBW_AVG_RATE &&
+ maxRate == HIGHBW_MAX_RATE) {
+ /* > 1.5 Mbps */
+ ui.cmboRate->setCurrentIndex(GreaterThan1500);
+ } else {
+ /* Custom bandwidth limits */
+ ui.cmboRate->setCurrentIndex(CustomBwLimits);
+ }
+ /* Fill in the custom bandwidth limit boxes */
+ ui.lineAvgRateLimit->setText(QString::number(avgRate/1024));
+ ui.lineMaxRateLimit->setText(QString::number(maxRate/1024));
+}
+
+/** Saves the server's bandwidth average and burst limits. */
+void
+ServerPage::saveBandwidthLimits()
+{
+ quint32 avgRate, maxRate;
+
+ switch (ui.cmboRate->currentIndex()) {
+ case CableDsl256: /* Cable/DSL 256 Kbps */
+ avgRate = CABLE256_AVG_RATE;
+ maxRate = CABLE256_MAX_RATE;
+ break;
+ case CableDsl512: /* Cable/DSL 512 Kbps */
+ avgRate = CABLE512_AVG_RATE;
+ maxRate = CABLE512_MAX_RATE;
+ break;
+ case CableDsl768: /* Cable/DSL 768 Kbps */
+ avgRate = CABLE768_AVG_RATE;
+ maxRate = CABLE768_MAX_RATE;
+ break;
+ case T1CableDsl1500: /* T1/Cable/DSL 1.5 Mbps */
+ avgRate = T1_AVG_RATE;
+ maxRate = T1_MAX_RATE;
+ break;
+ case GreaterThan1500: /* > 1.5 Mbps */
+ avgRate = HIGHBW_AVG_RATE;
+ maxRate = HIGHBW_MAX_RATE;
+ break;
+ default: /* Custom bandwidth limits */
+ avgRate = (quint32)(ui.lineAvgRateLimit->text().toUInt()*1024);
+ maxRate = (quint32)(ui.lineMaxRateLimit->text().toUInt()*1024);
+ break;
+ }
+ _settings->setBandwidthAvgRate(avgRate);
+ _settings->setBandwidthBurstRate(maxRate);
+}
+
+/** */
+void
+ServerPage::loadExitPolicies()
+{
+ ExitPolicy exitPolicy = _settings->getExitPolicy();
+
+ if (exitPolicy.contains(Policy(Policy::RejectAll))) {
+ /* If the policy ends with reject *:*, check if the policy explicitly
+ * accepts these ports */
+ ui.chkWebsites->setChecked(exitPolicy.acceptsPorts(PORTS_HTTP));
+ ui.chkSecWebsites->setChecked(exitPolicy.acceptsPorts(PORTS_HTTPS));
+ ui.chkMail->setChecked(exitPolicy.acceptsPorts(PORTS_MAIL));
+ ui.chkIRC->setChecked(exitPolicy.acceptsPorts(PORTS_IRC));
+ ui.chkIM->setChecked(exitPolicy.acceptsPorts(PORTS_IM));
+ ui.chkMisc->setChecked(false);
+ } else {
+ /* If the exit policy ends with accept *:*, check if the policy explicitly
+ * rejects these ports */
+ ui.chkWebsites->setChecked(!exitPolicy.rejectsPorts(PORTS_HTTP));
+ ui.chkSecWebsites->setChecked(!exitPolicy.rejectsPorts(PORTS_HTTPS));
+ ui.chkMail->setChecked(!exitPolicy.rejectsPorts(PORTS_MAIL));
+ ui.chkIRC->setChecked(!exitPolicy.rejectsPorts(PORTS_IRC));
+ ui.chkIM->setChecked(!exitPolicy.rejectsPorts(PORTS_IM));
+ ui.chkMisc->setChecked(true);
+ }
+}
+
+/** */
+void
+ServerPage::saveExitPolicies()
+{
+ ExitPolicy exitPolicy;
+ bool rejectUnchecked = ui.chkMisc->isChecked();
+
+ /* If misc is checked, then reject unchecked items and leave the default exit
+ * policy alone. Else, accept only checked items and end with reject *:*,
+ * replacing the default exit policy. */
+ if (ui.chkWebsites->isChecked() && !rejectUnchecked) {
+ exitPolicy.addAcceptedPorts(PORTS_HTTP);
+ } else if (!ui.chkWebsites->isChecked() && rejectUnchecked) {
+ exitPolicy.addRejectedPorts(PORTS_HTTP);
+ }
+ if (ui.chkSecWebsites->isChecked() && !rejectUnchecked) {
+ exitPolicy.addAcceptedPorts(PORTS_HTTPS);
+ } else if (!ui.chkSecWebsites->isChecked() && rejectUnchecked) {
+ exitPolicy.addRejectedPorts(PORTS_HTTPS);
+ }
+ if (ui.chkMail->isChecked() && !rejectUnchecked) {
+ exitPolicy.addAcceptedPorts(PORTS_MAIL);
+ } else if (!ui.chkMail->isChecked() && rejectUnchecked) {
+ exitPolicy.addRejectedPorts(PORTS_MAIL);
+ }
+ if (ui.chkIRC->isChecked() && !rejectUnchecked) {
+ exitPolicy.addAcceptedPorts(PORTS_IRC);
+ } else if (!ui.chkIRC->isChecked() && rejectUnchecked) {
+ exitPolicy.addRejectedPorts(PORTS_IRC);
+ }
+ if (ui.chkIM->isChecked() && !rejectUnchecked) {
+ exitPolicy.addAcceptedPorts(PORTS_IM);
+ } else if (!ui.chkIM->isChecked() && rejectUnchecked) {
+ exitPolicy.addRejectedPorts(PORTS_IM);
+ }
+ if (!ui.chkMisc->isChecked()) {
+ exitPolicy.addPolicy(Policy(Policy::RejectAll));
+ }
+ _settings->setExitPolicy(exitPolicy);
+}
+
+/** Called when the user selects a new value from the rate combo box. */
+void
+ServerPage::rateChanged(int index)
+{
+ /* If the "Custom" option is selected, show the custom bandwidth
+ * limits form. */
+ ui.frmCustomRate->setVisible(index == CustomBwLimits);
+}
+
+/** Called when the user edits the long-term average or maximum bandwidth limit.
+ * This ensures that the average bandwidth rate is greater than MIN_RATE
+ * (20KB/s) and that the max rate is greater than the average rate. */
+void
+ServerPage::customRateChanged()
+{
+ /* Make sure the average rate isn't too low or too high */
+ quint32 avgRate = (quint32)ui.lineAvgRateLimit->text().toUInt();
+ if (avgRate < MIN_BANDWIDTH_RATE) {
+ ui.lineAvgRateLimit->setText(QString::number(MIN_BANDWIDTH_RATE));
+ }
+ if (avgRate > MAX_BANDWIDTH_RATE) {
+ ui.lineAvgRateLimit->setText(QString::number(MAX_BANDWIDTH_RATE));
+ }
+ /* Ensure the max burst rate is greater than the average rate but less than
+ * the maximum allowed rate. */
+ quint32 burstRate = (quint32)ui.lineMaxRateLimit->text().toUInt();
+ if (avgRate > burstRate) {
+ ui.lineMaxRateLimit->setText(QString::number(avgRate));
+ }
+ if (burstRate > MAX_BANDWIDTH_RATE) {
+ ui.lineMaxRateLimit->setText(QString::number(MAX_BANDWIDTH_RATE));
+ }
+}
+
+/** Tests automatic port forwarding using UPnP. */
+void
+ServerPage::testUpnp()
+{
+#if defined(USE_MINIUPNPC)
+ UPNPTestDialog dlg(ui.lineServerPort->text().toUInt(),
+ ui.lineDirPort->text().toUInt(), this);
+
+ connect(&dlg, SIGNAL(help()), this, SLOT(upnpHelp()));
+
+ dlg.exec();
+#endif
+}
+
+/** Called when the user clicks the UPnP test dialog's help button. */
+void
+ServerPage::upnpHelp()
+{
+ emit helpRequested("server.upnp");
+}
+
+/** Called when the user clicks on a QLabel containing a hyperlink. */
+void
+ServerPage::linkActivated(const QString &url)
+{
+ if (!url.compare("#bridgeUsage"))
+ displayBridgeUsage();
+}
+
+/** Retrieves bridge usage history from Tor, parses and validates it, and
+ * then displays it in a new dialog. */
+void
+ServerPage::displayBridgeUsage()
+{
+ QString info;
+
+ info = Vidalia::torControl()->getInfo("status/clients-seen").toString();
+ if (info.isEmpty()) {
+ QMessageBox dlg(QMessageBox::Information, tr("No Recent Usage"),
+ tr("No clients have used your relay recently."),
+ QMessageBox::Ok, this);
+ dlg.setInformativeText(tr("Leave your relay running so clients have "
+ "a better chance of finding and using it."));
+ dlg.exec();
+ } else {
+ QDateTime timeStarted;
+ QHash<QString,int> countrySummary;
+ QHash<QString,QString> keyvals;
+ BridgeUsageDialog dlg(this);
+ bool ok;
+
+ keyvals = string_parse_keyvals(info, &ok);
+ if (!ok || !keyvals.contains("TimeStarted")
+ || !keyvals.contains("CountrySummary"))
+ goto err;
+
+ timeStarted = QDateTime::fromString(keyvals.value("TimeStarted"),
+ "yyyy-MM-dd HH:mm:ss");
+ if (!timeStarted.isValid())
+ goto err;
+
+ foreach (QString pair, keyvals.value("CountrySummary").split(",")) {
+ QStringList parts = pair.split("=");
+ if (parts.size() != 2)
+ goto err;
+
+ countrySummary.insert(parts.at(0).toUpper(), parts.at(1).toInt(&ok));
+ if (!ok)
+ goto err;
+ }
+
+ dlg.update(timeStarted, countrySummary);
+ dlg.exec();
+ }
+ return;
+
+err:
+ QMessageBox dlg(QMessageBox::Warning, tr("Bridge History"),
+ tr("Vidalia was unable to retrieve your bridge's usage "
+ "history."), QMessageBox::Ok, this);
+ dlg.setInformativeText(tr("Tor returned an improperly formatted "
+ "response when Vidalia requested your "
+ "bridge's usage history."));
+ dlg.setDetailedText(tr("The returned response was: %1").arg(info));
+ dlg.exec();
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServerPage.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServerPage.h
new file mode 100644
index 0000000..4f32496
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServerPage.h
@@ -0,0 +1,127 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 ServerPage.h
+** \version $Id: ServerPage.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Tor server configuration options
+*/
+
+#ifndef _SERVERPAGE_H
+#define _SERVERPAGE_H
+
+#include "ui_ServerPage.h"
+#include "ConfigPage.h"
+#include "TorControl.h"
+#include "ServerSettings.h"
+#include "ExitPolicy.h"
+#include "HelpBrowser.h"
+
+#include <QMessageBox>
+#include <QTimer>
+
+
+class ServerPage : public ConfigPage
+{
+ Q_OBJECT
+
+public:
+ /** Default Constructor */
+ ServerPage(QWidget *parent = 0);
+ /** Default Destructor */
+ ~ServerPage();
+ /** Saves the changes on this page */
+ bool save(QString &errmsg);
+ /** Loads the settings for this page */
+ void load();
+
+ /** Applies the server configuration settings to Tor. Returns true if the
+ * settings were applied successfully. Otherwise, <b>errmsg</b> is set and
+ * false is returned. */
+ bool apply(QString &errmsg);
+ /** Reverts the server configuration settings to their values at the last
+ * time they were successfully applied to Tor. */
+ void revert();
+ /** Returns true if the user has changed their server settings since the
+ * last time they were applied to Tor. */
+ bool changedSinceLastApply();
+ /** Called when the user changes the UI translation. */
+ virtual void retranslateUi();
+
+private slots:
+ /** Called when the user toggles any one of the server mode radio buttons
+ * and hides or displays the server configuration tabs appropriately. */
+ void serverModeChanged(bool enabled);
+ /** Called when the user clicks the bandwidth help button */
+ void bandwidthHelp();
+ /** Called when the user clicks the exit policy help button */
+ void exitPolicyHelp();
+ /** Called when the user selects a new value from the rate combo box */
+ void rateChanged(int rate);
+ /** Called when the user edits the max or average bandwidth limits. */
+ void customRateChanged();
+ /** Called when Vidalia has authenticated to Tor. If the user's Tor is not
+ * recent enough, this disables the bridge server option and displays a
+ * warning if the user had previously configured Tor as a bridge. */
+ void onAuthenticated();
+ /** Called when Vidalia disconnects from Tor. This method reenables the
+ * bridge server option. */
+ void onDisconnected();
+ /** Copies the user's bridge relay identity to the clipboard. */
+ void copyBridgeIdentity();
+ /** Tests automatic port forwarding with UPnP. */
+ void testUpnp();
+ /** Called when the user clicks the UPnP test dialog's help button. */
+ void upnpHelp();
+ /** Called when the user clicks on a QLabel containing a hyperlink. */
+ void linkActivated(const QString &url);
+
+private:
+ /** Index values of rate values in the bandwidth limits dropdown box. */
+ enum BwRateIndex {
+ CableDsl256 = 0, /**< Cable/DSL 256 Kbps */
+ CableDsl512, /**< Cable/DSL 512 Kbps */
+ CableDsl768, /**< Cable/DSL 768 Kbps */
+ T1CableDsl1500, /**< T1/Cable/DSL 1.5 Mbps */
+ GreaterThan1500, /**< > 1.5 Mbps */
+ CustomBwLimits /**< Custom bandwidth limits */
+ };
+
+ /** Returns the index of the selected item in lstExitPolicies */
+ int selectedIndex();
+
+ /** Saves the server's bandwidth average and burst limits. */
+ void saveBandwidthLimits();
+ /** Loads the server's bandwidth average and burst limits. */
+ void loadBandwidthLimits();
+ /** Saves the server's exit policies. */
+ void saveExitPolicies();
+ /** Loads the server's exit policies. */
+ void loadExitPolicies();
+ /** Loads the user's bridge relay identity into the appropriate widgets. If
+ * the user's bridge is not running, then "Not Running" will be
+ * displayed. Otherwise, either the bridge's "address:port", "fingerprint",
+ * or "address:port fingerprint" will be displayed, depending on whether
+ * our GETCONF and GETINFO commands are successful. */
+ void loadBridgeIdentity();
+ /** Retrieves bridge usage history from Tor, parses and validates it, and
+ * then displays it in a new dialog. */
+ void displayBridgeUsage();
+
+ /** A ServerSettings object used to get and set information about how a
+ * local Tor server is configured. */
+ ServerSettings* _settings;
+
+ /** Qt Designer generated object */
+ Ui::ServerPage ui;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServerPage.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServerPage.ui
new file mode 100644
index 0000000..9d42b87
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServerPage.ui
@@ -0,0 +1,1061 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ServerPage</class>
+ <widget class="QWidget" name="ServerPage">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>546</width>
+ <height>463</height>
+ </rect>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="QRadioButton" name="rdoClientMode">
+ <property name="text">
+ <string>Run as a client only</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="rdoServerMode">
+ <property name="text">
+ <string>Relay traffic for the Tor network</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="rdoBridgeMode">
+ <property name="text">
+ <string>Help censored users reach the Tor network</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QFrame" name="frmServer">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <layout class="QVBoxLayout">
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QTabWidget" name="tabsMenu">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="ServerConfig">
+ <attribute name="title">
+ <string>Basic Settings</string>
+ </attribute>
+ <layout class="QGridLayout">
+ <item row="2" column="0">
+ <widget class="QLabel" name="lblServerPort">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text">
+ <string>Relay Port:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <property name="indent">
+ <number>0</number>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" colspan="3">
+ <widget class="QCheckBox" name="chkMirrorDirectory">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Enable to mirror the relay directory</string>
+ </property>
+ <property name="text">
+ <string>Mirror the Relay Directory </string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="6">
+ <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="4" column="0" colspan="6">
+ <widget class="QCheckBox" name="chkEnableUpnp">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Attempt to automatically configure port forwarding</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="6">
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QPushButton" name="btnTestUpnp">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text">
+ <string>Test</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="btnUpnpHelp">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Show help topic on port forwarding</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/system-help.png</normaloff>:/images/22x22/system-help.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="1" colspan="7">
+ <widget class="QLineEdit" name="lineServerContact">
+ <property name="cursor">
+ <cursorShape>IBeamCursor</cursorShape>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>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.</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="3" colspan="3">
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QLabel" name="lblDirPort">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text">
+ <string>Directory Port:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineDirPort">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>50</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="cursor">
+ <cursorShape>IBeamCursor</cursorShape>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Directory Port Number</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_1">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text">
+ <string>Contact Info:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="indent">
+ <number>0</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2" colspan="6">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>321</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="8" column="0">
+ <spacer>
+ <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 row="3" column="5" colspan="2">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>41</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="1" colspan="7">
+ <widget class="QLineEdit" name="lineServerNickname">
+ <property name="cursor">
+ <cursorShape>IBeamCursor</cursorShape>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Name of your relay</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="maxLength">
+ <number>19</number>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="lineServerPort">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>50</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="cursor">
+ <cursorShape>IBeamCursor</cursorShape>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Port on which users and other relays can communicate with your relay</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="lblNickname">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text">
+ <string>Nickname:</string>
+ </property>
+ <property name="textFormat">
+ <enum>Qt::AutoText</enum>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <property name="indent">
+ <number>0</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="BandwidthLimits">
+ <attribute name="title">
+ <string>Bandwidth Limits</string>
+ </attribute>
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text">
+ <string>For Internet connections with fast download speed but slow upload, please list your upload speed here.</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QComboBox" name="cmboRate">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Select the entry that most closely resembles your Internet connection</string>
+ </property>
+ <property name="maxVisibleItems">
+ <number>10</number>
+ </property>
+ <property name="sizeAdjustPolicy">
+ <enum>QComboBox::AdjustToContents</enum>
+ </property>
+ <item>
+ <property name="text">
+ <string>Cable/DSL 256 Kbps</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Cable/DSL 512 Kbps</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Cable/DSL 768 Kbps</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>T1/Cable/DSL 1.5 Mbps</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>> 1.5 Mbps</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Custom</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="btnRateHelp">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Show help topic on bandwidth rate limits</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/system-help.png</normaloff>:/images/22x22/system-help.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QFrame" name="frmCustomRate">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <layout class="QGridLayout">
+ <item row="4" column="0">
+ <spacer>
+ <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 row="1" column="0">
+ <layout class="QHBoxLayout">
+ <item>
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Average Rate</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QLineEdit" name="lineAvgRateLimit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Long-term average bandwidth limit</string>
+ </property>
+ <property name="maxLength">
+ <number>12</number>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>KB/s</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout">
+ <item>
+ <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>Maximum Rate</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QLineEdit" name="lineMaxRateLimit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Peak bandwidth rate limit</string>
+ </property>
+ <property name="maxLength">
+ <number>12</number>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <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>
+ </layout>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s.</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <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>
+ </widget>
+ <widget class="QWidget" name="ExitPolicies">
+ <attribute name="title">
+ <string>Exit Policies</string>
+ </attribute>
+ <layout class="QGridLayout">
+ <item row="1" column="0">
+ <widget class="QFrame" name="frmPolicies">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <layout class="QHBoxLayout">
+ <item>
+ <layout class="QGridLayout">
+ <item row="1" column="1">
+ <widget class="QCheckBox" name="chkIRC">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Ports 6660 - 6669 and 6697</string>
+ </property>
+ <property name="text">
+ <string>Internet Relay Chat (IRC)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="chkMail">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Ports 110, 143, 993 and 995</string>
+ </property>
+ <property name="text">
+ <string>Retrieve Mail (POP, IMAP)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QCheckBox" name="chkMisc">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Ports unspecified by other checkboxes</string>
+ </property>
+ <property name="text">
+ <string>Misc Other Services</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QCheckBox" name="chkIM">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888</string>
+ </property>
+ <property name="text">
+ <string>Instant Messaging (IM)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="chkSecWebsites">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Port 443</string>
+ </property>
+ <property name="text">
+ <string>Secure Websites (SSL)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="chkWebsites">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Port 80</string>
+ </property>
+ <property name="text">
+ <string>Websites</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="QToolButton" name="btnExitHelp">
+ <property name="minimumSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Show help topic on exit policies</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/system-help.png</normaloff>:/images/22x22/system-help.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>42</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>300</width>
+ <height>41</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>300</width>
+ <height>41</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text">
+ <string>What Internet resources should users be able to access from your relay?</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse.</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <spacer>
+ <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>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="lblYourBridgeRelayIs">
+ <property name="cursor">
+ <cursorShape>ArrowCursor</cursorShape>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="text">
+ <string>Let others access your bridge by giving them this line:</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::TextSelectableByMouse</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QLabel" name="lblBridgeIdentity">
+ <property name="cursor">
+ <cursorShape>IBeamCursor</cursorShape>
+ </property>
+ <property name="toolTip">
+ <string>This is the identity of your bridge relay that you can give to other people</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::TextSelectableByMouse</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="btnCopyBridgeIdentity">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Copy your bridge relay's identity to the clipboard</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/edit-copy.png</normaloff>:/images/22x22/edit-copy.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QCheckBox" name="chkPublishBridgeAddress">
+ <property name="text">
+ <string>Automatically distribute my bridge address</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="lblBridgeUsage">
+ <property name="text">
+ <string><a href="#bridgeUsage">Who has used my bridge?</a></string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>420</width>
+ <height>16</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <tabstops>
+ <tabstop>tabsMenu</tabstop>
+ <tabstop>lineServerNickname</tabstop>
+ <tabstop>lineServerContact</tabstop>
+ <tabstop>lineServerPort</tabstop>
+ <tabstop>chkMirrorDirectory</tabstop>
+ <tabstop>lineDirPort</tabstop>
+ <tabstop>cmboRate</tabstop>
+ <tabstop>lineAvgRateLimit</tabstop>
+ <tabstop>lineMaxRateLimit</tabstop>
+ <tabstop>btnRateHelp</tabstop>
+ <tabstop>chkWebsites</tabstop>
+ <tabstop>chkSecWebsites</tabstop>
+ <tabstop>chkMail</tabstop>
+ <tabstop>chkIM</tabstop>
+ <tabstop>chkIRC</tabstop>
+ <tabstop>chkMisc</tabstop>
+ <tabstop>btnExitHelp</tabstop>
+ </tabstops>
+ <resources>
+ <include location="../res/vidalia.qrc"/>
+ </resources>
+ <connections>
+ <connection>
+ <sender>chkMirrorDirectory</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>lineDirPort</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>-1</x>
+ <y>-1</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>-1</x>
+ <y>-1</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>chkMirrorDirectory</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>lblDirPort</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>-1</x>
+ <y>-1</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>-1</x>
+ <y>-1</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServerSettings.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServerSettings.cpp
new file mode 100644
index 0000000..0a6e1ff
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServerSettings.cpp
@@ -0,0 +1,417 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 ServerSettings.cpp
+** \version $Id: ServerSettings.cpp 4143 2009-10-12 00:59:22Z edmanm $
+** \brief Settings for running a Tor server
+*/
+
+#include "config.h"
+#include "ServerSettings.h"
+#include "TorSettings.h"
+#ifdef USE_MINIUPNPC
+#include "UPNPControl.h"
+#endif
+
+#include "net.h"
+#include "stringutil.h"
+
+#include <QHostInfo>
+
+/** Define the set of characters that are valid in a nickname. */
+#define VALID_NICKNAME_CHARS \
+ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+/** Define the maximum length of a server's nickname. */
+#define MAX_NICKNAME_LEN 19
+
+/* Server configuration settings */
+#define SETTING_ENABLED "Enabled"
+#define SETTING_DIRMIRROR "DirectoryMirror"
+#define SETTING_NICKNAME "Nickname"
+#define SETTING_ORPORT "ORPort"
+#define SETTING_DIRPORT "DirPort"
+#define SETTING_CONTACT "ContactInfo"
+#define SETTING_EXITPOLICY "ExitPolicy"
+#define SETTING_BANDWIDTH_RATE "BandwidthRate"
+#define SETTING_BANDWIDTH_BURST "BandwidthBurst"
+#define SETTING_BRIDGE_RELAY "BridgeRelay"
+#define SETTING_ENABLE_UPNP "EnableUPnP"
+#define SETTING_RELAY_BANDWIDTH_RATE "RelayBandwidthRate"
+#define SETTING_RELAY_BANDWIDTH_BURST "RelayBandwidthBurst"
+#define SETTING_PUBLISH_SERVER_DESCRIPTOR "PublishServerDescriptor"
+
+
+/** Constructor.
+ * \param torControl a TorControl object used to read and apply the server
+ * configuration settings.
+ */
+ServerSettings::ServerSettings(TorControl *torControl)
+: AbstractTorSettings("Server", torControl)
+{
+ setDefault(SETTING_ENABLED, false);
+ setDefault(SETTING_DIRMIRROR, true);
+#if defined(Q_OS_WIN32)
+ setDefault(SETTING_ORPORT, 443);
+#else
+ setDefault(SETTING_ORPORT, 9001);
+#endif
+ setDefault(SETTING_DIRPORT, 9030);
+ setDefault(SETTING_NICKNAME, "Unnamed");
+ setDefault(SETTING_CONTACT, "<you at example.com>");
+ setDefault(SETTING_BANDWIDTH_RATE, 5242880);
+ setDefault(SETTING_RELAY_BANDWIDTH_RATE, 5242880);
+ setDefault(SETTING_BANDWIDTH_BURST, 10485760);
+ setDefault(SETTING_RELAY_BANDWIDTH_BURST, 10485760);
+ setDefault(SETTING_EXITPOLICY,
+ ExitPolicy(ExitPolicy::Default).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() ? "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;
+
+ configurePortForwarding();
+
+ if (isServerEnabled()) {
+ rc = torControl()->setConf(confValues(), errmsg);
+ } else {
+ QStringList resetKeys;
+ quint32 torVersion = torControl()->getTorVersion();
+ resetKeys << SETTING_ORPORT
+ << SETTING_NICKNAME
+ << SETTING_DIRPORT
+ << SETTING_CONTACT
+ << SETTING_EXITPOLICY
+ << SETTING_BRIDGE_RELAY
+ << SETTING_PUBLISH_SERVER_DESCRIPTOR;
+ if (torVersion >= 0x020001) {
+ resetKeys << SETTING_RELAY_BANDWIDTH_RATE
+ << SETTING_RELAY_BANDWIDTH_BURST;
+ } else {
+ resetKeys << SETTING_BANDWIDTH_RATE
+ << SETTING_BANDWIDTH_BURST;
+ }
+ rc = torControl()->resetConf(resetKeys, errmsg);
+ }
+ return rc;
+}
+
+/* TODO: We should call this periodically, in case the router gets rebooted or forgets its UPnP settings */
+/* TODO: Remove port forwarding when Tor is shutdown or the ORPort changes */
+/* TODO: init_upnp() will block for up to 2 seconds. We should fire off a thread */
+
+/** Configure UPnP device to forward DirPort and ORPort. If enable is
+ * true, will forward ORPort and DirPort; otherwise will remove exising
+ * port mappings */
+void
+ServerSettings::configurePortForwarding()
+{
+#ifdef USE_MINIUPNPC
+ quint16 ORPort, DirPort;
+
+ // This is how the tickbox should control UPNP
+ if (!isUpnpEnabled())
+ return;
+
+ ORPort = getORPort();
+ if (!isServerEnabled())
+ ORPort = 0;
+
+ DirPort = getDirPort();
+ if (!isServerEnabled() || !isDirectoryMirror())
+ DirPort = 0;
+
+ UPNPControl *control = UPNPControl::instance();
+ control->setDesiredState(DirPort, ORPort);
+#endif
+}
+
+void
+ServerSettings::cleanupPortForwarding()
+{
+#ifdef USE_MINIUPNPC
+ UPNPControl::cleanup();
+#endif
+}
+
+/** Virtual method called when we retrieve a server-related setting from Tor.
+ * Currently this just translates BandwidthFoo to RelayBandwidthFoo when
+ * appropriate. */
+QVariant
+ServerSettings::torValue(const QString &key) const
+{
+ if (torControl()->getTorVersion() >= 0x020001) {
+ if (key == SETTING_BANDWIDTH_RATE)
+ return AbstractTorSettings::torValue(SETTING_RELAY_BANDWIDTH_RATE);
+ else if (key == SETTING_BANDWIDTH_BURST)
+ return AbstractTorSettings::torValue(SETTING_RELAY_BANDWIDTH_BURST);
+ }
+ return AbstractTorSettings::torValue(key);
+}
+
+/** Enables or disables running Tor as a server.
+ * \param enable Whether to enable or disable the Tor server.
+ */
+void
+ServerSettings::setServerEnabled(bool enable)
+{
+ setValue(SETTING_ENABLED, enable);
+}
+
+/** Returns true if Tor is currently configured to run as a Tor server. If Tor
+ * is running, we will check whether it has an ORPort defined. Otherwise, we
+ * will use our saved settings. */
+bool
+ServerSettings::isServerEnabled()
+{
+ QString orPort;
+ if (torControl()->isConnected() && !changedSinceLastApply()) {
+ if (torControl()->getConf(SETTING_ORPORT, orPort))
+ return (orPort.toUInt() > 0);
+ }
+ return localValue(SETTING_ENABLED).toBool();
+}
+
+/** Sets to <b>enabled</b> whether Tor should be a bridge node when acting as
+ * a server. */
+void
+ServerSettings::setBridgeEnabled(bool enabled)
+{
+ setValue(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();
+}
+
+/** Sets the server's ORPort. */
+void
+ServerSettings::setORPort(quint16 orPort)
+{
+ setValue(SETTING_ORPORT, orPort);
+}
+
+/** Gets the server's current ORPort setting. */
+quint16
+ServerSettings::getORPort()
+{
+ return (quint16)value(SETTING_ORPORT).toUInt();
+}
+
+/** Sets the server's current DirPort. */
+void
+ServerSettings::setDirPort(quint16 dirPort)
+{
+ setValue(SETTING_DIRPORT, dirPort);
+}
+
+/** Gets the server's current DirPort. */
+quint16
+ServerSettings::getDirPort()
+{
+ return (quint16)value(SETTING_DIRPORT).toUInt();
+}
+
+/** Sets the server's nickname. */
+void
+ServerSettings::setNickname(QString nickname)
+{
+ setValue(SETTING_NICKNAME, nickname);
+}
+
+/** Gets the server's nickname. */
+QString
+ServerSettings::getNickname()
+{
+ QString nickname = value(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);
+}
+
+/** Sets the server's contact information. */
+void
+ServerSettings::setContactInfo(QString contact)
+{
+ setValue(SETTING_CONTACT, contact);
+}
+
+/** Gets the server's contact information. */
+QString
+ServerSettings::getContactInfo()
+{
+ return value(SETTING_CONTACT).toString();
+}
+
+/** Returns whether this server will act as a directory mirror or not. */
+bool
+ServerSettings::isDirectoryMirror()
+{
+ return localValue(SETTING_DIRMIRROR).toBool();
+}
+
+/** Sets whether this server will act as a directory mirror. */
+void
+ServerSettings::setDirectoryMirror(bool mirror)
+{
+ setValue(SETTING_DIRMIRROR, mirror);
+}
+
+/** Returns the exit policy for this server. */
+ExitPolicy
+ServerSettings::getExitPolicy()
+{
+ return ExitPolicy(value(SETTING_EXITPOLICY).toString());
+}
+
+/** Sets the exit policy for this server. */
+void
+ServerSettings::setExitPolicy(ExitPolicy &exitPolicy)
+{
+ setValue(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();
+}
+
+/** Sets the long-term average bandwidth rate (in KB/s) for this server. */
+void
+ServerSettings::setBandwidthAvgRate(quint32 rate)
+{
+ setValue(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();
+}
+
+/** Sets the maximum bandwidth burst rate (in KB/s) for this server. */
+void
+ServerSettings::setBandwidthBurstRate(quint32 rate)
+{
+ setValue(SETTING_BANDWIDTH_BURST, rate);
+}
+
+/** Sets whether the user's server descriptor will be published or not.
+ * Currently this only affects publishing of bridge descriptors. If the
+ * user is running a normal relay, its descriptor will always be
+ * published regardless of this setting. */
+void
+ServerSettings::setPublishServerDescriptor(bool publish)
+{
+ if (publish)
+ setValue(SETTING_PUBLISH_SERVER_DESCRIPTOR, "1");
+ else
+ setValue(SETTING_PUBLISH_SERVER_DESCRIPTOR, "0");
+}
+
+/** Returns true if the user's server descriptor will be published to the
+ * appropriate authorities. */
+bool
+ServerSettings::publishServerDescriptor() const
+{
+ return (value(SETTING_PUBLISH_SERVER_DESCRIPTOR).toString() != "0");
+}
+
+/** Returns true if UPnP support is available and enabled. */
+bool
+ServerSettings::isUpnpEnabled()
+{
+#if defined(USE_MINIUPNPC)
+ return localValue(SETTING_ENABLE_UPNP).toBool();
+#else
+ return false;
+#endif
+}
+
+/** Sets whether Vidalia should try to configure port forwarding using UPnP.
+ * If Vidalia was compiled without UPnP support, this method has no effect. */
+void
+ServerSettings::setUpnpEnabled(bool enabled)
+{
+#if defined(USE_MINIUPNPC)
+ setValue(SETTING_ENABLE_UPNP, enabled);
+#endif
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServerSettings.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServerSettings.h
new file mode 100644
index 0000000..4f80c95
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServerSettings.h
@@ -0,0 +1,116 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 ServerSettings.h
+** \version $Id: ServerSettings.h 4143 2009-10-12 00:59:22Z edmanm $
+** \brief Settings for running a Tor server
+*/
+
+#ifndef _SERVERSETTINGS_H
+#define _SERVERSETTINGS_H
+
+#include "AbstractTorSettings.h"
+#include "ExitPolicy.h"
+
+
+class ServerSettings : public AbstractTorSettings
+{
+ Q_OBJECT
+
+public:
+ /** Constructor */
+ ServerSettings(TorControl *torControl);
+
+ /** Applies changese to Tor. */
+ bool apply(QString *errmsg = 0);
+
+ /** Enables running Tor as a server. */
+ void setServerEnabled(bool enable);
+ /** Returns true if Tor is running as a server. */
+ bool isServerEnabled();
+
+ /** Sets to <b>enabled</b> whether Tor should be a bridge node when acting
+ * as a server. */
+ void setBridgeEnabled(bool enable);
+ /** Returns true if Tor is configured to act as a bridge node. */
+ bool isBridgeEnabled();
+
+ /** Sets the server's ORPort value. */
+ void setORPort(quint16 orPort);
+ /** Gets the server's ORPort value. */
+ quint16 getORPort();
+
+ /** Sets the server's DirPort value. */
+ void setDirPort(quint16 dirPort);
+ /** Gets the server's DirPort value. */
+ quint16 getDirPort();
+
+ /** Sets the server's nickname. */
+ void setNickname(QString nickname);
+ /** Gets the server's nickname. */
+ QString getNickname();
+
+ /** Sets the server operator's contact information. */
+ void setContactInfo(QString info);
+ /** Gets the server operator's contact information. */
+ QString getContactInfo();
+
+ /** Enables or disables the server to act as a directory mirror. */
+ void setDirectoryMirror(bool mirror);
+ /** Returns true if the server will mirror the directory. */
+ bool isDirectoryMirror();
+ /** Sets the exit policy for this server. */
+ void setExitPolicy(ExitPolicy &policy);
+ /** Gets the exit policy for this server. */
+ ExitPolicy getExitPolicy();
+
+ /** Sets the long-term average bandwidth rate (in KB/s) of this server. */
+ void setBandwidthAvgRate(quint32 rate);
+ /** Gets the long-term average bandwidth rate (in KB/s) of this server. */
+ quint32 getBandwidthAvgRate();
+
+ /** Sets the maximum burst rate (in B/s) of this server. */
+ void setBandwidthBurstRate(quint32 rate);
+ /** Gets the maximum burst rate (in B/s) of this server. */
+ quint32 getBandwidthBurstRate();
+
+ /** Sets whether the user's server descriptor will be published or not.
+ * Currently this only affects publishing of bridge descriptors. If the
+ * user is running a normal relay, its descriptor will always be
+ * published regardless of this setting. */
+ void setPublishServerDescriptor(bool publish);
+ /** Returns true if the user's server descriptor will be published to
+ * the appropriate authorities. */
+ bool publishServerDescriptor() const;
+
+ /** Configure port forwarding. */
+ void configurePortForwarding();
+
+ void cleanupPortForwarding();
+
+ /** Returns true if UPnP support is enabled. */
+ bool isUpnpEnabled();
+ /** Sets whether Vidalia should try to configure port forwarding using UPnP. */
+ void setUpnpEnabled(bool enabled);
+
+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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/Service.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/Service.cpp
new file mode 100644
index 0000000..3e9b7f8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/Service.cpp
@@ -0,0 +1,119 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/Service.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/Service.h
new file mode 100644
index 0000000..8218774
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/Service.h
@@ -0,0 +1,80 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServiceList.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServiceList.cpp
new file mode 100644
index 0000000..7ce8c24
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServiceList.cpp
@@ -0,0 +1,56 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServiceList.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServiceList.h
new file mode 100644
index 0000000..fb35f9c
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServiceList.h
@@ -0,0 +1,51 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServicePage.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServicePage.cpp
new file mode 100644
index 0000000..91c29da
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServicePage.cpp
@@ -0,0 +1,613 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServicePage.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServicePage.h
new file mode 100644
index 0000000..bdb0c51
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServicePage.h
@@ -0,0 +1,80 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServicePage.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServicePage.ui
new file mode 100644
index 0000000..8be3a59
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServicePage.ui
@@ -0,0 +1,166 @@
+<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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServiceSettings.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServiceSettings.cpp
new file mode 100644
index 0000000..d74ab43
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServiceSettings.cpp
@@ -0,0 +1,167 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServiceSettings.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServiceSettings.h
new file mode 100644
index 0000000..dc2d677
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/ServiceSettings.h
@@ -0,0 +1,61 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/TorSettings.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/TorSettings.cpp
new file mode 100644
index 0000000..2bf2e19
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/TorSettings.cpp
@@ -0,0 +1,390 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 TorSettings.cpp
+** \version $Id: TorSettings.cpp 3901 2009-06-27 01:57:05Z edmanm $
+** \brief Settings used for starting and running Tor
+*/
+
+#include "TorSettings.h"
+#include "Vidalia.h"
+#include "crypto.h"
+#include "file.h"
+#include "stringutil.h"
+#if defined(Q_OS_WIN32)
+#include "win32.h"
+#include <QFileInfo>
+#endif
+
+#include <QDir>
+#include <QProcess>
+
+/* Tor Settings */
+#define SETTING_TOR_EXECUTABLE "TorExecutable"
+#define SETTING_TORRC "Torrc"
+#define SETTING_CONTROL_ADDR "ControlAddr"
+#define SETTING_CONTROL_PORT "ControlPort"
+#define SETTING_AUTH_TOKEN "AuthToken"
+#define SETTING_TOR_USER "User"
+#define SETTING_TOR_GROUP "Group"
+#define SETTING_DATA_DIRECTORY "DataDirectory"
+#define SETTING_AUTH_METHOD "AuthenticationMethod"
+#define SETTING_CONTROL_PASSWORD "ControlPassword"
+#define SETTING_USE_RANDOM_PASSWORD "UseRandomPassword"
+#define SETTING_WARN_PLAINTEXT_PORTS "WarnPlaintextPorts"
+#define SETTING_REJECT_PLAINTEXT_PORTS "RejectPlaintextPorts"
+
+/** Default to using hashed password authentication */
+#define DEFAULT_AUTH_METHOD PasswordAuth
+
+/* Arguments we can pass to Tor on the command-line */
+#define TOR_ARG_CONTROL_PORT "ControlPort"
+#define TOR_ARG_TORRC "-f"
+#define TOR_ARG_DATA_DIRECTORY "DataDirectory"
+#define TOR_ARG_HASHED_PASSWORD "HashedControlPassword"
+#define TOR_ARG_COOKIE_AUTH "CookieAuthentication"
+
+/** Generate random control passwords of 16 characters */
+#define PASSWORD_LEN 16
+
+
+/** Default constructor */
+TorSettings::TorSettings(TorControl *torControl)
+: AbstractTorSettings("Tor", torControl)
+{
+#if defined(Q_OS_WIN32)
+ QString programFiles = win32_program_files_folder();
+ if (QFileInfo(programFiles + "\\Vidalia Bundle\\Tor\\tor.exe").exists())
+ setDefault(SETTING_TOR_EXECUTABLE,
+ programFiles + "\\Vidalia Bundle\\Tor\\tor.exe");
+ else
+ setDefault(SETTING_TOR_EXECUTABLE, programFiles + "\\Tor\\tor.exe");
+#else
+ setDefault(SETTING_TOR_EXECUTABLE, "tor");
+#endif
+
+ setDefault(SETTING_TORRC, Vidalia::dataDirectory() + "/torrc");
+ setDefault(SETTING_CONTROL_ADDR, "127.0.0.1");
+ setDefault(SETTING_CONTROL_PORT, 9051);
+ setDefault(SETTING_AUTH_METHOD, toString(DEFAULT_AUTH_METHOD));
+ 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>());
+}
+
+/** Applies any changes to Tor's control port or authentication settings. */
+bool
+TorSettings::apply(QString *errmsg)
+{
+ QHash<QString, QString> conf;
+ QString hashedPassword;
+
+ conf.insert(SETTING_CONTROL_PORT,
+ localValue(SETTING_CONTROL_PORT).toString());
+
+ 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, "");
+ break;
+ case PasswordAuth:
+ hashedPassword = useRandomPassword()
+ ? hashPassword(randomPassword())
+ : hashPassword(getControlPassword());
+ if (hashedPassword.isEmpty()) {
+ if (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);
+ break;
+ default:
+ conf.insert(TOR_ARG_COOKIE_AUTH, "0");
+ conf.insert(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(","));
+
+ return torControl()->setConf(conf, errmsg);
+}
+
+/** Gets the location of Tor's data directory. */
+QString
+TorSettings::getDataDirectory() const
+{
+ return QDir::convertSeparators(value(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);
+}
+
+/** Returns a fully-qualified path to Tor's executable, including the
+ * executable name. */
+QString
+TorSettings::getExecutable() const
+{
+ QString tor = localValue(SETTING_TOR_EXECUTABLE).toString();
+ if (tor.isEmpty()) /* Don't let the Tor executable name be empty */
+ tor = defaultValue(SETTING_TOR_EXECUTABLE).toString();
+ return QDir::convertSeparators(tor);
+}
+
+/** Sets the location and name of Tor's executable to the given string. */
+void
+TorSettings::setExecutable(const QString &torExecutable)
+{
+ setValue(SETTING_TOR_EXECUTABLE, torExecutable);
+}
+
+/** Returns the torrc that will be used when starting Tor. */
+QString
+TorSettings::getTorrc() const
+{
+ QString torrc;
+ TorControl *tc = torControl();
+ if (tc && tc->isConnected() && tc->getInfo("config-file", torrc))
+ return QDir::convertSeparators(torrc);
+ return QDir::convertSeparators(localValue(SETTING_TORRC).toString());
+}
+
+/** Sets the torrc that will be used when starting Tor.
+ * \param torrc The torrc to use.
+ */
+void
+TorSettings::setTorrc(const QString &torrc)
+{
+ setValue(SETTING_TORRC, torrc);
+}
+
+/** Get the address or hostname used to connect to Tor */
+QHostAddress
+TorSettings::getControlAddress() const
+{
+ QString addr = localValue(SETTING_CONTROL_ADDR).toString();
+ return QHostAddress(addr);
+}
+
+/** Set the address or hostname used to connect to Tor */
+void
+TorSettings::setControlAddress(const QHostAddress &addr)
+{
+ setValue(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();
+}
+
+/** Set the control port used to connect to Tor */
+void
+TorSettings::setControlPort(quint16 port)
+{
+ setValue(SETTING_CONTROL_PORT, port);
+}
+
+/** Returns the plaintext (i.e., not hashed) control password used when
+ * authenticating to Tor. */
+QString
+TorSettings::getControlPassword() const
+{
+ return localValue(SETTING_CONTROL_PASSWORD).toString();
+}
+
+/** Sets the control password used when starting Tor with
+ * HashedControlPassword to <b>password</b>. */
+void
+TorSettings::setControlPassword(const QString &password)
+{
+ setValue(SETTING_CONTROL_PASSWORD, password);
+}
+
+/** Returns true if a new, random control password is to be used each time Tor
+ * is started. */
+bool
+TorSettings::useRandomPassword() const
+{
+ return localValue(SETTING_USE_RANDOM_PASSWORD).toBool();
+}
+
+/** Sets whether or not to generate and use a random control password each
+ * time Tor is started. */
+void
+TorSettings::setUseRandomPassword(bool useRandomPassword)
+{
+ setValue(SETTING_USE_RANDOM_PASSWORD, useRandomPassword);
+}
+
+/** Returns the current authentication method used when connecting to Tor. */
+TorSettings::AuthenticationMethod
+TorSettings::getAuthenticationMethod() const
+{
+ AuthenticationMethod type = UnknownAuth;
+ TorControl *tc = torControl();
+
+ if (tc && tc->isConnected()) {
+ QHash<QString,QString> conf;
+ conf.insert(TOR_ARG_COOKIE_AUTH, "");
+ conf.insert(TOR_ARG_HASHED_PASSWORD, "");
+ if (tc->getConf(conf)) {
+ if (conf.value(TOR_ARG_COOKIE_AUTH) == "1")
+ type = CookieAuth;
+ else if (!conf.value(TOR_ARG_HASHED_PASSWORD).isEmpty())
+ type = PasswordAuth;
+ }
+ }
+ if (type == UnknownAuth)
+ type = toAuthenticationMethod(localValue(SETTING_AUTH_METHOD).toString());
+ return (type == UnknownAuth ? DEFAULT_AUTH_METHOD : type);
+}
+
+/** Sets the authentication method used when starting Tor to <b>method</b>. */
+void
+TorSettings::setAuthenticationMethod(AuthenticationMethod method)
+{
+ setValue(SETTING_AUTH_METHOD, toString(method));
+}
+
+/** Returns the current list of ports that will cause Tor to issue a warning
+ * when the user tries to connect to one of them. */
+QList<quint16>
+TorSettings::getWarnPlaintextPorts() const
+{
+ QList<quint16> out;
+ QList<QVariant> ports;
+
+ ports = value(SETTING_WARN_PLAINTEXT_PORTS).toList();
+ foreach (QVariant port, ports) {
+ out << port.toUInt();
+ }
+ return out;
+}
+
+/** Sets the list of ports that will cause Tor to issue a warning when the
+ * user tries to connect to one of them. */
+void
+TorSettings::setWarnPlaintextPorts(const QList<quint16> &ports)
+{
+ QList<QVariant> warnList;
+ foreach (quint16 port, ports) {
+ warnList << QVariant(port);
+ }
+ setValue(SETTING_WARN_PLAINTEXT_PORTS, warnList);
+}
+
+/** Returns the current list of ports that will cause Tor to reject the
+ * connection when the user tries to connect to one of them. */
+QList<quint16>
+TorSettings::getRejectPlaintextPorts() const
+{
+ QList<quint16> out;
+ QList<QVariant> ports;
+
+ ports = value(SETTING_REJECT_PLAINTEXT_PORTS).toList();
+ foreach (QVariant port, ports) {
+ out << port.toUInt();
+ }
+ return out;
+}
+
+/** Sets the list of ports that will cause Tor to reject the connection
+ * when the user tries to connect to one of them. */
+void
+TorSettings::setRejectPlaintextPorts(const QList<quint16> &ports)
+{
+ QList<QVariant> rejectList;
+ foreach (quint16 port, ports) {
+ rejectList << QVariant(port);
+ }
+ setValue(SETTING_REJECT_PLAINTEXT_PORTS, rejectList);
+}
+
+/** Returns the string description of the authentication method specified by
+ * <b>method</b>. The authentication method string is stored in Vidalia's
+ * configuration file. */
+QString
+TorSettings::toString(AuthenticationMethod method) const
+{
+ switch (method) {
+ case NullAuth: return "none";
+ case PasswordAuth: return "password";
+ case CookieAuth: return "cookie";
+ default: break;
+ }
+ return "unknown";
+}
+
+/** Returns the AuthenticationMethod enum value for the string
+ * description of the authentication method given in <b>authMethod</b>. */
+TorSettings::AuthenticationMethod
+TorSettings::toAuthenticationMethod(const QString &authMethod) const
+{
+ QString str = authMethod.toLower();
+ if (str == toString(NullAuth))
+ return NullAuth;
+ else if (str == toString(PasswordAuth))
+ return PasswordAuth;
+ else if (str == toString(CookieAuth))
+ return CookieAuth;
+ return UnknownAuth;
+}
+
+/** Generates a random control password consisting of PASSWORD_LEN characters. */
+QString
+TorSettings::randomPassword()
+{
+ return crypto_rand_string(PASSWORD_LEN);
+}
+
+/** Returns the hash of <b>password</b> as given by the command "tor
+ * --hash-password foo". */
+QString
+TorSettings::hashPassword(const QString &password)
+{
+ QByteArray salt;
+
+ /* Generate an 8 octet salt value. Bail if we fail to generate enough
+ * random bytes (unlikely). */
+ while (salt.size() < 8) {
+ QByteArray bytes = crypto_rand_bytes(8-salt.size());
+ if (bytes.isNull())
+ return QString();
+ salt.append(bytes);
+ }
+
+ /* Generate the salted hash of the specified password. 96 is the one-octet
+ * RFC 2440 coded count value hardcoded into Tor. Specifies that we should
+ * hash 64K worth of data. */
+ QByteArray key = crypto_secret_to_key(password, salt, 96);
+ if (key.isNull())
+ return QString();
+ salt.append(96); /* Append the coded count value to the salt */
+
+ /* Convert the result to hexadecimal and put it in the format Tor wants. */
+ return QString("16:%1%2").arg(base16_encode(salt))
+ .arg(base16_encode(key));
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/TorSettings.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/TorSettings.h
new file mode 100644
index 0000000..d2894dc
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/TorSettings.h
@@ -0,0 +1,121 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 TorSettings.h
+** \version $Id: TorSettings.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Settings used for starting and running Tor
+*/
+
+#ifndef _TORSETTINGS_H
+#define _TORSETTINGS_H
+
+#include "AbstractTorSettings.h"
+
+#include <QHostAddress>
+
+
+/** Manages Tor-specific settings, such as location, command-line arguments,
+ * and control interface information. */
+class TorSettings : public AbstractTorSettings
+{
+ Q_OBJECT
+
+public:
+ /** Available Tor authentication methods. */
+ enum AuthenticationMethod {
+ NullAuth, /**< No authentication. */
+ CookieAuth, /**< Use a "magic" cookie for authentication. */
+ PasswordAuth, /**< Use a hashed password for authentication. */
+ UnknownAuth /**< Unknown authentication method. */
+ };
+
+ /** Default constructor. */
+ TorSettings(TorControl *torControl = 0);
+ /** Applies any changes to Tor's control port or authentication settings. */
+ bool apply(QString *errmsg = 0);
+
+ /** Gets the name and path of Tor's executable. */
+ QString getExecutable() const;
+ /** Sets the name and path of Tor's executable. */
+ void setExecutable(const QString &torExecutable);
+
+ /** Gets the location of Tor's data directory. */
+ QString getDataDirectory() const;
+ /** Sets the location to use for Tor's data directory. */
+ void setDataDirectory(const QString &dataDir);
+
+ /** Gets the torrc to use when starting Tor. */
+ QString getTorrc() const;
+ /** Sets the torrc to use when starting Tor. */
+ void setTorrc(const QString &torrc);
+
+ /** Get Tor's control interface address. */
+ QHostAddress getControlAddress() const;
+ /** Set Tor's control interface address. */
+ void setControlAddress(const QHostAddress &addr);
+
+ /** Get the control port. */
+ quint16 getControlPort() const;
+ /** Set the control port. */
+ void setControlPort(quint16 port);
+
+ /** Returns the plaintext (i.e., not hashed) control password used when
+ * authenticating to Tor. */
+ QString getControlPassword() const;
+ /** Sets the control password used when starting Tor with
+ * HashedControlPassword to <b>password</b>. */
+ void setControlPassword(const QString &password);
+
+ /** Returns true if a new, random control password is to be used each time
+ * Tor is started. */
+ bool useRandomPassword() const;
+ /** Sets whether or not to generate and use a random control password each
+ * time Tor is started. */
+ void setUseRandomPassword(bool useRandomPassword);
+
+ /** Returns the current authentication method used when connecting to Tor.*/
+ AuthenticationMethod getAuthenticationMethod() const;
+ /** Sets the authentication method used when starting Tor to <b>method</b>.*/
+ void setAuthenticationMethod(AuthenticationMethod method);
+
+ /** Returns the current list of ports that will cause Tor to issue a warning
+ * when the user tries to connect to one of them. */
+ QList<quint16> getWarnPlaintextPorts() const;
+ /** Sets the list of ports that will cause Tor to issue a warning when the
+ * user tries to connect to one of them. */
+ void setWarnPlaintextPorts(const QList<quint16> &ports);
+
+ /** Returns the current list of ports that will cause Tor to reject the
+ * connection when the user tries to connect to one of them. */
+ QList<quint16> getRejectPlaintextPorts() const;
+ /** Sets the list of ports that will cause Tor to reject the connection
+ * when the user tries to connect to one of them. */
+ void setRejectPlaintextPorts(const QList<quint16> &ports);
+
+ /** Generates a random control password consisting of PASSWORD_LEN
+ * characters. */
+ static QString randomPassword();
+ /** Returns the hash of <b>password</b> as given by the command
+ * "tor --hash-password foo". */
+ static QString hashPassword(const QString &password);
+
+private:
+ /** Returns the AuthenticationMethod enum value for the string
+ * description of the authentication method given in <b>authMethod</b>. */
+ AuthenticationMethod toAuthenticationMethod(const QString &authMethod) const;
+ /** Returns the string description of the authentication method specified by
+ * <b>method</b>. The authentication method string is stored in Vidalia's
+ * configuration file. */
+ QString toString(AuthenticationMethod type) const;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPControl.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPControl.cpp
new file mode 100644
index 0000000..9da8578
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPControl.cpp
@@ -0,0 +1,165 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 UPNPControl.cpp
+** \version $Id: UPNPControl.cpp 3803 2009-05-31 00:12:09Z edmanm $
+** \brief Singleton object for interacting with UPNP device
+*/
+
+#include "UPNPControl.h"
+#include "UPNPControlThread.h"
+
+#include <QMutex>
+#include <QMetaType>
+
+#ifdef Q_OS_WIN32
+#include <winsock2.h>
+#endif
+
+
+/** UPNPControl singleton instance. */
+UPNPControl* UPNPControl::_instance = 0;
+
+/** Returns a pointer to this object's singleton instance. */
+UPNPControl* UPNPControl::instance()
+{
+ if (0 == _instance) {
+ _instance = new UPNPControl();
+ _instance->_controlThread->start();
+ }
+ return _instance;
+}
+
+/** Constructor. Initializes and starts a thread in which all blocking UPnP
+ * operations will be performed. */
+UPNPControl::UPNPControl()
+{
+ _forwardedORPort = 0;
+ _forwardedDirPort = 0;
+ _error = UnknownError;
+ _state = IdleState;
+
+ qRegisterMetaType<UPNPControl::UPNPError>("UPNPControl::UPNPError");
+ qRegisterMetaType<UPNPControl::UPNPState>("UPNPControl::UPNPState");
+
+ _mutex = new QMutex();
+ _controlThread = new UPNPControlThread(this);
+}
+
+/** Destructor. cleanup() should be called before the object is destroyed.
+ * \sa cleanup()
+ */
+UPNPControl::~UPNPControl()
+{
+ delete _mutex;
+ delete _controlThread;
+}
+
+/** Terminates the UPnP control thread and frees memory allocated to this
+ * object's singleton instance. */
+void
+UPNPControl::cleanup()
+{
+ _instance->_controlThread->stop();
+ delete _instance;
+ _instance = 0;
+}
+
+/** Sets <b>desiredDirPort</b> and <b>desiredOrPort</b> to the currently
+ * forwarded DirPort and ORPort values. */
+void
+UPNPControl::getDesiredState(quint16 *desiredDirPort, quint16 *desiredOrPort)
+{
+ _mutex->lock();
+ *desiredDirPort = _forwardedDirPort;
+ *desiredOrPort = _forwardedORPort;
+ _mutex->unlock();
+}
+
+/** Sets the desired DirPort and ORPort port mappings to <b>desiredDirPort</b>
+ * and <b>desiredOrPort</b>, respectively. */
+void
+UPNPControl::setDesiredState(quint16 desiredDirPort, quint16 desiredOrPort)
+{
+ _mutex->lock();
+ _forwardedDirPort = desiredDirPort;
+ _forwardedORPort = desiredOrPort;
+ _mutex->unlock();
+
+ _controlThread->wakeup();
+}
+
+/** Sets the most recent UPnP-related error to <b>error</b> and emits the
+ * error() signal. */
+void
+UPNPControl::setError(UPNPError upnpError)
+{
+ _mutex->lock();
+ _error = upnpError;
+ _mutex->unlock();
+
+ emit error(upnpError);
+}
+
+/** Sets the current UPnP state to <b>state</b> and emits the stateChanged()
+ * signal. */
+void
+UPNPControl::setState(UPNPState state)
+{
+ _mutex->lock();
+ _state = state;
+ _mutex->unlock();
+
+ emit stateChanged(state);
+}
+
+/** Returns the type of error that occurred last. */
+UPNPControl::UPNPError
+UPNPControl::error() const
+{
+ QMutexLocker locker(_mutex);
+ return _error;
+}
+
+/** Returns a QString describing the type of error that occurred last. */
+QString
+UPNPControl::errorString() const
+{
+ UPNPError error = this->error();
+
+ switch (error) {
+ case Success:
+ return tr("Success");
+ case NoUPNPDevicesFound:
+ return tr("No UPnP-enabled devices found");
+ case NoValidIGDsFound:
+ return tr("No valid UPnP-enabled Internet gateway devices found");
+ case WSAStartupFailed:
+ return tr("WSAStartup failed");
+ case AddPortMappingFailed:
+ return tr("Failed to add a port mapping");
+ case GetPortMappingFailed:
+ return tr("Failed to retrieve a port mapping");
+ case DeletePortMappingFailed:
+ return tr("Failed to remove a port mapping");
+ default:
+ return tr("Unknown error");
+ }
+}
+
+/** Returns the number of milliseconds to wait for devices to respond
+ * when attempting to discover UPnP-enabled IGDs. */
+int
+UPNPControl::discoverTimeout() const
+{
+ return UPNPControlThread::UPNPCONTROL_DISCOVER_TIMEOUT;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPControl.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPControl.h
new file mode 100644
index 0000000..36e6d6f
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPControl.h
@@ -0,0 +1,114 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 UPNPControl.h
+** \version $Id: UPNPControl.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Singleton object for interacting with UPNP device
+*/
+
+#ifndef _UPNPCONTROL_H
+#define _UPNPCONTROL_H
+
+#include <QObject>
+#include <QMutex>
+
+/* Forward declaration to make it build */
+class UPNPControlThread;
+
+
+class UPNPControl : public QObject
+{
+ Q_OBJECT
+
+public:
+ /** UPnP-related error values. */
+ enum UPNPError {
+ Success,
+ NoUPNPDevicesFound,
+ NoValidIGDsFound,
+ WSAStartupFailed,
+ AddPortMappingFailed,
+ GetPortMappingFailed,
+ DeletePortMappingFailed,
+ UnknownError
+ };
+ /** UPnP port forwarding state. */
+ enum UPNPState {
+ IdleState,
+ ErrorState,
+ DiscoverState,
+ UpdatingORPortState,
+ UpdatingDirPortState,
+ ForwardingCompleteState
+ };
+
+ /** Returns a pointer to this object's singleton instance. */
+ static UPNPControl* instance();
+ /** Terminates the UPnP control thread and frees memory allocated to this
+ * object's singleton instance. */
+ static void cleanup();
+ /** Sets <b>desiredDirPort</b> and <b>desiredOrPort</b> to the currently
+ * forwarded DirPort and ORPort values. */
+ void getDesiredState(quint16 *desiredDirPort, quint16 *desiredOrPort);
+ /** Sets the desired DirPort and ORPort port mappings to
+ * <b>desiredDirPort</b> and <b>desiredOrPort</b>, respectively. */
+ void setDesiredState(quint16 desiredDirPort, quint16 desiredOrPort);
+
+ /** Returns the type of error that occurred last. */
+ UPNPError error() const;
+ /** Returns a QString describing the type of error that occurred last. */
+ QString errorString() const;
+
+ /** Returns the number of milliseconds to wait for devices to respond
+ * when attempting to discover UPnP-enabled IGDs. */
+ int discoverTimeout() const;
+
+signals:
+ /** Emitted when the UPnP control thread status changes. */
+ void stateChanged(UPNPControl::UPNPState state);
+
+ /** Emitted when a UPnP error occurs. */
+ void error(UPNPControl::UPNPError error);
+
+protected:
+ /** Constructor. Initializes and starts a thread in which all blocking UPnP
+ * operations will be performed. */
+ UPNPControl();
+ /** Destructor. cleanup() should be called before the object is destroyed. */
+ ~UPNPControl();
+
+ /** Sets the most recent UPnP-related error to <b>error</b> and emits the
+ * error() signal.
+ * \sa error
+ */
+ void setError(UPNPError error);
+
+ /** Sets the current UPnP state to <b>state</b> and emits the stateChanged()
+ * signal.
+ * \sa stateChanged
+ */
+ void setState(UPNPState state);
+
+private:
+ static UPNPControl* _instance; /**< UPNPControl singleton instance. */
+
+ quint16 _forwardedORPort; /**< Currently forwarded ORPort. */
+ quint16 _forwardedDirPort; /**< Currently forwarded DirPort. */
+ QMutex* _mutex; /**< Mutex around variables shared with UPNPControlThread. */
+ UPNPError _error; /**< Most recent UPNP error. */
+ UPNPState _state; /**< Current UPNP status. */
+
+ friend class UPNPControlThread;
+ UPNPControlThread* _controlThread; /**< Thread used for UPnP operations. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPControlThread.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPControlThread.cpp
new file mode 100644
index 0000000..cfa78e0
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPControlThread.cpp
@@ -0,0 +1,332 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 UPNPControlThread.cpp
+** \version $Id: UPNPControlThread.cpp 4252 2010-04-09 23:18:46Z edmanm $
+** \brief Thread for configuring UPnP in the background
+*/
+
+#include "UPNPControlThread.h"
+#include "UPNPControl.h"
+#include "Vidalia.h"
+
+#include <QWaitCondition>
+#include <QMutex>
+#include <QTime>
+#include <QTextStream>
+#include <QString>
+#include <QMessageBox>
+
+#define UPNPCONTROL_REINIT_MSEC 300000 // 5 minutes
+#define UPNPCONTROL_MAX_WAIT_MSEC 60000 // 1 minute
+
+
+/** Constructor. <b>control</b> will be used for retrieving the desired port
+ * forwarding state. */
+UPNPControlThread::UPNPControlThread(UPNPControl *control)
+{
+ _upnpInitialized = QTime();
+ _keepRunning = true;
+ _control = control;
+
+ _dirPort = 0;
+ _orPort = 0;
+
+ _waitCondition = new QWaitCondition();
+ _waitMutex = new QMutex();
+}
+
+/** Destructor. The UPnP control thread must be stopped prior to destroying
+ * this object.
+ * \sa stop()
+ */
+UPNPControlThread::~UPNPControlThread()
+{
+ delete _waitCondition;
+ delete _waitMutex;
+}
+
+/** Thread entry point. The thread has a main loop that periodically wakes up
+ * and updates the configured port mappings. Upon exiting, all port mappings
+ * will be removed. */
+void
+UPNPControlThread::run()
+{
+ bool shouldExit = false;
+
+ forever {
+ /* TODO: Check for switching OR/Dir port */
+ /* TODO: Check for router losing state */
+
+ configurePorts();
+
+ /* Wait for something to happen */
+ _waitMutex->lock();
+ if (_keepRunning) {
+ /* We should continue */
+ UPNPControl::instance()->setState(UPNPControl::IdleState);
+ _waitCondition->wait(_waitMutex, UPNPCONTROL_MAX_WAIT_MSEC);
+
+ /* Maybe we were asked to exit while waiting */
+ shouldExit = !_keepRunning;
+ _waitMutex->unlock();
+ if (shouldExit)
+ break;
+ } else {
+ /* We should exit */
+ _waitMutex->unlock();
+ break;
+ }
+ }
+
+ /* Remove the existing port forwards */
+ updatePort(_dirPort, 0);
+ updatePort(_orPort, 0);
+}
+
+/** Sets up port forwarding according the previously-configured desired state.
+ * The desired state is set using UPNPControl's setDesiredState() method.
+ * \sa UPNPControl::setDesiredState
+ */
+void
+UPNPControlThread::configurePorts()
+{
+ quint16 desiredDirPort, desiredOrPort;
+ bool force_init = false;
+ UPNPControl::UPNPError retval = UPNPControl::Success;
+
+ /* Get desired state */
+ _control->getDesiredState(&desiredDirPort, &desiredOrPort);
+
+ /* If it's been a while since we initialized the router, or time has gone
+ backward, then maybe the router has gone away or forgotten the forwards.
+ Reset UPnP state, and re-do the port forwarding */
+ if (_upnpInitialized.isNull() || // Is this the first time we have used UPNP?
+ _upnpInitialized>QTime::currentTime() || // Has time gone backwards?
+ _upnpInitialized.addMSecs(UPNPCONTROL_REINIT_MSEC)<QTime::currentTime() // Has it been REINIT_MSEC since initialization
+ ) {
+ _upnpInitialized = QTime();
+ force_init = true;
+ }
+
+ if (!force_init) {
+ /* Configure DirPort */
+ if (desiredDirPort != _dirPort) {
+ UPNPControl::instance()->setState(UPNPControl::UpdatingDirPortState);
+ retval = updatePort(_dirPort, desiredDirPort);
+ if (retval == UPNPControl::Success)
+ _dirPort = desiredDirPort;
+ else
+ goto err;
+ }
+
+ /* Configure ORPort */
+ if (desiredOrPort != _orPort) {
+ UPNPControl::instance()->setState(UPNPControl::UpdatingORPortState);
+ retval = updatePort(_orPort, desiredOrPort);
+ if (retval == UPNPControl::Success)
+ _orPort = desiredOrPort;
+ else
+ goto err;
+ }
+ } else {
+ /* Add the mapping even if they exist already */
+ UPNPControl::instance()->setState(UPNPControl::UpdatingDirPortState);
+ retval = updatePort(0, desiredDirPort);
+ if (retval == UPNPControl::Success)
+ _dirPort = desiredDirPort;
+ else
+ goto err;
+
+ UPNPControl::instance()->setState(UPNPControl::UpdatingORPortState);
+ retval = updatePort(0, desiredOrPort);
+ if (retval == UPNPControl::Success)
+ _orPort = desiredOrPort;
+ else goto err;
+ }
+
+ UPNPControl::instance()->setState(UPNPControl::ForwardingCompleteState);
+ return;
+
+err:
+ UPNPControl::instance()->setError(retval);
+ UPNPControl::instance()->setState(UPNPControl::ErrorState);
+}
+
+/** Terminates the UPnP control thread's run() loop.
+ * \sa run()
+ */
+void
+UPNPControlThread::stop()
+{
+ /* Lock access to _keepRunning */
+ _waitMutex->lock();
+
+ /* Ask the thread to stop */
+ _keepRunning = false;
+
+ /* Wake it up if needed */
+ _waitCondition->wakeAll();
+
+ /* Unlock shared state */
+ _waitMutex->unlock();
+
+ /* Wait for it to finish */
+ wait();
+}
+
+/** Wakes up the UPnP control thread's run() loop.
+ * \sa run()
+ */
+void
+UPNPControlThread::wakeup()
+{
+ _waitMutex->lock();
+ _waitCondition->wakeAll();
+ _waitMutex->unlock();
+}
+
+/** Updates the port mapping for <b>oldPort</b>, changing it to
+ * <b>newPort</b>. */
+UPNPControl::UPNPError
+UPNPControlThread::updatePort(quint16 oldPort, quint16 newPort)
+{
+ UPNPControl::UPNPError retval;
+
+#ifdef Q_OS_WIN32
+ // Workaround from http://trolltech.com/developer/knowledgebase/579
+ WSAData wsadata;
+ if (WSAStartup(MAKEWORD(2,0), &wsadata) != 0) {
+ vWarn("WSAStartup failure while updating UPnP port forwarding");
+ return UPNPControl::WSAStartupFailed;
+ }
+#endif
+
+ if (_upnpInitialized.isNull() && (oldPort != 0 || newPort != 0)) {
+ retval = initializeUPNP();
+ if (retval == UPNPControl::Success)
+ _upnpInitialized = QTime::currentTime();
+ else
+ _upnpInitialized = QTime();
+ } else {
+ retval = UPNPControl::Success;
+ }
+
+ if (retval == UPNPControl::Success && oldPort != 0)
+ retval = disablePort(oldPort);
+
+ if (retval == UPNPControl::Success && newPort != 0)
+ retval = forwardPort(newPort);
+
+#ifdef Q_OS_WIN32
+ WSACleanup();
+#endif
+
+ return retval;
+}
+
+/** Discovers UPnP-enabled IGDs on the network. Based on
+ * http://miniupnp.free.fr/files/download.php?file=xchat-upnp20061022.patch
+ * This method will block for UPNPCONTROL_DISCOVER_TIMEOUT milliseconds. */
+UPNPControl::UPNPError
+UPNPControlThread::initializeUPNP()
+{
+ struct UPNPDev *devlist;
+ int retval;
+
+ memset(&urls, 0, sizeof(struct UPNPUrls));
+ memset(&data, 0, sizeof(struct IGDdatas));
+
+ UPNPControl::instance()->setState(UPNPControl::DiscoverState);
+
+ devlist = upnpDiscover(UPNPCONTROL_DISCOVER_TIMEOUT, NULL, NULL, 0);
+ if (NULL == devlist) {
+ vWarn("upnpDiscover returned: NULL");
+ return UPNPControl::NoUPNPDevicesFound;
+ }
+
+ retval = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
+
+ vInfo("GetValidIGD returned: %1").arg(retval);
+
+ freeUPNPDevlist(devlist);
+
+ if (retval != 1 && retval != 2)
+ return UPNPControl::NoValidIGDsFound;
+
+ return UPNPControl::Success;
+}
+
+/** Adds a port forwarding mapping from external:<b>port</b> to
+ * internal:<b>port</b>. Returns 0 on success, or non-zero on failure. */
+UPNPControl::UPNPError
+UPNPControlThread::forwardPort(quint16 port)
+{
+ QString sPort;
+ int retval;
+
+ char intClient[16];
+ char intPort[6];
+
+ // Convert the port number to a string
+ sPort = QString::number(port);
+
+ // Add the port mapping of external:port -> internal:port
+ retval = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
+ qPrintable(sPort), qPrintable(sPort), lanaddr,
+ "Tor relay", "TCP", NULL);
+ if(UPNPCOMMAND_SUCCESS != retval) {
+ vWarn("AddPortMapping(%1, %2, %3) failed with code %4")
+ .arg(sPort).arg(sPort).arg(lanaddr).arg(retval);
+ return UPNPControl::AddPortMappingFailed;
+ }
+
+ // Check if the port mapping was accepted
+ retval = UPNP_GetSpecificPortMappingEntry(urls.controlURL, data.first.servicetype,
+ qPrintable(sPort), "TCP",
+ intClient, intPort);
+ if(UPNPCOMMAND_SUCCESS != retval) {
+ vWarn("GetSpecificPortMappingEntry() failed with code %1").arg(retval);
+ return UPNPControl::GetPortMappingFailed;
+ }
+
+ if(! intClient[0]) {
+ vWarn("GetSpecificPortMappingEntry failed.");
+ return UPNPControl::GetPortMappingFailed;
+ }
+
+ // Output the mapping
+ vInfo("(external):%1 -> %2:%3").arg(sPort).arg(intClient).arg(intPort);
+
+ return UPNPControl::Success;
+}
+
+/** Removes the port mapping for <b>port</b>. Returns 0 on success or non-zero
+ * on failure. */
+UPNPControl::UPNPError
+UPNPControlThread::disablePort(quint16 port)
+{
+ QString sPort = QString::number(port);
+
+ // Remove the mapping
+ int retval = UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype,
+ qPrintable(sPort), "TCP", NULL);
+ if(UPNPCOMMAND_SUCCESS != retval) {
+ vWarn("DeletePortMapping() failed with code %1").arg(retval);
+ return UPNPControl::DeletePortMappingFailed;
+ }
+
+ // Output the cancelled mapping
+ vInfo("(external):%1 -> <>").arg(sPort);
+
+ return UPNPControl::Success;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPControlThread.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPControlThread.h
new file mode 100644
index 0000000..1159110
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPControlThread.h
@@ -0,0 +1,92 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 UPNPControlThread.h
+** \version $Id: UPNPControlThread.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Thread for configuring UPnP in the background
+*/
+
+#ifndef _UPNPCONTROLTHREAD_H
+#define _UPNPCONTROLTHREAD_H
+
+#include "UPNPControl.h"
+
+#define STATICLIB
+#include <miniupnpc/miniwget.h>
+#include <miniupnpc/miniupnpc.h>
+#include <miniupnpc/upnpcommands.h>
+#undef STATICLIB
+
+#include <QThread>
+#include <QMutex>
+#include <QWaitCondition>
+#include <QTime>
+
+
+class UPNPControlThread : public QThread
+{
+ Q_OBJECT
+
+public:
+ /** Specifies the number of milliseconds to wait for devices to respond
+ * when attempting to discover UPnP-enabled IGDs. */
+ static const int UPNPCONTROL_DISCOVER_TIMEOUT = 2000;
+
+ /** Constructor. <b>control</b> will be used for retrieving the desired port
+ * forwarding state. */
+ UPNPControlThread(UPNPControl *control);
+ /** Destructor. The UPnP control thread must be stopped prior to destroying
+ * this object. */
+ ~UPNPControlThread();
+ /** Terminates the UPnP control thread's run() loop. */
+ void stop();
+ /** Wakes up the UPnP control thread's run() loop. */
+ void wakeup();
+
+protected:
+ /** Thread entry point. The thread has a main loop that periodically wakes
+ * up and updates the configured port mappings. Upon exiting, all port
+ * mappings will be removed. */
+ void run();
+
+private:
+ /** Sets up port forwarding according the previously-configured desired
+ * state. The desired state is set using UPNPControl's setDesiredState()
+ * method. */
+ void configurePorts();
+ /** Discovers UPnP-enabled IGDs on the network. This method will block for
+ * UPNPCONTROL_DISCOVER_TIMEOUT milliseconds. */
+ UPNPControl::UPNPError initializeUPNP();
+ /** Updates the port mapping for <b>oldPort</b>, changing it to
+ * <b>newPort</b>. */
+ UPNPControl::UPNPError updatePort(quint16 oldPort, quint16 newPort);
+ /** Adds a port forwarding mapping from external:<b>port</b> to
+ * internal:<b>port</b>. Returns 0 on success, or non-zero on failure. */
+ UPNPControl::UPNPError forwardPort(quint16 port);
+ /** Removes the port mapping for <b>port</b>. Returns 0 on success or
+ * non-zero on failure. */
+ UPNPControl::UPNPError disablePort(quint16 port);
+
+ QTime _upnpInitialized; /**< Time at which the UPnP state was last set. */
+ bool _keepRunning; /**< True if the control thread should keep running. */
+ UPNPControl *_control; /**< Stores desired UPnP state. */
+ QWaitCondition *_waitCondition; /**< Used to wake up the control thread. */
+ QMutex *_waitMutex; /**< Mutex around shared variables. */
+ quint16 _dirPort; /**< Desired DirPort. */
+ quint16 _orPort; /**< Desired ORPort. */
+
+ /* Used by miniupnpc library */
+ struct UPNPUrls urls;
+ struct IGDdatas data;
+ char lanaddr[16];
+};
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPTestDialog.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPTestDialog.cpp
new file mode 100644
index 0000000..2e1bda3
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPTestDialog.cpp
@@ -0,0 +1,168 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 UPNPTestDialog.cpp
+** \version $Id: UPNPTestDialog.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Dialog that displays the progress of a UPnP configuration test
+*/
+
+#include "UPNPTestDialog.h"
+
+
+/** Default constructor. <b>orPort</b> and <b>dirPort</b> specify the ports
+ * used to test UPnP port forwarding. The original UPnP state will be restored
+ * when the test dialog is closed. */
+UPNPTestDialog::UPNPTestDialog(quint16 orPort, quint16 dirPort, QWidget *parent)
+ : QDialog(parent), _orPort(orPort), _dirPort(dirPort)
+{
+ ui.setupUi(this);
+ _upnp = UPNPControl::instance();
+
+ ui.buttonBox->setStandardButtons(QDialogButtonBox::Close
+ | QDialogButtonBox::Help);
+
+ ui.progressBar->setValue(0);
+ ui.progressBar->setFormat("");
+ ui.progressBar->setMinimum(0);
+ ui.progressBar->setMaximum(_upnp->discoverTimeout()/500 + 4);
+
+ _discoverTimer.setInterval(500);
+ connect(&_discoverTimer, SIGNAL(timeout()), this, SLOT(discoverTimeout()));
+ connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton*)),
+ this, SLOT(clicked(QAbstractButton*)));
+
+ _upnp->getDesiredState(&_oldDirPort, &_oldOrPort);
+}
+
+/** Shows or hides the dialog based on <b>visible</b>. The UPnP test will be
+ * started when the dialog is first shown. */
+void
+UPNPTestDialog::setVisible(bool visible)
+{
+ QWidget::setVisible(visible);
+
+ if (visible)
+ startTest();
+ else
+ _upnp->setDesiredState(_oldDirPort, _oldOrPort);
+}
+
+/** Initiates a UPnP test. */
+void
+UPNPTestDialog::startTest()
+{
+ ui.buttonBox->setEnabled(false);
+ ui.progressBar->setValue(0);
+
+ connect(UPNPControl::instance(), SIGNAL(stateChanged(UPNPControl::UPNPState)),
+ this, SLOT(upnpStateChanged(UPNPControl::UPNPState)));
+
+ UPNPControl::instance()->setDesiredState(_dirPort, _orPort);
+}
+
+/** Called when the UPnP test successfully enables port forwarding. Enables
+ * the Close button, allowing the user to exit the test dialog. */
+void
+UPNPTestDialog::testSuccessful()
+{
+ ui.buttonBox->setEnabled(true);
+ ui.buttonBox->setStandardButtons(QDialogButtonBox::Close
+ | QDialogButtonBox::Help);
+
+ disconnect(UPNPControl::instance(), 0, this, 0);
+}
+
+/** Called when the UPnP test fails due to an error. Enables the Close and
+ * Retry buttons, allowing the user to either rerun the test or give up. */
+void
+UPNPTestDialog::testFailed()
+{
+ ui.buttonBox->setEnabled(true);
+ ui.buttonBox->setStandardButtons(QDialogButtonBox::Retry
+ | QDialogButtonBox::Close
+ | QDialogButtonBox::Help);
+
+ disconnect(UPNPControl::instance(), 0, this, 0);
+}
+
+/** Updates the progress bar to indicate the device discovery portion of the
+ * test is still in progress. */
+void
+UPNPTestDialog::discoverTimeout()
+{
+ ui.progressBar->setValue(ui.progressBar->value()+1);
+}
+
+/** Updates the test UI based on the UPnP <b>state</b>. */
+void
+UPNPTestDialog::upnpStateChanged(UPNPControl::UPNPState state)
+{
+ switch (state) {
+ case UPNPControl::DiscoverState:
+ _discoverTimer.start();
+ ui.progressBar->setValue(ui.progressBar->value()+1);
+ ui.lblCurrentState->setText(tr("Discovering UPnP-enabled devices"));
+ break;
+
+ case UPNPControl::UpdatingDirPortState:
+ ui.progressBar->setValue(ui.progressBar->value()+1);
+ ui.lblCurrentState->setText(tr("Updating directory port mapping"));
+ break;
+
+ case UPNPControl::UpdatingORPortState:
+ ui.progressBar->setValue(ui.progressBar->value()+1);
+ ui.lblCurrentState->setText(tr("Updating relay port mapping"));
+ break;
+
+ case UPNPControl::ForwardingCompleteState:
+ ui.progressBar->setValue(ui.progressBar->maximum());
+ ui.lblCurrentState->setText(tr("Test completed successfully!"));
+ testSuccessful();
+ break;
+
+ case UPNPControl::ErrorState:
+ ui.progressBar->setValue(ui.progressBar->maximum());
+ ui.lblCurrentState->setText(UPNPControl::instance()->errorString());
+ testFailed();
+ break;
+
+ default:
+ break;
+ }
+ if (state != UPNPControl::DiscoverState)
+ _discoverTimer.stop();
+}
+
+/** Called when a user clicks on a button in the dialog's button box. If Retry
+ * is clicked, another UPnP test will be conducted. If Close is clicked, then
+ * the dialog is closed and the original UPnP state restored. */
+void
+UPNPTestDialog::clicked(QAbstractButton *button)
+{
+ switch (ui.buttonBox->standardButton(button)) {
+ case QDialogButtonBox::Retry:
+ startTest();
+ break;
+
+ case QDialogButtonBox::Close:
+ done(0);
+ break;
+
+ case QDialogButtonBox::Help:
+ emit help();
+ done(0);
+ break;
+
+ default:
+ break;
+ }
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPTestDialog.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPTestDialog.h
new file mode 100644
index 0000000..5c3a02f
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPTestDialog.h
@@ -0,0 +1,89 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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 UPNPTestDialog.h
+** \version $Id: UPNPTestDialog.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Dialog that displays the progress of a UPnP configuration test
+*/
+
+#ifndef _UPNPTESTDIALOG_H
+#define _UPNPTESTDIALOG_H
+
+#include "ui_UPNPTestDialog.h"
+#include "UPNPControl.h"
+
+#include <QDialog>
+#include <QAbstractButton>
+#include <QTimer>
+
+
+class UPNPTestDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. <b>orPort</b> and <b>dirPort</b> specify the ports
+ * used to test UPnP port forwarding. The original UPnP state will be
+ * restored when the test dialog is closed. */
+ UPNPTestDialog(quint16 orPort, quint16 dirPort, QWidget *parent = 0);
+
+signals:
+ /** Emitted when the user clicks the 'Help' button requesting the help topic
+ * on port forwarding. */
+ void help();
+
+protected slots:
+ /** Shows or hides the dialog based on <b>visible</b>. The UPnP test will be
+ * started when the dialog is first shown. */
+ void setVisible(bool visible);
+
+ /** Called when a user clicks on a button in the dialog's button box. If
+ * Retry is clicked, another UPnP test will be conducted. If Close is clicked,
+ * then the dialog is closed and the original UPnP state restored. */
+ void clicked(QAbstractButton *button);
+
+ /** Updates the test UI based on the UPnP <b>state</b>. */
+ void upnpStateChanged(UPNPControl::UPNPState state);
+
+ /** Updates the progress bar to indicate the device discovery portion of the
+ * test is still in progress. */
+ void discoverTimeout();
+
+protected:
+ /** Initiates a UPnP test. */
+ void startTest();
+
+ /** Called when the UPnP test successfully enables port forwarding. Enables
+ * the Close button, allowing the user to exit the test dialog. */
+ void testSuccessful();
+
+ /** Called when the UPnP test fails due to an error. Enables the Close and
+ * Retry buttons, allowing the user to either rerun the test or give up. */
+ void testFailed();
+
+private:
+ /** Pointer to the UPNPControl singleton instance. */
+ UPNPControl *_upnp;
+
+ /** Timer used to update the progress bar while during the device discovery
+ * portion of the test. */
+ QTimer _discoverTimer;
+
+ quint16 _oldOrPort; /**< Original (pre-test) forwarded ORPort. */
+ quint16 _oldDirPort; /**< Original (pre-test) forwarded DirPort. */
+ quint16 _orPort; /**< ORPort used during the test. */
+ quint16 _dirPort; /**< DirPort used during the test. */
+
+ Ui::UPNPTestDialog ui;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPTestDialog.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPTestDialog.ui
new file mode 100644
index 0000000..c1a9a44
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/UPNPTestDialog.ui
@@ -0,0 +1,100 @@
+<ui version="4.0" >
+ <class>UPNPTestDialog</class>
+ <widget class="QDialog" name="UPNPTestDialog" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>389</width>
+ <height>150</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+ <string>Testing UPnP Support</string>
+ </property>
+ <property name="windowIcon" >
+ <iconset resource="../res/vidalia.qrc" >:/images/48x48/modem.png</iconset>
+ </property>
+ <property name="modal" >
+ <bool>true</bool>
+ </property>
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="geometry" >
+ <rect>
+ <x>30</x>
+ <y>110</y>
+ <width>341</width>
+ <height>32</height>
+ </rect>
+ </property>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Close|QDialogButtonBox::Retry</set>
+ </property>
+ <property name="centerButtons" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ <widget class="QProgressBar" name="progressBar" >
+ <property name="geometry" >
+ <rect>
+ <x>20</x>
+ <y>60</y>
+ <width>351</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="value" >
+ <number>24</number>
+ </property>
+ </widget>
+ <widget class="QLabel" name="lblUpnpPixmap" >
+ <property name="geometry" >
+ <rect>
+ <x>20</x>
+ <y>10</y>
+ <width>51</width>
+ <height>48</height>
+ </rect>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="pixmap" >
+ <pixmap resource="../res/vidalia.qrc" >:/images/48x48/modem.png</pixmap>
+ </property>
+ </widget>
+ <widget class="Line" name="line" >
+ <property name="geometry" >
+ <rect>
+ <x>20</x>
+ <y>90</y>
+ <width>351</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ <widget class="QLabel" name="lblCurrentState" >
+ <property name="geometry" >
+ <rect>
+ <x>80</x>
+ <y>30</y>
+ <width>291</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="text" >
+ <string>Testing Universal Plug & Play Support</string>
+ </property>
+ </widget>
+ </widget>
+ <resources>
+ <include location="../res/vidalia.qrc" />
+ </resources>
+ <connections />
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/VSettings.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/VSettings.cpp
new file mode 100644
index 0000000..27d5b54
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/VSettings.cpp
@@ -0,0 +1,106 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 VSettings.cpp
+** \version $Id: VSettings.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Stores and retrieves settings from Vidalia's configuration file.
+*/
+
+#include "VSettings.h"
+#include "Vidalia.h"
+
+#include <QFileInfo>
+
+/** The file in which all settings will read and written. */
+#define SETTINGS_FILE (Vidalia::dataDirectory() + "/vidalia.conf")
+
+
+/** Constructor */
+VSettings::VSettings(const QString settingsGroup)
+: QSettings(SETTINGS_FILE, QSettings::IniFormat)
+{
+ if (!settingsGroup.isEmpty())
+ beginGroup(settingsGroup);
+}
+
+/** Returns the location of Vidalia's configuration settings file. */
+QString
+VSettings::settingsFile()
+{
+ return SETTINGS_FILE;
+}
+
+/** Returns true if Vidalia's configuration settings file already exists. */
+bool
+VSettings::settingsFileExists()
+{
+ QFileInfo fi(settingsFile());
+ return fi.exists();
+}
+
+/** Returns the saved value associated with <b>key</b>. If no value has been
+ * set, the default value is returned.
+ * \sa setDefault
+ */
+QVariant
+VSettings::value(const QString &key, const QVariant &defaultVal) const
+{
+ return QSettings::value(key, defaultVal.isNull() ? defaultValue(key)
+ : defaultVal);
+}
+
+/** Sets the value associated with <b>key</b> to <b>val</b>. */
+void
+VSettings::setValue(const QString &key, const QVariant &val)
+{
+ if (val == defaultValue(key))
+ QSettings::remove(key);
+ else if (val != value(key))
+ QSettings::setValue(key, val);
+}
+
+/** Sets the default setting for <b>key</b> to <b>val</b>. */
+void
+VSettings::setDefault(const QString &key, const QVariant &val)
+{
+ _defaults.insert(key, val);
+}
+
+/** Returns the default setting value associated with <b>key</b>. If
+ * <b>key</b> has no default value, then an empty QVariant is returned. */
+QVariant
+VSettings::defaultValue(const QString &key) const
+{
+ if (_defaults.contains(key))
+ return _defaults.value(key);
+ return QVariant();
+}
+
+/** Resets all of Vidalia's settings. */
+void
+VSettings::reset()
+{
+ /* Static method, so we have to create a QSettings object. */
+ QSettings settings(SETTINGS_FILE, QSettings::IniFormat);
+ settings.clear();
+}
+
+/** Returns a map of all currently saved settings at the last appyl() point. */
+QMap<QString, QVariant>
+VSettings::allSettings() const
+{
+ QMap<QString, QVariant> settings;
+ foreach (QString key, allKeys()) {
+ settings.insert(key, value(key));
+ }
+ return settings;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/VSettings.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/VSettings.h
new file mode 100644
index 0000000..531af56
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/VSettings.h
@@ -0,0 +1,67 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 vsettings.h
+** \version $Id: VSettings.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Stores and retrieves settings from Vidalia's configuration file.
+*/
+
+#ifndef _VSETTINGS_H
+#define _VSETTINGS_H
+
+#include <QHash>
+#include <QSettings>
+
+
+class VSettings : public QSettings
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. The optional parameter <b>group</b> can be used to
+ * set a prefix that will be prepended to keys specified to VSettings in
+ * value() and setValue(). */
+ VSettings(const QString group = QString());
+
+ /** Returns the location of Vidalia's configuration settings file. */
+ static QString settingsFile();
+ /** Returns true if Vidalia's configuration settings file already exists. */
+ static bool settingsFileExists();
+
+ /** Resets all of Vidalia's settings. */
+ static void reset();
+
+ /** Returns the saved value associated with <b>key</b>. If no value has been
+ * set, the default value is returned.
+ * \sa setDefault
+ */
+ virtual QVariant value(const QString &key,
+ const QVariant &defaultVal = QVariant()) const;
+ /** Sets the value associated with <b>key</b> to <b>val</b>. */
+ virtual void setValue(const QString &key, const QVariant &val);
+
+protected:
+ /** Sets the default setting for <b>key</b> to <b>val</b>. */
+ void setDefault(const QString &key, const QVariant &val);
+ /** Returns the default setting value associated with <b>key</b>. If
+ * <b>key</b> has no default value, then an empty QVariant is returned. */
+ QVariant defaultValue(const QString &key) const;
+ /** Returns a map of all currently saved settings at the last apply()
+ * point. */
+ QMap<QString, QVariant> allSettings() const;
+
+private:
+ /** Association of setting key names to default setting values. */
+ QHash<QString, QVariant> _defaults;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/VidaliaSettings.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/VidaliaSettings.cpp
new file mode 100644
index 0000000..a6cb68c
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/VidaliaSettings.cpp
@@ -0,0 +1,296 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 VidaliaSettings.cpp
+** \version $Id: VidaliaSettings.cpp 4132 2009-09-24 02:28:18Z edmanm $
+** \brief General Vidalia settings, such as language and interface style
+*/
+
+#include "VidaliaSettings.h"
+#include "LanguageSupport.h"
+#include "Vidalia.h"
+#if defined(Q_WS_WIN)
+#include "win32.h"
+#endif
+
+#include <QDir>
+#include <QCoreApplication>
+#include <QStyleFactory>
+
+#define SETTING_LANGUAGE "LanguageCode"
+#define SETTING_STYLE "InterfaceStyle"
+#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_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"
+
+#if defined(Q_OS_WIN32)
+#define STARTUP_REG_KEY "Software\\Microsoft\\Windows\\CurrentVersion\\Run"
+#define VIDALIA_REG_KEY "Vidalia"
+#endif
+
+
+/** Default Constructor */
+VidaliaSettings::VidaliaSettings()
+{
+#if defined(Q_WS_MAC)
+ setDefault(SETTING_STYLE, "macintosh (aqua)");
+#else
+ static QStringList styles = QStyleFactory::keys();
+#if defined(Q_WS_WIN)
+ if (styles.contains("windowsvista", Qt::CaseInsensitive))
+ setDefault(SETTING_STYLE, "windowsvista");
+ else
+#endif
+ {
+ if (styles.contains("cleanlooks", Qt::CaseInsensitive))
+ setDefault(SETTING_STYLE, "cleanlooks");
+ else
+ setDefault(SETTING_STYLE, "plastique");
+ }
+#endif
+
+ setDefault(SETTING_LANGUAGE, LanguageSupport::defaultLanguageCode());
+ setDefault(SETTING_RUN_TOR_AT_START, true);
+ 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
+ setDefault(SETTING_CHECK_FOR_UPDATES, false);
+#endif
+ setDefault(SETTING_LAST_UPDATE_CHECK, QDateTime());
+}
+
+/** Gets the currently preferred language code for Vidalia. */
+QString
+VidaliaSettings::getLanguageCode()
+{
+ return value(SETTING_LANGUAGE).toString();
+}
+
+/** Sets the preferred language code. */
+void
+VidaliaSettings::setLanguageCode(QString languageCode)
+{
+ setValue(SETTING_LANGUAGE, languageCode);
+}
+
+/** Gets the interface style key (e.g., "windows", "motif", etc.) */
+QString
+VidaliaSettings::getInterfaceStyle()
+{
+ return value(SETTING_STYLE).toString();
+}
+
+/** Sets the interface style key. */
+void
+VidaliaSettings::setInterfaceStyle(QString styleKey)
+{
+ setValue(SETTING_STYLE, styleKey);
+}
+
+/** Returns true if Tor is to be run when Vidalia starts. */
+bool
+VidaliaSettings::runTorAtStart()
+{
+ return value(SETTING_RUN_TOR_AT_START).toBool();
+}
+
+/** If <b>run</b> is set to true, then Tor will be run when Vidalia starts. */
+void
+VidaliaSettings::setRunTorAtStart(bool run)
+{
+ setValue(SETTING_RUN_TOR_AT_START, run);
+}
+
+/** Returns true if Vidalia's main window should be visible when the
+ * application starts. */
+bool
+VidaliaSettings::showMainWindowAtStart()
+{
+ return value(SETTING_SHOW_MAINWINDOW_AT_START).toBool();
+}
+
+/** Sets whether to show Vidalia's main window when the application starts. */
+void
+VidaliaSettings::setShowMainWindowAtStart(bool show)
+{
+ setValue(SETTING_SHOW_MAINWINDOW_AT_START, show);
+}
+
+
+/** Returns true if Vidalia is set to run on system boot. */
+bool
+VidaliaSettings::runVidaliaOnBoot()
+{
+#if defined(Q_WS_WIN)
+ if (!win32_registry_get_key_value(STARTUP_REG_KEY, VIDALIA_REG_KEY).isEmpty()) {
+ return true;
+ } else {
+ return false;
+ }
+#else
+ /* Platforms other than windows aren't supported yet */
+ return false;
+#endif
+}
+
+/** If <b>run</b> is set to true, then Vidalia will run on system boot. */
+void
+VidaliaSettings::setRunVidaliaOnBoot(bool run)
+{
+#if defined(Q_WS_WIN)
+ if (run) {
+ win32_registry_set_key_value(STARTUP_REG_KEY, VIDALIA_REG_KEY,
+ QString("\"" +
+ QDir::convertSeparators(QCoreApplication::applicationFilePath())) +
+ "\"");
+ } else {
+ win32_registry_remove_key(STARTUP_REG_KEY, VIDALIA_REG_KEY);
+ }
+#else
+ /* Platforms othe rthan windows aren't supported yet */
+ Q_UNUSED(run);
+ return;
+#endif
+}
+
+/** If browserDirectory is empty, returns a fully-qualified path to
+ * the web browser, including the executable name. If browserDirectory
+ * is set, then returns the basename of the configured web browser */
+QString
+VidaliaSettings::getBrowserExecutable() const
+{
+ return QDir::convertSeparators(value(SETTING_BROWSER_EXECUTABLE).toString());
+}
+
+/** Sets the location and name of the web browser executable to the given string.
+ * If set to the empty string, the browser will not be started. */
+void
+VidaliaSettings::setBrowserExecutable(const QString &browserExecutable)
+{
+ setValue(SETTING_BROWSER_EXECUTABLE, browserExecutable);
+}
+
+/** Returns a fully-qualified path to the web browser directory */
+QString
+VidaliaSettings::getBrowserDirectory() const
+{
+ return QDir::convertSeparators(value(SETTING_BROWSER_DIRECTORY).toString());
+}
+
+/** Sets the location and name of the web browser directory to the given string.
+ * If set to the empty string, the browser will not be started. */
+void
+VidaliaSettings::setBrowserDirectory(const QString &browserDirectory)
+{
+ setValue(SETTING_BROWSER_DIRECTORY, browserDirectory);
+}
+
+/** Returns a fully-qualified path to the IM client, including the
+ * executable name. */
+QString
+VidaliaSettings::getIMExecutable() const
+{
+ return QDir::convertSeparators(value(SETTING_IM_EXECUTABLE).toString());
+}
+
+/** Sets the location and name of the IM client executable to the given string.
+ * If set to the empty string, the client will not be started. */
+void
+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
+{
+ return value(SETTING_CHECK_FOR_UPDATES).toBool();
+}
+
+void
+VidaliaSettings::setAutoUpdateEnabled(bool enabled)
+{
+ setValue(SETTING_CHECK_FOR_UPDATES, enabled);
+}
+
+QDateTime
+VidaliaSettings::lastCheckedForUpdates() const
+{
+ return value(SETTING_LAST_UPDATE_CHECK).toDateTime();
+}
+
+void
+VidaliaSettings::setLastCheckedForUpdates(const QDateTime &checkedAt)
+{
+ setValue(SETTING_LAST_UPDATE_CHECK, checkedAt);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/VidaliaSettings.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/VidaliaSettings.h
new file mode 100644
index 0000000..6ff97ea
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/config/VidaliaSettings.h
@@ -0,0 +1,121 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 VidaliaSettings.h
+** \version $Id: VidaliaSettings.h 4132 2009-09-24 02:28:18Z edmanm $
+** \brief General Vidalia settings, such as language and interface style
+*/
+
+#ifndef _VIDALIASETTINGS_H
+#define _VIDALIASETTINGS_H
+
+#include "VSettings.h"
+
+#include <QDateTime>
+
+
+/** Handles saving and restoring Vidalia's settings, such as the
+ * location of Tor, the control port, etc.
+ *
+ * NOTE: Qt 4.1 documentation states that constructing a QSettings object is
+ * "very fast", so we shouldn't need to create a global instance of this
+ * class.
+ */
+class VidaliaSettings : public VSettings
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. */
+ VidaliaSettings();
+
+ /** Gets the currently preferred language code for Vidalia. */
+ QString getLanguageCode();
+ /** Saves the preferred language code. */
+ void setLanguageCode(QString languageCode);
+
+ /** Gets the interface style key (e.g., "windows", "motif", etc.) */
+ QString getInterfaceStyle();
+ /** Sets the interface style key. */
+ void setInterfaceStyle(QString styleKey);
+
+ /** Returns true if Vidalia should start Tor when it starts. */
+ bool runTorAtStart();
+ /** Set whether to run Tor when Vidalia starts. */
+ void setRunTorAtStart(bool run);
+
+ /** Returns true if Vidalia's main window should be visible when the
+ * application starts. */
+ bool showMainWindowAtStart();
+ /** Sets whether to show Vidalia's main window when the application starts. */
+ void setShowMainWindowAtStart(bool show);
+
+ /** Returns true if Vidalia should start on system boot. */
+ bool runVidaliaOnBoot();
+ /** Set whether to run Vidalia on system boot. */
+ void setRunVidaliaOnBoot(bool run);
+
+ /** If browserDirectory is empty, returns a fully-qualified path to
+ * the web browser, including the executable name. If browserDirectory
+ * is set, then returns the basename of the configured web browser */
+ QString getBrowserExecutable() const;
+ /** Sets the location and name of the web browser executable to the given
+ * string. If set to the empty string, the browser will not be started. */
+ void setBrowserExecutable(const QString &browserExecutable);
+
+ /** Returns a fully-qualified path to the web browser directory */
+ QString getBrowserDirectory() const;
+ /** Sets the location and name of the web browser directory to the given string.
+ * If set to the empty string, the browser will not be started. */
+ void setBrowserDirectory(const QString &browserDirectory);
+
+ /** Returns a fully-qualified path to the IM client, including the
+ * executable name. */
+ QString getIMExecutable() const;
+ /** Sets the location and name of the IM client executable to the given
+ * 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;
+ /** Sets to <b>enabled</b> whether Vidalia should automatically check for
+ * software updates or not. */
+ void setAutoUpdateEnabled(bool enabled);
+
+ /** Returns the time at which Vidalia last checked for software updates. */
+ QDateTime lastCheckedForUpdates() const;
+ /** Sets to <b>checkedAt</b> the time at which Vidalia last checked for
+ * available software updates. */
+ void setLastCheckedForUpdates(const QDateTime &checkedAt);
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/browser/HelpBrowser.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/browser/HelpBrowser.cpp
new file mode 100644
index 0000000..a84719f
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/browser/HelpBrowser.cpp
@@ -0,0 +1,459 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 HelpBrowser.cpp
+** \version $Id: HelpBrowser.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays a list of help topics and content
+*/
+
+#include "HelpBrowser.h"
+#include "Vidalia.h"
+
+#include <QDomDocument>
+#include <QDir>
+
+#define LEFT_PANE_INDEX 0
+#define NO_STRETCH 0
+#define MINIMUM_PANE_SIZE 1
+
+/* Names of elements and attributes in the XML file */
+#define ELEMENT_CONTENTS "Contents"
+#define ELEMENT_TOPIC "Topic"
+#define ATTRIBUTE_TOPIC_ID "id"
+#define ATTRIBUTE_TOPIC_HTML "html"
+#define ATTRIBUTE_TOPIC_NAME "name"
+#define ATTRIBUTE_TOPIC_SECTION "section"
+
+/* Define two roles used to store data associated with a topic item */
+#define ROLE_TOPIC_ID Qt::UserRole
+#define ROLE_TOPIC_QRC_PATH (Qt::UserRole+1)
+
+
+/** Constuctor. This will probably do more later */
+HelpBrowser::HelpBrowser(QWidget *parent)
+ : VidaliaWindow("HelpBrowser", parent)
+{
+ VidaliaSettings settings;
+
+ /* Invoke Qt Designer generated QObject setup routine */
+ ui.setupUi(this);
+#if defined(Q_WS_MAC)
+ ui.actionHome->setShortcut(QString("Shift+Ctrl+H"));
+#endif
+
+ /* Pressing 'Esc' or 'Ctrl+W' will close the window */
+ ui.actionClose->setShortcut(QString("Esc"));
+ Vidalia::createShortcut("Ctrl+W", this, ui.actionClose, SLOT(trigger()));
+
+ /* Hide Search frame */
+ ui.frmFind->setHidden(true);
+
+ /* Set the splitter pane sizes so that only the txtBrowser pane expands
+ * and set to arbitrary sizes (the minimum sizes will take effect */
+ QList<int> sizes;
+ sizes.append(MINIMUM_PANE_SIZE);
+ sizes.append(MINIMUM_PANE_SIZE);
+ ui.splitter->setSizes(sizes);
+ ui.splitter->setStretchFactor(LEFT_PANE_INDEX, NO_STRETCH);
+
+ connect(ui.treeContents,
+ SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
+ this, SLOT(contentsItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)));
+
+ connect(ui.treeSearch,
+ SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
+ this, SLOT(searchItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)));
+
+ /* Connect the navigation actions to their slots */
+ connect(ui.actionHome, SIGNAL(triggered()), ui.txtBrowser, SLOT(home()));
+ connect(ui.actionBack, SIGNAL(triggered()), ui.txtBrowser, SLOT(backward()));
+ connect(ui.actionForward, SIGNAL(triggered()), ui.txtBrowser, SLOT(forward()));
+ connect(ui.txtBrowser, SIGNAL(backwardAvailable(bool)),
+ ui.actionBack, SLOT(setEnabled(bool)));
+ connect(ui.txtBrowser, SIGNAL(forwardAvailable(bool)),
+ ui.actionForward, SLOT(setEnabled(bool)));
+ connect(ui.btnFindNext, SIGNAL(clicked()), this, SLOT(findNext()));
+ connect(ui.btnFindPrev, SIGNAL(clicked()), this, SLOT(findPrev()));
+ connect(ui.btnSearch, SIGNAL(clicked()), this, SLOT(search()));
+
+ /* Load the help topics from XML */
+ loadContentsFromXml(":/help/" + language() + "/contents.xml");
+
+ /* Show the first help topic in the tree */
+ ui.treeContents->setCurrentItem(ui.treeContents->topLevelItem(0));
+ ui.treeContents->setItemExpanded(ui.treeContents->topLevelItem(0), true);
+}
+
+/** Called when the user changes the UI translation. */
+void
+HelpBrowser::retranslateUi()
+{
+ ui.retranslateUi(this);
+ ui.treeContents->clear();
+ loadContentsFromXml(":/help/" + language() + "/contents.xml");
+ ui.treeContents->setItemExpanded(ui.treeContents->topLevelItem(0), true);
+ ui.treeContents->setCurrentItem(ui.treeContents->topLevelItem(0));
+ ui.treeContents->setItemExpanded(ui.treeContents->topLevelItem(0), true);
+}
+
+/** Returns the language in which help topics should appear, or English
+ * ("en") if no translated help files exist for the current GUI language. */
+QString
+HelpBrowser::language()
+{
+ QString lang = Vidalia::language();
+ if (!QDir(":/help/" + lang).exists())
+ lang = "en";
+ return lang;
+}
+
+/** Load the contents of the help topics tree from the specified XML file. */
+void
+HelpBrowser::loadContentsFromXml(QString xmlFile)
+{
+ QString errorString;
+ QFile file(xmlFile);
+ QDomDocument document;
+
+ /* Load the XML contents into the DOM document */
+ if (!document.setContent(&file, true, &errorString)) {
+ ui.txtBrowser->setPlainText(tr("Error Loading Help Contents: ")+errorString);
+ return;
+ }
+ /* Load the DOM document contents into the tree view */
+ if (!loadContents(&document, errorString)) {
+ ui.txtBrowser->setPlainText(tr("Error Loading Help Contents: ")+errorString);
+ return;
+ }
+}
+
+/** Load the contents of the help topics tree from the given DOM document. */
+bool
+HelpBrowser::loadContents(const QDomDocument *document, QString &errorString)
+{
+ /* Grab the root document element and make sure it's the right one */
+ QDomElement root = document->documentElement();
+ if (root.tagName() != ELEMENT_CONTENTS) {
+ errorString = tr("Supplied XML file is not a valid Contents document.");
+ return false;
+ }
+ _elementList << root;
+
+ /* Create the home item */
+ QTreeWidgetItem *home = createTopicTreeItem(root, 0);
+ ui.treeContents->addTopLevelItem(home);
+
+ /* Process all top-level help topics */
+ QDomElement child = root.firstChildElement(ELEMENT_TOPIC);
+ while (!child.isNull()) {
+ parseHelpTopic(child, home);
+ child = child.nextSiblingElement(ELEMENT_TOPIC);
+ }
+ return true;
+}
+
+/** Parse a Topic element and handle all its children recursively. */
+void
+HelpBrowser::parseHelpTopic(const QDomElement &topicElement,
+ QTreeWidgetItem *parent)
+{
+ /* Check that we have a valid help topic */
+ if (isValidTopicElement(topicElement)) {
+ /* Save this element for later (used for searching) */
+ _elementList << topicElement;
+
+ /* Create and populate the new topic item in the tree */
+ QTreeWidgetItem *topic = createTopicTreeItem(topicElement, parent);
+
+ /* Process all its child elements */
+ QDomElement child = topicElement.firstChildElement(ELEMENT_TOPIC);
+ while (!child.isNull()) {
+ parseHelpTopic(child, topic);
+ child = child.nextSiblingElement(ELEMENT_TOPIC);
+ }
+ }
+}
+
+/** Returns true if the given Topic element has the necessary attributes. */
+bool
+HelpBrowser::isValidTopicElement(const QDomElement &topicElement)
+{
+ return (topicElement.hasAttribute(ATTRIBUTE_TOPIC_ID) &&
+ topicElement.hasAttribute(ATTRIBUTE_TOPIC_NAME) &&
+ topicElement.hasAttribute(ATTRIBUTE_TOPIC_HTML));
+}
+
+/** Builds a resource path to an html file associated with the given help
+ * topic. If the help topic needs an achor, the anchor will be formatted and
+ * appended. */
+QString
+HelpBrowser::getResourcePath(const QDomElement &topicElement)
+{
+ QString link = language() + "/" + topicElement.attribute(ATTRIBUTE_TOPIC_HTML);
+ if (topicElement.hasAttribute(ATTRIBUTE_TOPIC_SECTION)) {
+ link += "#" + topicElement.attribute(ATTRIBUTE_TOPIC_SECTION);
+ }
+ return link;
+}
+
+/** Creates a new element to be inserted into the topic tree. */
+QTreeWidgetItem*
+HelpBrowser::createTopicTreeItem(const QDomElement &topicElement,
+ QTreeWidgetItem *parent)
+{
+ QTreeWidgetItem *topic = new QTreeWidgetItem(parent);
+ QString label = topicElement.attribute(ATTRIBUTE_TOPIC_NAME);
+
+ topic->setText(0, label);
+ topic->setToolTip(0, label);
+ topic->setData(0, ROLE_TOPIC_ID, topicElement.attribute(ATTRIBUTE_TOPIC_ID));
+ topic->setData(0, ROLE_TOPIC_QRC_PATH, getResourcePath(topicElement));
+
+ return topic;
+}
+
+/** Called when the user selects a different item in the content topic tree */
+void
+HelpBrowser::contentsItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *prev)
+{
+ QList<QTreeWidgetItem *> selected = ui.treeSearch->selectedItems();
+ /* Deselect the selection in the search tree */
+ if (!selected.isEmpty()) {
+ ui.treeSearch->setItemSelected(selected[0], false);
+ }
+ currentItemChanged(current, prev);
+}
+
+/** Called when the user selects a different item in the content topic tree */
+void
+HelpBrowser::searchItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *prev)
+{
+ QList<QTreeWidgetItem *> selected = ui.treeContents->selectedItems();
+ /* Deselect the selection in the contents tree */
+ if (!selected.isEmpty()) {
+ ui.treeContents->setItemSelected(selected[0], false);
+ }
+
+ /* Change to selected page */
+ currentItemChanged(current, prev);
+
+ /* Highlight search phrase */
+ QTextCursor found;
+ QTextDocument::FindFlags flags = QTextDocument::FindWholeWords;
+ found = ui.txtBrowser->document()->find(_lastSearch, 0, flags);
+ if (!found.isNull()) {
+ ui.txtBrowser->setTextCursor(found);
+ }
+}
+
+/** Called when the user selects a different item in the tree. */
+void
+HelpBrowser::currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *prev)
+{
+ Q_UNUSED(prev);
+ if (current) {
+ ui.txtBrowser->setSource(QUrl(current->data(0,
+ ROLE_TOPIC_QRC_PATH).toString()));
+ }
+ _foundBefore = false;
+}
+
+/** Searches for a topic in the topic tree. Returns a pointer to that topics
+ * item in the topic tree if it is found, 0 otherwise. */
+QTreeWidgetItem*
+HelpBrowser::findTopicItem(QTreeWidgetItem *startItem, QString topic)
+{
+ /* If startItem is null, then we don't know where to start searching. */
+ if (!startItem)
+ return 0;
+
+ /* Parse the first subtopic in the topic id. */
+ QString subtopic = topic.mid(0, topic.indexOf(".")).toLower();
+
+ /* Search through all children of startItem and look for a subtopic match */
+ for (int i = 0; i < startItem->childCount(); i++) {
+ QTreeWidgetItem *item = startItem->child(i);
+
+ if (subtopic == item->data(0, ROLE_TOPIC_ID).toString().toLower()) {
+ /* Found a subtopic match, so expand this item */
+ ui.treeContents->setItemExpanded(item, true);
+ if (!topic.contains(".")) {
+ /* Found the exact topic */
+ return item;
+ }
+ /* Search recursively for the next subtopic */
+ return findTopicItem(item, topic.mid(topic.indexOf(".")+1));
+ }
+ }
+ return 0;
+}
+
+/** Shows the help browser. If a sepcified topic was given, then search for
+ * that topic's ID (e.g., "log.basic") and display the appropriate page. */
+void
+HelpBrowser::showTopic(QString topic)
+{
+ /* Search for the topic in the contents tree */
+ QTreeWidgetItem *item =
+ findTopicItem(ui.treeContents->topLevelItem(0), topic);
+ QTreeWidgetItem *selected = 0;
+
+ if (item) {
+ /* Item was found, so show its location in the hierarchy and select its
+ * tree item. */
+ if (ui.treeContents->selectedItems().size()) {
+ selected = ui.treeContents->selectedItems()[0];
+ if (selected)
+ ui.treeContents->setItemSelected(selected, false);
+ }
+ ui.treeContents->setItemExpanded(ui.treeContents->topLevelItem(0), true);
+ ui.treeContents->setItemSelected(item, true);
+ currentItemChanged(item, selected);
+ }
+}
+
+/** Called when the user clicks "Find Next". */
+void
+HelpBrowser::findNext()
+{
+ find(true);
+}
+
+/** Called when the user clicks "Find Previous". */
+void
+HelpBrowser::findPrev()
+{
+ find(false);
+}
+
+/** Searches the current page for the phrase in the Find box.
+ * Highlights the first instance found in the document
+ * \param forward true search forward if true, backward if false
+ **/
+void
+HelpBrowser::find(bool forward)
+{
+ /* Don't bother searching if there is no search phrase */
+ if (ui.lineFind->text().isEmpty()) {
+ return;
+ }
+
+ QTextDocument::FindFlags flags = 0;
+ QTextCursor cursor = ui.txtBrowser->textCursor();
+ QString searchPhrase = ui.lineFind->text();
+
+ /* Clear status bar */
+ this->statusBar()->clearMessage();
+
+ /* Set search direction and other flags */
+ if (!forward) {
+ flags |= QTextDocument::FindBackward;
+ }
+ if (ui.chkbxMatchCase->isChecked()) {
+ flags |= QTextDocument::FindCaseSensitively;
+ }
+ if (ui.chkbxWholePhrase->isChecked()) {
+ flags |= QTextDocument::FindWholeWords;
+ }
+
+ /* Check if search phrase is the same as the previous */
+ if (searchPhrase != _lastFind) {
+ _foundBefore = false;
+ }
+ _lastFind = searchPhrase;
+
+ /* Set the cursor to the appropriate start location if necessary */
+ if (!cursor.hasSelection()) {
+ if (forward) {
+ cursor.movePosition(QTextCursor::Start);
+ } else {
+ cursor.movePosition(QTextCursor::End);
+ }
+ ui.txtBrowser->setTextCursor(cursor);
+ }
+
+ /* Search the page */
+ QTextCursor found;
+ found = ui.txtBrowser->document()->find(searchPhrase, cursor, flags);
+
+ /* If found, move the cursor to the location */
+ if (!found.isNull()) {
+ ui.txtBrowser->setTextCursor(found);
+ /* If not found, display appropriate error message */
+ } else {
+ if (_foundBefore) {
+ if (forward)
+ this->statusBar()->showMessage(tr("Search reached end of document"));
+ else
+ this->statusBar()->showMessage(tr("Search reached start of document"));
+ } else {
+ this->statusBar()->showMessage(tr("Text not found in document"));
+ }
+ }
+
+ /* Even if not found this time, may have been found previously */
+ _foundBefore |= !found.isNull();
+}
+
+/** Searches all help pages for the phrase the Search box.
+ * Fills treeSearch with documents containing matches and sets the
+ * status bar text appropriately.
+ */
+void
+HelpBrowser::search()
+{
+ /* Clear the list */
+ ui.treeSearch->clear();
+
+ /* Don't search if invalid document or blank search phrase */
+ if (ui.lineSearch->text().isEmpty()) {
+ return;
+ }
+
+ HelpTextBrowser browser;
+ QTextCursor found;
+ QTextDocument::FindFlags flags = QTextDocument::FindWholeWords;
+
+ _lastSearch = ui.lineSearch->text();
+
+ /* Search through all the pages looking for the phrase */
+ for (int i=0; i < _elementList.size(); ++i) {
+ /* Load page data into browser */
+ browser.setSource(QUrl(getResourcePath(_elementList[i])));
+
+ /* Search current document */
+ found = browser.document()->find(ui.lineSearch->text(), 0, flags);
+
+ /* If found, add page to tree */
+ if (!found.isNull()) {
+ ui.treeSearch->addTopLevelItem(createTopicTreeItem(_elementList[i], 0));
+ }
+ }
+
+ /* Set the status bar text */
+ this->statusBar()->showMessage(tr("Found %1 results")
+ .arg(ui.treeSearch->topLevelItemCount()));
+}
+
+/** Overrides the default show method */
+void
+HelpBrowser::showWindow(QString topic)
+{
+
+ /* Bring the window to the top */
+ VidaliaWindow::showWindow();
+
+ /* If a topic was specified, then go ahead and display it. */
+ if (!topic.isEmpty()) {
+ showTopic(topic);
+ }
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/browser/HelpBrowser.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/browser/HelpBrowser.h
new file mode 100644
index 0000000..8a041b5
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/browser/HelpBrowser.h
@@ -0,0 +1,101 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 HelpBrowser.h
+** \version $Id: HelpBrowser.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays a list of help topics and content
+*/
+
+#ifndef _HELPBROWSER_H
+#define _HELPBROWSER_H
+
+#include "ui_HelpBrowser.h"
+#include "VidaliaWindow.h"
+
+#include <QMainWindow>
+#include <QCloseEvent>
+#include <QDomDocument>
+#include <QDomElement>
+#include <QDomNodeList>
+#include <QTreeWidgetItem>
+#include <QTextBrowser>
+#include <QTextCursor>
+
+
+class HelpBrowser : public VidaliaWindow
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor **/
+ HelpBrowser(QWidget *parent = 0);
+
+public slots:
+ /** Overrides the default QWidget::show() */
+ void showWindow(QString topic = QString());
+
+protected:
+ /** Called when the user changes the UI translation. */
+ virtual void retranslateUi();
+
+private slots:
+ /** Called when the user clicks "Find Next" */
+ void findNext();
+ /** Called when the user clicks "Find Previous" */
+ void findPrev();
+ /** Called when the user starts a search */
+ void search();
+ /** Called when the user selects a different item in the contents tree */
+ void contentsItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *prev);
+ /** Called when the user selects a different item in the search tree */
+ void searchItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *prev);
+
+private:
+ /** Returns the language in which help topics should appear, or English
+ * ("en") if no translated help files exist for the current GUI language. */
+ QString language();
+ /** Load the contents of the help topics tree from the specified XML file. */
+ void loadContentsFromXml(QString xmlFile);
+ /** Load the contents of the help topics tree from the given DOM document. */
+ bool loadContents(const QDomDocument *document, QString &errorString);
+ /** Parse a Topic element and handle all its children. */
+ void parseHelpTopic(const QDomElement &element, QTreeWidgetItem *parent);
+ /** Returns true if the given Topic element has the necessary attributes. */
+ bool isValidTopicElement(const QDomElement &topicElement);
+ /** Builds a resource path to an html file associated with a help topic. */
+ QString getResourcePath(const QDomElement &topicElement);
+ /** Searches the current page for the phrase in the Find box */
+ void find(bool forward);
+ /** Creates a new item to be placed in the topic tree. */
+ QTreeWidgetItem* createTopicTreeItem(const QDomElement &topicElement,
+ QTreeWidgetItem *parent);
+ /** Called when the user selects a different item in the tree. */
+ void currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *prev);
+ /** Finds a topic in the topic tree. */
+ QTreeWidgetItem* findTopicItem(QTreeWidgetItem *startItem, QString topic);
+ /** Shows the help browser and finds a specific a topic in the browser. */
+ void showTopic(QString topic);
+
+ /** List of DOM elements representing topics. */
+ QList<QDomElement> _elementList;
+ /** Last phrase used for 'Find' */
+ QString _lastFind;
+ /** Last phrase searched on */
+ QString _lastSearch;
+ /** Indicates if phrase was previously found on current page */
+ bool _foundBefore;
+
+ /** Qt Designer generated QObject */
+ Ui::HelpBrowser ui;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/browser/HelpBrowser.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/browser/HelpBrowser.ui
new file mode 100644
index 0000000..927e06b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/browser/HelpBrowser.ui
@@ -0,0 +1,684 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>HelpBrowser</class>
+ <widget class="QMainWindow" name="HelpBrowser" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>703</width>
+ <height>583</height>
+ </rect>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="windowTitle" >
+ <string>Vidalia Help</string>
+ </property>
+ <property name="windowIcon" >
+ <iconset resource="..\..\res\vidalia.qrc" >:/images/32x32/system-help.png</iconset>
+ </property>
+ <property name="statusTip" >
+ <string/>
+ </property>
+ <property name="autoFillBackground" >
+ <bool>true</bool>
+ </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="QFrame" name="frmFind" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>450</width>
+ <height>79</height>
+ </size>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>16777215</width>
+ <height>79</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" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="0" column="0" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QToolButton" name="btnCloseFind" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>24</width>
+ <height>24</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="icon" >
+ <iconset resource="..\..\res\vidalia.qrc">:/images/32x32/window-close.png</iconset>
+ </property>
+ <property name="iconSize" >
+ <size>
+ <width>22</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="toolButtonStyle" >
+ <enum>Qt::ToolButtonIconOnly</enum>
+ </property>
+ <property name="autoRaise" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text" >
+ <string>Find:</string>
+ </property>
+ <property name="buddy" >
+ <cstring>lineFind</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineFind" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="2" >
+ <widget class="QPushButton" name="btnFindPrev" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text" >
+ <string>Find Previous</string>
+ </property>
+ <property name="icon" >
+ <iconset resource="..\..\res\vidalia.qrc">:/images/22x22/go-up-search.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QPushButton" name="btnFindNext" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text" >
+ <string>Find Next</string>
+ </property>
+ <property name="icon" >
+ <iconset resource="..\..\res\vidalia.qrc">:/images/22x22/go-down-search.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="3" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <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>
+ <widget class="QCheckBox" name="chkbxMatchCase" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text" >
+ <string>Case sensitive</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkbxWholePhrase" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text" >
+ <string>Whole words only</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSplitter" name="splitter" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <widget class="QTabWidget" name="tabsMenu" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="tabPosition" >
+ <enum>QTabWidget::North</enum>
+ </property>
+ <property name="tabShape" >
+ <enum>QTabWidget::Rounded</enum>
+ </property>
+ <widget class="QWidget" name="tabTOC" >
+ <attribute name="title" >
+ <string>Contents</string>
+ </attribute>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>6</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QTreeWidget" name="treeContents" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>7</vsizetype>
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>200</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="focusPolicy" >
+ <enum>Qt::WheelFocus</enum>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="selectionBehavior" >
+ <enum>QAbstractItemView::SelectItems</enum>
+ </property>
+ <property name="uniformRowHeights" >
+ <bool>true</bool>
+ </property>
+ <column>
+ <property name="text" >
+ <string>Help Topics</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tabSearch" >
+ <attribute name="title" >
+ <string>Search</string>
+ </attribute>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>6</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="2" column="1" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <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>
+ <widget class="QPushButton" name="btnSearch" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text" >
+ <string>Search</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QLabel" name="label_2" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text" >
+ <string>Searching for:</string>
+ </property>
+ <property name="buddy" >
+ <cstring>lineSearch</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" colspan="2" >
+ <widget class="QTreeWidget" name="treeSearch" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>7</vsizetype>
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>200</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>16777215</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="focusPolicy" >
+ <enum>Qt::WheelFocus</enum>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="selectionBehavior" >
+ <enum>QAbstractItemView::SelectItems</enum>
+ </property>
+ <property name="uniformRowHeights" >
+ <bool>true</bool>
+ </property>
+ <column>
+ <property name="text" >
+ <string>Found Documents</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2" >
+ <widget class="QLineEdit" name="lineSearch" >
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ <widget class="HelpTextBrowser" name="txtBrowser" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>7</vsizetype>
+ <horstretch>100</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="readOnly" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QStatusBar" name="statusbar" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>561</y>
+ <width>703</width>
+ <height>22</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QToolBar" name="toolBar" >
+ <property name="minimumSize" >
+ <size>
+ <width>62</width>
+ <height>52</height>
+ </size>
+ </property>
+ <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" >
+ <number>4</number>
+ </attribute>
+ <addaction name="actionBack" />
+ <addaction name="actionForward" />
+ <addaction name="actionHome" />
+ <addaction name="actionFind" />
+ <addaction name="separator" />
+ <addaction name="actionClose" />
+ </widget>
+ <action name="actionBack" >
+ <property name="icon" >
+ <iconset resource="..\..\res\vidalia.qrc" >:/images/32x32/go-previous.png</iconset>
+ </property>
+ <property name="text" >
+ <string>Back</string>
+ </property>
+ <property name="statusTip" >
+ <string>Move to previous page (Backspace)</string>
+ </property>
+ <property name="shortcut" >
+ <string>Backspace</string>
+ </property>
+ </action>
+ <action name="actionForward" >
+ <property name="icon" >
+ <iconset resource="..\..\res\vidalia.qrc" >:/images/32x32/go-next.png</iconset>
+ </property>
+ <property name="text" >
+ <string>Forward</string>
+ </property>
+ <property name="statusTip" >
+ <string>Move to next page (Shift+Backspace)</string>
+ </property>
+ <property name="shortcut" >
+ <string>Shift+Backspace</string>
+ </property>
+ </action>
+ <action name="actionHome" >
+ <property name="icon" >
+ <iconset resource="..\..\res\vidalia.qrc" >:/images/32x32/go-home.png</iconset>
+ </property>
+ <property name="text" >
+ <string>Home</string>
+ </property>
+ <property name="statusTip" >
+ <string>Move to the Home page (Ctrl+H)</string>
+ </property>
+ <property name="shortcut" >
+ <string>Ctrl+H</string>
+ </property>
+ </action>
+ <action name="actionFind" >
+ <property name="icon" >
+ <iconset resource="..\..\res\vidalia.qrc" >:/images/32x32/edit-find.png</iconset>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ <property name="text" >
+ <string>Find</string>
+ </property>
+ <property name="iconText" >
+ <string>Find</string>
+ </property>
+ <property name="toolTip" >
+ <string>Find</string>
+ </property>
+ <property name="statusTip" >
+ <string>Search for a word or phrase on current page (Ctrl+F)</string>
+ </property>
+ <property name="shortcut" >
+ <string>Ctrl+F</string>
+ </property>
+ </action>
+ <action name="actionClose" >
+ <property name="icon" >
+ <iconset resource="..\..\res\vidalia.qrc" >:/images/32x32/window-close.png</iconset>
+ </property>
+ <property name="text" >
+ <string>Close</string>
+ </property>
+ <property name="statusTip" >
+ <string>Close Vidalia Help</string>
+ </property>
+ <property name="shortcut" >
+ <string>Esc</string>
+ </property>
+ </action>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <customwidgets>
+ <customwidget>
+ <class>HelpTextBrowser</class>
+ <extends>QTextBrowser</extends>
+ <header>help/browser/HelpTextBrowser.h</header>
+ <container>0</container>
+ <pixmap></pixmap>
+ </customwidget>
+ </customwidgets>
+ <tabstops>
+ <tabstop>tabsMenu</tabstop>
+ <tabstop>btnCloseFind</tabstop>
+ <tabstop>lineFind</tabstop>
+ <tabstop>btnFindNext</tabstop>
+ <tabstop>btnFindPrev</tabstop>
+ <tabstop>chkbxMatchCase</tabstop>
+ <tabstop>chkbxWholePhrase</tabstop>
+ <tabstop>treeContents</tabstop>
+ <tabstop>txtBrowser</tabstop>
+ <tabstop>lineSearch</tabstop>
+ <tabstop>btnSearch</tabstop>
+ <tabstop>treeSearch</tabstop>
+ </tabstops>
+ <resources>
+ <include location="../../res/vidalia.qrc" />
+ </resources>
+ <connections>
+ <connection>
+ <sender>actionFind</sender>
+ <signal>triggered()</signal>
+ <receiver>lineFind</receiver>
+ <slot>setFocus()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>-1</x>
+ <y>-1</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>200</x>
+ <y>108</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>btnCloseFind</sender>
+ <signal>clicked()</signal>
+ <receiver>actionFind</receiver>
+ <slot>toggle()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>34</x>
+ <y>107</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>243</x>
+ <y>108</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>actionFind</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>frmFind</receiver>
+ <slot>setVisible(bool)</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>-1</x>
+ <y>-1</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>243</x>
+ <y>108</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>actionClose</sender>
+ <signal>triggered()</signal>
+ <receiver>HelpBrowser</receiver>
+ <slot>close()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>-1</x>
+ <y>-1</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>317</x>
+ <y>248</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>lineFind</sender>
+ <signal>returnPressed()</signal>
+ <receiver>btnFindNext</receiver>
+ <slot>click()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>293</x>
+ <y>108</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>539</x>
+ <y>108</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>lineSearch</sender>
+ <signal>returnPressed()</signal>
+ <receiver>btnSearch</receiver>
+ <slot>click()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>153</x>
+ <y>245</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>244</x>
+ <y>277</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/browser/HelpTextBrowser.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/browser/HelpTextBrowser.cpp
new file mode 100644
index 0000000..4a663c4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/browser/HelpTextBrowser.cpp
@@ -0,0 +1,99 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 HelpTextBrowser.cpp
+** \version $Id: HelpTextBrowser.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays an HTML-based help document
+*/
+
+#include "HelpTextBrowser.h"
+#include "VMessageBox.h"
+#include "Vidalia.h"
+
+#include "html.h"
+
+#include <QDir>
+#include <QFile>
+#include <QDesktopServices>
+
+
+/** Default constructor. */
+HelpTextBrowser::HelpTextBrowser(QWidget *parent)
+ : QTextBrowser(parent)
+{
+ setOpenExternalLinks(false);
+}
+
+/** Loads a resource into the browser. If it is an HTML resource, we'll load
+ * it as UTF-8, so the special characters in our translations appear properly. */
+QVariant
+HelpTextBrowser::loadResource(int type, const QUrl &name)
+{
+ /* If it's an HTML file, we'll handle it ourselves */
+ if (type == QTextDocument::HtmlResource) {
+ QString helpPath = ":/help/";
+
+ /* Fall back to English if there is no translation of the specified help
+ * page in the current language. */
+ if (!name.path().contains("/")) {
+ QString language = Vidalia::language();
+ if (!QDir(":/help/" + language).exists())
+ language = "en";
+ helpPath += language + "/";
+ }
+
+ QFile file(helpPath + name.path());
+ if (!file.open(QIODevice::ReadOnly)) {
+ return tr("Error opening help file: ") + name.path();
+ }
+ return QString::fromUtf8(file.readAll());
+ }
+ /* Everything else, just let QTextBrowser take care of it. */
+ return QTextBrowser::loadResource(type, name);
+}
+
+
+/** Called when the displayed document is changed. If <b>url</b> specifies
+ * an external link, then the user will be prompted for whether they want to
+ * open the link in their default browser or not. */
+void
+HelpTextBrowser::setSource(const QUrl &url)
+{
+ if (url.scheme() != "qrc" && !url.isRelative()) {
+ /* External link. Prompt the user for a response. */
+ int ret = VMessageBox::question(this,
+ tr("Opening External Link"),
+ p(tr("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.")) +
+ p(tr("Do you want Vidalia to open the link in your Web "
+ "browser?")),
+ VMessageBox::Yes|VMessageBox::Default,
+ VMessageBox::Cancel|VMessageBox::Cancel);
+
+ if (ret == VMessageBox::Cancel)
+ return;
+
+ bool ok = QDesktopServices::openUrl(url);
+ if (!ok) {
+ VMessageBox::information(this,
+ tr("Unable to Open Link"),
+ tr("Vidalia was unable to open the selected link in your Web browser. "
+ "You can still copy the URL and paste it into your browser."),
+ VMessageBox::Ok);
+ }
+ } else {
+ /* Internal link. Just load it like normal. */
+ QTextBrowser::setSource(url);
+ }
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/browser/HelpTextBrowser.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/browser/HelpTextBrowser.h
new file mode 100644
index 0000000..d5bce60
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/browser/HelpTextBrowser.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.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 HelpTextBrowser.h
+** \version $Id: HelpTextBrowser.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays an HTML-based help document
+*/
+
+#ifndef _HELPTEXTBROWSER_H
+#define _HELPTEXTBROWSER_H
+
+#include <QTextBrowser>
+#include <QVariant>
+
+
+class HelpTextBrowser : public QTextBrowser
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. */
+ HelpTextBrowser(QWidget *parent = 0);
+ /** Loads a resource into the browser. */
+ QVariant loadResource(int type, const QUrl &name);
+
+public slots:
+ /** Called when the displayed document is changed. If <b>url</b> specifies
+ * an external link, then the user will be prompted for whether they want to
+ * open the link in their default browser or not. */
+ virtual void setSource(const QUrl &url);
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/content.qrc b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/content.qrc
new file mode 100644
index 0000000..1b59476
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/content.qrc
@@ -0,0 +1,77 @@
+<RCC>
+ <qresource prefix="/help">
+ <!-- English -->
+ <file>en/contents.xml</file>
+ <file>en/index.html</file>
+ <file>en/running.html</file>
+ <file>en/log.html</file>
+ <file>en/config.html</file>
+ <file>en/server.html</file>
+ <file>en/troubleshooting.html</file>
+ <file>en/netview.html</file>
+ <file>en/links.html</file>
+ <file>en/bridges.html</file>
+ <file>en/services.html</file>
+ <!-- Finnish -->
+ <file>fi/contents.xml</file>
+ <file>fi/index.html</file>
+ <file>fi/running.html</file>
+ <file>fi/log.html</file>
+ <file>fi/config.html</file>
+ <file>fi/server.html</file>
+ <file>fi/troubleshooting.html</file>
+ <file>fi/netview.html</file>
+ <file>fi/links.html</file>
+ <file>fi/bridges.html</file>
+ <file>fi/services.html</file>
+ <!-- French -->
+ <file>fr/contents.xml</file>
+ <file>fr/index.html</file>
+ <file>fr/running.html</file>
+ <file>fr/log.html</file>
+ <file>fr/config.html</file>
+ <file>fr/server.html</file>
+ <file>fr/troubleshooting.html</file>
+ <file>fr/netview.html</file>
+ <file>fr/links.html</file>
+ <file>fr/bridges.html</file>
+ <file>fr/services.html</file>
+ <!-- German -->
+ <file>de/contents.xml</file>
+ <file>de/index.html</file>
+ <file>de/running.html</file>
+ <file>de/log.html</file>
+ <file>de/config.html</file>
+ <file>de/server.html</file>
+ <file>de/troubleshooting.html</file>
+ <file>de/netview.html</file>
+ <file>de/links.html</file>
+ <!-- Russian -->
+ <file>ru/contents.xml</file>
+ <file>ru/index.html</file>
+ <file>ru/bridges.html</file>
+ <!-- Simplified Chinese -->
+ <file>zh_CN/contents.xml</file>
+ <file>zh_CN/index.html</file>
+ <file>zh_CN/running.html</file>
+ <file>zh_CN/log.html</file>
+ <file>zh_CN/config.html</file>
+ <file>zh_CN/server.html</file>
+ <file>zh_CN/troubleshooting.html</file>
+ <file>zh_CN/netview.html</file>
+ <file>zh_CN/links.html</file>
+ <!-- Swedish -->
+ <file>sv/contents.xml</file>
+ <file>sv/index.html</file>
+ <file>sv/running.html</file>
+ <file>sv/log.html</file>
+ <file>sv/config.html</file>
+ <file>sv/server.html</file>
+ <file>sv/troubleshooting.html</file>
+ <file>sv/netview.html</file>
+ <file>sv/links.html</file>
+ <file>sv/bridges.html</file>
+ <file>sv/services.html</file>
+ </qresource>
+</RCC>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/config.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/config.html
new file mode 100644
index 0000000..9032a35
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/config.html
@@ -0,0 +1,82 @@
+<!--
+** $Id: config.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Konfiguration von Vidalia und Tor</h1>
+<hr />
+
+<p>
+Vidalia ermöglicht es Ihnen die am gebrächlisten Einstellungen
+von Vidalia und Tor vorzunehmen. Außerdem können Sie mit Vidalia
+einen <a href="server.html">Tor-Server</a> einrichten und betreiben und dadurch
+dem Tor-Netzwerk zu weiterem Wachtums verhelfen.
+</p>
+
+<a name="general"/>
+<h3>Allgemeine Einstellungen</h3>
+<p>
+Die Seite <i>Allgemein</i> enthält die am meisten gebrauchten Einstellungen.
+</p>
+<ul>
+ <li><b>Pfad zur Tor-Anwendung</b>:
+ Dies ist die ausführbare Tor-Datei, die Vidalia startet, wenn Sie
+ <i>Start</i> aus dem Tray-Menü auswählen. Falls Sie mehrere
+ Versionen von Tor installiert haben, können Sie durch Klicken auf
+ die <i>Wählen</i> Schaltfläche die Tor-Version auswählen, die
+ Vidalia benutzen soll.
+ </li>
+ <li><b>Start Einstellungen</b>:
+ Durch diese Einstellung wird Tor automatisch zusammen mit Vidalia
+ gestartet. Sie können Vidalia auch konfigurieren, dass es beim
+ Systemstart ausgeührt wird (<i>nur unter Windows</i>).
+ </li>
+</ul>
+
+<a name="server"/>
+<h3>Server Einstellungen</h3>
+<p>
+<i>
+ Lesen Sie <a href="server.html">diese Hilfeseite</a> für detailierte
+ Informationen zur Installation und zum Betrieb eines Tor-Servers.
+</i>
+</p>
+
+<a name="advanced"/>
+<h3>Fortgeschrittene Einstellungen</h3>
+<p>
+Die Einstellungen auf der Seite <i>Fortgeschritten</i> sollten gewöhnlich
+nur von erfahrenen Benutzern vorgenommen werden.
+</p>
+<ul>
+ <li><b>Kontroll Port</b>:
+ Den <i>Kontroll Port</i> benutzt Vidalia zur Kommunikation mit Tor.
+ Diese Einstellung braucht nur verändert zu werden, wenn Sie einen
+ Konflikt mit einem anderen Dienst auf Ihrem System haben.
+ </li>
+ <li><b>Tor Konfigurationsdatei</b>:
+ Mit dieser Option können Sie Vidalia veranlassen, Tor mit einer
+ speziellen Konfiguarionsdatei, <i>torrc</i>, auszuführen.
+ </li>
+ <li><b>Berechtigungen</b>:
+ Wenn Sie einen Wert für <b>Als folgender Benutzer ausführen</b>
+ angeben, wird Tor mit den Rechten dieses Benutzers ausgeührt
+ (<i>setuid</i>).
+ Wenn Sie einen Wert für <b>Als folgende Gruppe ausführen</b>
+ wird Tor mit den Rechten dieser Gruppe ausgeführt (<i>setgid</i>).
+ </li>
+</ul>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/contents.xml b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/contents.xml
new file mode 100644
index 0000000..390f9be
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/contents.xml
@@ -0,0 +1,47 @@
+<!--
+** $Id: contents.xml 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<Contents name="Vidalia Hilfe" html="index.html">
+ <Topic id="running" name="Tor betreiben" html="running.html">
+ <Topic id="starting" name="Tor starten und beenden" html="running.html" section="starting"/>
+ <Topic id="monitoring" name="Tors Status überwachen" html="running.html" section="monitoring"/>
+ </Topic>
+ <Topic id="log" name="Nachrichtenprotokoll" html="log.html">
+ <Topic id="basic" name="Allgemeine Informationen" html="log.html" section="basic"/>
+ <Topic id="severities" name="Gewichtung von Nachrichten" html="log.html" section="severities"/>
+ <Topic id="logfile" name="Das Nachrichtenprotokoll speichern" html="log.html" section="tofile"/>
+ </Topic>
+ <Topic id="netview" name="Netzwerk-Betrachter" html="netview.html">
+ <Topic id="overview" name="Überblick" html="netview.html" section="overview"/>
+ <Topic id="netmap" name="Netzwerk-Karte" html="netview.html" section="netmap"/>
+ <Topic id="status" name="Server-Status" html="netview.html" section="status"/>
+ <Topic id="details" name="Server-Details" html="netview.html" section="details"/>
+ </Topic>
+ <Topic id="config" name="Konfiguration von Tor" html="config.html">
+ <Topic id="general" name="Allgemeine Einstellungen" html="config.html" section="general"/>
+ <Topic id="server" name="Server Einstellungen" html="config.html" section="server"/>
+ <Topic id="advanced" name="Fortgeschrittene Einstellungen" html="config.html" section="advanced"/>
+ </Topic>
+ <Topic id="server" name="Einen Tor Server betreiben" html="server.html">
+ <Topic id="basic" name="Basis Einstellungen" html="server.html" section="basic"/>
+ <Topic id="bandwidth" name="Bandbreitenbegrenzung" html="server.html" section="bandwidth"/>
+ <Topic id="exitpolicy" name="Exit-Regeln" html="server.html" section="exitpolicy"/>
+ </Topic>
+ <Topic id="troubleshooting" name="Fehlersuche und Fehlerbeseitigung" html="troubleshooting.html">
+ <Topic id="start" name="Ich kann Tor nicht starten" html="troubleshooting.html" section="start"/>
+ <Topic id="connect" name="Vidalia kann keine Verbindung zu Tor herstellen" html="troubleshooting.html" section="connect"/>
+ <Topic id="torexited" name="Tor wurden unerwartet beendet" html="troubleshooting.html" section="torexited"/>
+ <Topic id="stop" name="Vidalia kann Tor nicht beenden" html="troubleshooting.html" section="stop"/>
+ </Topic>
+ <Topic id="links" name="Nützliche Links" html="links.html"/>
+</Contents>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/index.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/index.html
new file mode 100644
index 0000000..171e3e4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/index.html
@@ -0,0 +1,42 @@
+<!--
+** $Id: index.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Vidalia Hilfe</h1>
+<hr />
+
+<p>
+Wählen Sie ein Hilfe-Thema aus der Liste von der linken Seite
+oder klicken Sie auf Suche über der Liste um eine Suche durch
+alle verfügbaren Hilfe-Themen durchzuführen.
+</p>
+
+<p>
+Sie können oben die Schaltfläche <i>Suchen</i> benutzen,
+um innerhalb eines bestimmten Hilfe-Themas zu suchen.
+</p>
+
+<p>
+Die Schaltfläche <i>Startseite</i> wird Sie zu dieser Seite
+zurück führen.
+</p>
+
+<p>
+Auf der Seite <a href="links.html">Nützliche Links</a> finden Sie
+weiterführende Hilfe und Informationen zu Vidalia und Tor.
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/links.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/links.html
new file mode 100644
index 0000000..cddf63f
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/links.html
@@ -0,0 +1,83 @@
+<!--
+** $Id: links.html 2686 2008-06-10 14:51:55Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Nützliche Links</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Homepage</td>
+ <td>
+ <a href="http://www.vidalia-project.net/">
+ http://www.vidalia-project.net/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki</td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki">
+ http://trac.vidalia-project.net/wiki</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Fehlerdatenbank</td>
+ <td>
+ <a href="http://trac.vidalia-project.net/report">
+ http://trac.vidalia-project.net/report</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 (Häufig gestellte Fragen)</td>
+ <td>
+ <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ">
+ https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki</td>
+ <td>
+ <a href="https://wiki.torproject.org/noreply/TheOnionRouter">
+ https://wiki.torproject.org/noreply/TheOnionRouter</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Fehlerdatenbank</td>
+ <td>
+ <a href="https://bugs.torproject.org/flyspray/">
+ https://bugs.torproject.org/flyspray</a>
+ </td>
+</table>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/log.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/log.html
new file mode 100644
index 0000000..0322e63
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/log.html
@@ -0,0 +1,126 @@
+<!--
+** $Id: log.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Nachrichtenprotokoll</h1>
+<hr />
+
+Das Nachrichtenprotokoll zeigt Statusinformationen zu laufenden Tor-Prozessen an.
+
+<a name="basic"/>
+Jede Nachricht wird mit einer <i>Gewichtung</i> dargestellt, beginnend bei
+<b>Fehler</b> (schwerwiegende Fehler) bis <b>Debug</b> (am ausführlichsten).
+Im Abschnitt <a href="#severities">Gewichtung von Nachrichten</a> finden Sie
+weitere Informationen.
+
+
+<a name="severities"/>
+<h3>Gewichtung von Nachrichten</h3>
+<p>
+Die Gewichtung eine Nachricht gibt Auskunft darüber, wie wichtig diese ist.
+Eine höher gewichtete Nachricht deutet normalerweise an, dass etwas mit Tor
+schief gegangen ist. Niedrig gewichtete Nachrichten erscheinen öfter
+während des Tor-Betriebs und müssen normalerweise nicht aufgezeichnet
+werden.
+</p>
+
+<p>
+Die möglichen Gewichtungen von Nachrichten, von der schwerwiegendsten zu
+der am wenigsten schwerwiegendsten, sind:
+</p>
+<ul>
+ <li>
+ <b>Fehler</b>: Nachrichten, die erscheinen, wenn ein schwerwiegender Fehler
+ aufgetreten ist und Tor nicht weiter ausgeführt werden kann. Diese
+ Nachrichten werden im Nachrichtenprotokoll <i>rot</i> hervor gehoben.
+ </li>
+ <li>
+ <b>Warnung</b>: Nachrichten, die nur erscheinen, wenn weniger
+ schwerwiegende Fehler aufgetreten sind und Tor weiterhin ausgeführt
+ werden kann. Diese Nachrichten werden <i>gelb</i> hervor gehoben.
+ </li>
+ <li>
+ <b>Hinweis</b>: Nachrichten, die unregelmäßig während des
+ Tor-Betriebs auftauchen, aber nicht als Fehler eingestuft sind. Diese
+ könnten für Sie interessante Informationen enthalten.
+ </li>
+ <li>
+ <b>Info</b>: Nachrichten, die regelmäßig während des
+ Tor-Betriebs auftauchen, aber in der Regel für die meisten Nutzer
+ uninteressant sind.
+ </li>
+ <li>
+ <b>Debug</b>: Sehr ausführliche Nachrichten, die hauptsächlich
+ für Entwickler von Bedeutung sind. Es empfiehlt sich nur, diese
+ Nachrichten aufzuzeichnen, wenn Sie wissen, was Sie tun.
+ </li>
+</ul>
+
+<p>
+Für die meisten Nutzer ist es ausreichend, nur Nachrichten der Gewichtung
+<i>Fehler</i>, <i>Warnung</i> und <i>Hinweis</i> aufzuzeichnen.
+</p>
+
+<p>
+Um auszuwählen, welche Nachrichten-Gewichtung angezeigt werden soll,
+befolgen Sie folgende Schritte:
+<ol>
+ <li>Öffnen Sie das Nachrichtenprotokoll aus dem Vidalia Traymenü.</li>
+ <li>
+ Klicken Sie auf die Schaltfläche <i>Einstellungen</i> im Fenster des
+ Nachrichtenprotokolls.
+ </li>
+ <li>
+ Wählen Sie unter <i>Nachrichtenfilter</i> die Nachrichten aus, die
+ angezeigt werden sollen und deaktivieren Sie die für Sie
+ uninteressanten Nachrichten.
+ </li>
+ <li>
+ Klicken Sie auf <i>Speichere Einstellungen</i>, um den Vorgang
+ abzuschließen.
+ </li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Das Nachrichtenprotokoll speichern</h3>
+<p>
+Vidalia kann die Nachrichten sowohl in Nachrichtenprotokollfenster anzeigen,
+als auch in einer Datei speichern. Um das Speichern in eine Datei zu aktivieren,
+befolgen Sie die folgenden Schritte:
+</p>
+
+<ol>
+ <li>Öffnen sie das Nachrichtenprotokoll aus dem Vidalia Traymenü.</li>
+ <li>
+ Klicken Sie auf die Schaltfläche <i>Einstellungen</i> im Fenster des
+ Nachrichtenprotokolls.
+ </li>
+ <li>Aktivieren Sie unter <i>Nachrichten immer speichern</i> die Checkbox
+ <i>Alle neuen Nachrichten automatisch in einer Datei speichern</i>.
+ <li>
+ Falls Sie die Nachrichten in eine andere, als die angegebene Datei speichern
+ wollen, geben Sie entweder ein Verzeichnis und einen Dateinamen an, oder
+ klicken Sie auf <i>Öffnen</i>, um eine Datei auszuwählen.
+ </li>
+ <li>
+ Klicken sie auf <i>Speichere Einstellungen</i>, um den Vorgang
+ abzuschließen.
+ </li>
+</ol>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/netview.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/netview.html
new file mode 100644
index 0000000..3b8c10b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/netview.html
@@ -0,0 +1,184 @@
+<!--
+** $Id: netview.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Netzwerk-Betrachter</h1>
+<hr />
+
+<p>
+Der Netzwerk-Betrachter zeigt die Server im Tor-Netzwerk und den
+Weg des Datenverkehrs an.
+</p>
+
+
+<a name="overview"/>
+<h3>Überblick</h3>
+<p>
+Wenn Sie anonym mit Hilfe von Tor kommunizieren wollen (bspw. eine Verbindung
+zu einer Webseite herstellen), erstellt Tor einen Tunnel oder <i>Kanal</i> von
+verschlüsselten Verbindungen über verschiedene Server im Netzwerk.
+Der von ihrem Programm erzeugte Netzwerkverkehr wird dann als <i>Datenstrom</i>
+durch einen solchen Kanal geleitet. Aus Effizienzgründen werden mehrere
+Datenströme über den selben Kanal geleitet.
+</p>
+
+<a name="netmap"/>
+<h3>Netzwerk-Karte</h3>
+<p>
+Die Netzwerk-Karte besteht aus einer Weltkarte, auf der durch rote Punkte die
+geographischen Standorte der Server im Tor-Netzwerk gekennzeichnet sind. Anhand
+der grünen Linien zwischen den Servern werden die von Ihrem Tor-Client
+hergestellten Verbindungen im Tor-Netzwerk gekennzeichnet.
+</p>
+<p>
+Durch einen Klick auf <b>Vergrößern</b> oder <b>Verkleinern</b>
+können Sie die Standorte auf der Karte betrachten. Um sich einen
+anderen Kartenausschnitt anzeigen zu lassen, klicken auf die Karte und
+bewegen Sie den Mauszeiger bei gedrückter Maustaste in die gewünschte
+Richtung.
+</p>
+<p>
+Der geographische Standort eines Tor-Servers wird mit Hilfe der IP-Adresse
+und der GeoIP-Datenbank ermittelt. Die GeoIP-Datenbank wurde von Maxmind
+erstellt und ist unter geoip.vidalia-project.net zu finden.
+</p>
+<p>
+In der Mitte unterhalb der Netzwerk-Karte finden Sie eine Liste mit Ihren
+momentanen Verbindungen und den darübr laufenden Netzwerkverkehr. Beim
+ersten Start der Netzwerk-Karte wird Ihnen möglicherweise eine Verbindung
+zu geoip.vidalia-project.net auffallen. Diese Verbindung erscheint, wenn
+Vidalia den geographischen Standort für die Liste der Tor-Server ermittelt.
+Diese Verbindung wird ebenfalls über Tor hergestellt, so dass ihr
+Standort gegenüber dem GeoIP-Server nicht bekannt gegeben wird. Die
+Ergebnisse dieser Anfragen werden lokal zwischen gespeichert, um Vidalias
+GeoIP-Server zu entlasten.
+</p>
+
+
+<a name="serverlist"/>
+<h3>Server-Status</h3>
+<p>
+Auf der linken Seite des Netzwerk-Betrachters befindet sich eine Liste von
+Servern im Tor-Netzwerk. Neben jeden Server befindet sich ein Symbol, dass
+den Server-Status anzeigt. Die folgende Tabelle beschreibt die möglichen
+Symbole:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+ <td valign="middle">
+ Der Server ist offline oder antwortet einfach nicht.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+ <td valign="middle">
+ Der Server ist im <i>Ruhezustand</i>, d.h. er ist online, hat aber bereits
+ alle ihm vom Serverbetreiber zugestandene Bandbreite während eines
+ bestimmten Zeitraums verbraucht.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+ <td valign="middle">
+ Der Server ist online, hat aber nur einen minimalen
+ Datendurchsatz.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+ <td valign="middle">
+ Der Server ist online und hat einen ermittelten Datendurchsatz
+ von >= 20 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+ <td valign="middle">
+ Der Server ist online und hat einen ermittelten Datendurchsatz
+ von >= 60 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+ <td valign="middle">
+ Der Server ist online und hat einen ermittelten Datendurchsatz
+ von >= 400 KB/s.
+ </td>
+</tr>
+</table>
+</p>
+<p>
+Alle Bandbreitenangaben sind Schätzungen, die auf dem kleinsten
+Wert der maximalen Bandbreite des eingehenden oder ausgehenden Datenverkehrs
+basieren. Dieser Wert wurde innerhalb eines beliebigen zehn Sekunden langen
+Intervalls am vergangenen Tag gemessen.
+</p>
+
+
+<a name="details"/>
+<h3>Server-Details</h3>
+<p>
+Die Server-Details auf der rechten Seite des Fensters zeigen weitere
+Informationen zu den Servern an, die momentan in der
+<a href="#serverlist">Server-Liste</a> ausgewählt wurden. Wenn Sie
+einen Kanal oder einen Datenstrom aus der entsprechenden Liste ausgewählt
+haben, werden Ihnen in detailierte Informationen über jeden Server angezeigt,
+der Ihren Datenverkehr weiter leitet.
+</p>
+<p>
+Folgende Informationen werden in den Server-Details angezeigt (<i>Hinweis</i>:
+nicht immer sind alle Informationen verfügbar):
+</p>
+<p>
+<table>
+<tr>
+ <td><b>Ort</b></td>
+ <td>Der geographische Standort dieses Tor-Servers.</td>
+</tr>
+<tr>
+ <td><b>IP-Adresse</b></td>
+ <td>IP-Adresse über die dieser Tor-Server erreicht werden kann.</td>
+</tr>
+<tr>
+ <td><b>Plattform</b></td>
+ <td>
+ Gibt an, mit welchen Betriebssystem und welcher Tor-Version dieser
+ Server betrieben wird.
+ </td>
+</tr>
+<tr>
+ <td><b>Bandbreite</b></td>
+ <td>
+ Geschätzte maximal Bandbreite, die der Verzeichnis-Server
+ für diesen Server in letzter Zeit beobachtet hat.
+ </td>
+</tr>
+<tr>
+ <td><b>Läuft seit</b></td>
+ <td>
+ Gibt an, seit wann der Server bereits läft. Dadurch kann die
+ Stabilität des Servers abgeschätzt werden.
+ </td>
+</tr>
+<tr>
+ <td><b>Zuletzt aktualisiert</b></td>
+ <td>Zeitpunkt an dem die Serverinformationen zuletzt aktualisiert wurden.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/running.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/running.html
new file mode 100644
index 0000000..22bc750
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/running.html
@@ -0,0 +1,107 @@
+<!--
+** $Id: running.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Tor betreiben</h1>
+<hr />
+
+<p>
+Vidalia hilft Ihnen dabei Ihren Tor-Prozess zu steuern. Es ermöglicht
+Ihnen Tor zu starten und zu beenden, zeigt Statusinformationen an und
+benachrichtigt Sie, falls Tor unerwartet beendet wurde.
+</p>
+
+<a name="starting"/>
+<h3>Tor starten und beenden</h3>
+<p>
+Um Tor zu <i>starten</i>,
+<ol>
+ <li>wählen Sie <i>Start</i> aus Vidalias Traymenü oder drücken Sie <i>Strg+S</i></li>.
+ <li>
+ Vidalias Traysymbol wird sich von einer Zwiebel mit einem roten X hin zu
+ einer grünen Zwiebel verändern, sobald Tor gestartet wurde.
+ </li>
+</ol>
+Falls Vidalia Tor nicht starten konnte, wird Ihnen eine Fehlermeldung
+mit entsprechenden Hinweisen angezeigt. Sie können außerdem
+im <a href="log.html">Nachrichtenprotokoll</a> nachschauen, ob Tor weitere
+Informationen ausgegeben hat.
+</p>
+
+<p>
+Um Tor zu <i>stoppen</i>,
+<ol>
+ <li>wählen Sie <i>Stop</i> aus Vidalias Traymenü oder drücken Sie <i>Strg+T</i></li>.
+ <li>
+ Vidalias Traysymbol wird sich von einer grünen Zwiebel hin zu
+ einer grauen Zwiebel mit einem roten X verändern, sobald Tor
+ beendet wurde.
+ </li>
+</ol>
+Falls Vidalia Tor nicht beenden konnte, wird Ihnen eine Fehlermeldung
+mit entsprechenden Hinweisen angezeigt. Sie können außerdem
+im <a href="log.html">Nachrichtenprotokoll</a> nachschauen, ob Tor weitere
+Informationen ausgegeben hat.
+</p>
+
+<a name="monitoring"/>
+<h3>Tors Status überwachen</h3>
+<p>
+Vidalia informiert Sie über den Status von Tor durch die Anzeige eines
+Symbols im Systemtray oder Dock. Die folgende Tabelle zeigt die verschiedenen
+Zustände dieses Symbols:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+ <td valign="middle">
+ Tor wurde gestoppt. Wählen Sie <i>Start</i> aus dem Vidalia-Menü
+ um Tor zu starten.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+ <td valign="middle">
+ Tor wird gestartet. Sie können im <a href="log.html">Nachrichtenprotokoll</a>
+ Statusinformationen abrufen, während Tor startet.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+ <td valign="middle">
+ Tor wird ausgeführt. Falls Sie Tor stoppen wollen, wählen
+ Sie <i>Stop</i> aus dem Vidalia-Menü. Tor speichert während des
+ Betriebs Informationen im <a href="log.html">Nachrichtenprotokoll</a>.
+ Um weitere Informationen zu erfahren, können Sie dort nachschauen.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+ <td valign="middle">Tor wird gerade gestoppt.</td>
+</tr>
+</table>
+</p>
+
+<p>
+Falls Tor unerwartet beendet wird, verändert sich das Vidalia-Symbol zu einer
+dunklen Zwiebel mit einem roten X und eine entsprechende Fehlermeldung wird
+angezeigt. Sie können außerdem das <a href="log.html">Nachrichtenprotokoll</a>
+auf weitere Details zu Problemen untersuchen, die zur Beendigung von Tor geführt
+haben.
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/server.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/server.html
new file mode 100644
index 0000000..c717bba
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/server.html
@@ -0,0 +1,150 @@
+<!--
+** $Id: server.html 2392 2008-03-04 05:38:56Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Einen Tor Server betreiben</h1>
+<hr />
+
+Das Tor-Netzwerk besteht aus Freiwilligen aus der ganzen Welt, die einen
+Teil ihrer überschüssigen Bandbreite zum Betrieb eines Servers
+bereitstellen. Vidalia hilft Ihnen sich daran zu beteiligen, indem es das
+Aufsetzen Ihres eigenen Servers sehr einfach gestaltet.
+
+<a name="basic"/>
+<h3>Basis Einstellungen</h3>
+<p>
+Falls Sie sich entscheiden, dem Tor-Netzwerk beim Wachstum zu helfen,
+können Sie die folgenden Schritte als Startpunkt befolgen:
+</p>
+<ol>
+ <li>
+ Öffnen Sie den <i>Einstellungs-Dialog</i> durch einen Klick
+ auf <i>Einstellungen</i> im Traymenü oder <i>Eigenschaften</i>
+ in der Systemmenüleiste Ihres Macintosh-Systems.
+ </li>
+ <li>Wählen Sie die Seite <i>Server</i> aus.</li>
+ <li>Aktivieren Sie die Box <i>Leite Verkehr für das Tor Netzwerk weiter</i>.
+ <li>Geben Sie die folgenden Informationen ein:
+ <ul>
+ <li><b>Spitzname</b>:
+ Der Name unter dem Ihr Server im Tor-Netzwerk bekannt wird. Ein
+ Beispiel für einen Server-Spitznamen ist "meinVidaliaServer".
+ </li>
+ <li><b>Kontakt-Information</b>:
+ Ihre E-Mail-Adresse. Diese Adress wird nur benutzt, falls ein
+ wichtiges Tor-Sicherheitsupdate zu Verfügung steht oder
+ etwas mit Ihrem Server schief läft. Sie können
+ außerdem Ihre PGP- oder GPG-Schlüssel-ID sowie
+ den dazugehörigen Fingerabdruck angeben.
+ </li>
+ <li><b>Server Port</b>:
+ Gibt den Port an, auf dem Ihr Server auf Verbindungen von
+ Client-Programmen oder anderen Tor-Servern wartet.
+ </li>
+ <li><b>Adresse</b>:
+ Geben Sie eine Adresse an, unter der Ihr Computer durch andere
+ Tor-Server über das Internet erreicht werden kann. Falls Ihnen
+ Ihre öffentliche IP-Adresse nicht bekannt sein sollte,
+ können Sie auf die Schaltfläche <i>Adresse</i> klicken,
+ damit Vidalia eine externe Seite aufrufen kann (bspw.
+ <i>http://www.vidalia-project.net/iptest/ip.php</i>), um Ihre
+ öffentliche IP-Adresse zu ermitteln.
+ </li>
+ </ul>
+ <li>
+ Wenn Sie die Server-Liste für andere im Netzwerk spiegeln wollen,
+ aktivieren Sie die Box <i>Die Server-Liste spiegeln</i>. Deaktivieren Sie
+ diese Box, falls Sie nicht ausreichend Bandbreite zur Verfügung
+ haben. Falls Sie sich entscheiden, die Server-Liste zu spiegeln, stellen
+ Sie sicher, dass der <i>Verzeichnis-Port</i> sich von dem oben erwähnten
+ <i>Server Port</i> unterscheidet.
+ </li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Bandbreitenbegrenzung</h3>
+<p>
+Einen Tor Server zu betreiben kann eine Menge Bandbreite verbrauchen. Deshalb
+erlaubt es Tor, die Bandbreite zu begrenzen, die Sie dem Tor-Netzwerk zur
+Verfügung stellen wollen. Sie können einen Server betreiben
+und gleichzeitig bleibt Ihre Netzwerkverbindung für Ihren eigenen
+Bedarf benutzbar.
+</p>
+<p>
+Sie sollten aus der Auswahlliste die Option wählen, die Ihrer
+Internetverbindung am ehesten entspricht. Falls Sie <i>Benutzerdefiniert</i>
+auswählen, können Sie die Bandbreitenbegrenzung selbst festlegen.
+</p>
+<h4>Benutzerdefinierte Begrenzung</h4>
+<p>
+Die <i>Maximale Rate</i> ist die Bandbreite die während kurzer Perioden
+von hohem Datenverkehr zur Verfügung steht und über Ihrer
+angegebenen <i>Durchschnittlichen Rate</i> liegt. Dabei wird der langfristige
+Durchschnitt nicht beeinträchtigt. Eine niedrige Durchschnittliche Rate,
+aber eine hohe Maximale Rate stellt genügend Bandbreite zu Spitzenzeiten zur
+Verfügung, sofern der Durchschnitt nicht bereits erreicht wurde.
+Wenn Ihre Durchschnittliche Rate der <i>Maximalen Rate</i> entspricht, wird
+Tor niemals die angegebene Rate überschreiten.Ihre <i>Maximale Rate</i>
+muss mindestens gleich groß oder größer als Ihre
+<i>Durchschnittliche Rate</i> sein.
+</p>
+<p>
+Die <i>Durchschnittliche Rate</i> gibt die maximale durchschnittliche
+Bandbreite, gemessen über einen langen Zeitraum, an (in
+Kilobyte pro Sekunde). Sie können bspw. 2 Megabyte pro Sekunde
+(2048 KB/s) oder 50 Kilobyte pro Sekunde (entspricht einer
+durchschnittlichen Kabel-Internetverbindung) angeben. Tor benötigt
+mindestens 20 Kilobyte pro Sekunde, um als Server betrieben zu werden.
+</p>
+<p>
+Beachten Sie, dass Tor die Bandbreite in <b>byte</b> und nicht in bits misst.
+Außerdem beachtet Tor in diesem Fall nur eingehende und nicht ausgehende
+bytes. Falls Ihr Server bspw. zur Verzeichnisspiegelung dient, versenden Sie
+wahrscheinlich mehr bytes, als Sie empfangen. Wenn dies der Falls ist und Ihre
+Bandbreite zu sehr beansprucht, sollten Sie erwägen, die Checkbox
+<i>Das Tor Verzeichnis spiegeln</i> zu deaktivieren.
+</p>
+
+<a name="exitpolicy"/>
+<h3>Exit-Regeln</h3>
+<p>
+Durch die Exit-Regeln können Sie festlegen, welche Art von
+Internet-Ressourcen Tor-Benutzer von Ihrem Server aus erreichen können.
+Tor benutzt eine vorkonfigurierte Liste von Exit-Regeln,
+um dem Mißbrauch des Tor-Netzwerkes durch bestimmte Dienste, bspw.
+Spam oder File Sharing zu reduzieren.
+</p>
+
+<p>
+Mit den Checkboxen können Sie den Zugriff von Tor-Benutzern auf
+Internet-Ressourcen über Ihren Server steuern. Wenn Sie eine
+Checkbox neben einer speziellen Internet-Ressource deaktivieren,
+werden Tor-Benutzer nicht mehr in der Lage sein, diese über Ihren
+Server zu erreichen. Falls Sie die Checkbox <i>Verschiedene andere
+Dienste</i> aktivieren, können Tor-Benutzer alle Internet-Ressourcen
+nutzen, die nicht durch vorhandene Regeln beschränkt worden sind.
+</p>
+
+<p>
+Falls Sie Tor-Benutzern nicht gestatten wollen, Verbindungen zu Punkten
+außerhalb des Tor-Netzwerkes von Ihrem Server aus aufzubauen,
+deaktivieren Sie alle Checkboxen. In diesem Fall wird ihr Server weiterhin
+zum Tor-Netzwerk beitragen. Tor-Benutzer können sich weiterhin mit dem
+Tor-Netzwerk verbinden und Ihr Server wird Netzwerkverkehr zwischen anderen
+Tor-Servern weiterleiten.
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/troubleshooting.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/troubleshooting.html
new file mode 100644
index 0000000..25843df
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/de/troubleshooting.html
@@ -0,0 +1,105 @@
+<!--
+** $Id: troubleshooting.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Fehlersuche und Fehlerbeseitigung</h1>
+<hr />
+
+Nachfolgend sind einige der häufigsten Probleme und Fragen zum Betrieb
+von Tor aufgeführt. Falls Sie zu Ihrem Problem nicht fündig werden,
+finden Sie auf unserer Webseite unter <i>www.vidalia-project.net</i> weitere
+Hilfe und Informationen.
+
+<a name="start"/>
+<h3>Ich kann Tor nicht starten</h3>
+<p>
+Ein häufiger Grund, weshalb Vidalia Tor nicht starten konnte, ist die
+Angabe eines falschen Tor-Verzeichnisses. Sie können Vidalia das
+richtige Tor-Verzeichnis mitteilen, indem Sie die Option
+<i>Pfad zur Tor-Anwendung</i> in den <a href="config.html#general">Allgemeinen
+Einstellungen</a> korrigieren.
+</p>
+<p>
+Ein anderer möglicher Grund ist, dass bereits ein Tor-Prozess läuft.
+Überprüfen Sie die Liste der laufenden Prozesse und beenden Sie den
+laufenden Tor-Prozess, falls Sie einen finden. Versuchen Sie
+anschließend Tor erneut zu starten.
+</p>
+<p>
+Falls dieses Vorgehen nicht hilft, überprüfen Sie das
+<a href="log.html">Nachrichtenprotokoll</a> auf Fehler während des
+Starts von Tor.
+</p>
+
+<a name="connect"/>
+<h3>Vidalia kann keine Verbindung zu Tor herstellen</h3>
+<p>
+Vidalia steuert Tor durch Kommunikation über den
+<i>Kontrollport</i> von Tor.
+</p>
+<p>
+Der häufigste Grund, dass Vidalia keine Verbindung zu Tor herstellen
+konnte, ist dass Tor nach dem Start einen Fehler festgestellt hat und
+sofort beendet wurde. Sie können das
+<a href="log.html">Nachrichtenprotokoll</a> anschauen und herausfinden,
+ob Tor beim Start Fehler gemeldet hat.
+</p>
+<p>
+Falls Tor auf einem anderen Port auf Verbindungen wartet, als es Vidalia
+erwartet, kann Vidalia keine Verbindung zu Tor herstellen. Diese Einstellung
+muss nur selten geändert werden, bspw. müssen Sie einen anderen
+Port angeben, falls ein anderer Dienst auf Ihrem Rechner ebenfalls diesen
+Port benutzt. Diese Einstellung können Sie in den
+<a href="config.html#advanced">Fortgeschrittenen Einstellungen</a> von Vidalia
+vornehmen.
+</p>
+
+<a name="torexited"/>
+<h3>Tor wurden unerwartet beendet</h3>
+<p>
+Falls Tor sofort nach dem Start beendet wird, läuft wahrscheinlich
+bereits ein anderer Tor-Prozess. Schauen Sie im
+<a href="log.html">Nachrichtenprotokoll</a> nach, ob eine der letzten
+Meldungen gelb hervorgehoben ist und eine Nachricht ähnlich der folgenden
+enthält:
+</p>
+<pre>
+connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use.
+Is Tor already running?
+</pre>
+<p>
+Falls Sie eine solche Fehlermeldung finden, müssen Sie den anderen Tor-Prozess
+beenden, bevor Sie einen neuen mit Vidalia starten. Falls Sie Windows benutzen,
+können Sie nach <i>tor.exe</i> im Taskmanager suchen und diesen Prozess beenden.
+Auf anderen Betriebssystemen hilft Ihnen der Befehl <i>ps</i> den anderen Tor-Prozess
+zu finden.
+</p>
+<p>
+Falls Tor bereits länger als einige Sekunden lief, bevor es beendet wurde,
+sollten Sie das <a href="log.html">Nachrichtenprotokoll</a> auf Informationen
+durchsuchen. Fehler die zum Beenden von Tor geführt haben, werden rot oder
+gelb hervorgehoben.
+</p>
+
+<a name="stop"/>
+<h3>Vidalia kann Tor nicht beenden</h3>
+<p>
+Falls Vidalia Tor nicht beenden konnte, sollten Sie das
+<a href="log.html">Nachrichtenprotokoll</a> auf Fehler durchsuchen, die beim
+Beenden von Tor aufgetreten sind.
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/bridges.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/bridges.html
new file mode 100644
index 0000000..af58676
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/bridges.html
@@ -0,0 +1,69 @@
+<!--
+** $Id: bridges.html 3007 2008-08-22 00:12:08Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/config.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/config.html
new file mode 100644
index 0000000..91f8664
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/config.html
@@ -0,0 +1,198 @@
+<!--
+** $Id: config.html 2504 2008-04-12 18:23:28Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/contents.xml b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/contents.xml
new file mode 100644
index 0000000..8cf77ce
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/contents.xml
@@ -0,0 +1,66 @@
+<!--
+** $Id: contents.xml 3151 2008-09-25 04:58:06Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<Contents name="Vidalia Help" html="index.html">
+ <Topic id="running" name="Running Tor" html="running.html">
+ <Topic id="starting" name="Starting and Stopping Tor" html="running.html" section="starting"/>
+ <Topic id="monitoring" name="Monitoring Tor's Status" html="running.html" section="monitoring"/>
+ </Topic>
+ <Topic id="log" name="Message Log" html="log.html">
+ <Topic id="basic" name="Basic Information" html="log.html" section="basic"/>
+ <Topic id="severities" name="Message Severities" html="log.html" section="severities"/>
+ <Topic id="logfile" name="Logging to a File" html="log.html" section="tofile"/>
+ </Topic>
+ <Topic id="netview" name="Network Viewer" html="netview.html">
+ <Topic id="overview" name="Overview" html="netview.html" section="overview"/>
+ <Topic id="netmap" name="Network Map" html="netview.html" section="netmap"/>
+ <Topic id="status" name="Relay Status" html="netview.html" section="status"/>
+ <Topic id="details" name="Relay Details" html="netview.html" section="details"/>
+ </Topic>
+ <Topic id="config" name="Configuring Tor" html="config.html">
+ <Topic id="general" name="General Settings" html="config.html" section="general"/>
+ <Topic id="network" name="Network Settings" html="config.html" section="network"/>
+ <Topic id="server" name="Relay Settings" html="config.html" section="server"/>
+ <Topic id="appearance" name="Appearance Settings" html="config.html" section="appearance"/>
+ <Topic id="advanced" name="Advanced Settings" html="config.html" section="advanced"/>
+ <Topic id="services" name="Hidden Services" html="config.html" section="services"/>
+ </Topic>
+ <Topic id="server" name="Setting Up a Tor Relay" html="server.html">
+ <Topic id="basic" name="Basic Setup" html="server.html" section="basic"/>
+ <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>
+ <Topic id="bridges" name="Bridge Relays" html="bridges.html">
+ <Topic id="about" name="What are bridge relays?" html="bridges.html" section="about"/>
+ <Topic id="finding" name="How do I find a bridge relay?" html="bridges.html" section="finding"/>
+ </Topic>
+ <Topic id="services" name="Hidden Services" html="services.html">
+ <Topic id="about" name="What is a hidden service?" html="services.html" section="about"/>
+ <Topic id="provide" name="How do I provide a hidden service?" html="services.html" section="provide"/>
+ <Topic id="data" name="What data do I need to provide?" html="services.html" section="data"/>
+ <Topic id="buttons" name="What are the five buttons used for?" html="services.html" section="buttons"/>
+ <Topic id="advanced" name="How can I configure advanced hidden service settings?" html="services.html" section="advanced"/>
+ <Topic id="client" name="How does Vidalia help me to access other hidden services?" html="services.html" section="client"/>
+ </Topic>
+ <Topic id="troubleshooting" name="Troubleshooting" html="troubleshooting.html">
+ <Topic id="start" name="I Can't Start Tor" html="troubleshooting.html" section="start"/>
+ <Topic id="connect" name="Vidalia Can't Connect to Tor" html="troubleshooting.html" section="connect"/>
+ <Topic id="password"
+ name="Why is Vidalia asking me for a "control password"?"
+ html="troubleshooting.html" section="password"/>
+ <Topic id="torexited" name="Tor exited unexpectedly" html="troubleshooting.html" section="torexited"/>
+ <Topic id="stop" name="Vidalia Can't Stop Tor" html="troubleshooting.html" section="stop"/>
+ </Topic>
+ <Topic id="links" name="Helpful Links" html="links.html"/>
+</Contents>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/index.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/index.html
new file mode 100644
index 0000000..203a1c9
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/index.html
@@ -0,0 +1,40 @@
+<!--
+** $Id: index.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/links.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/links.html
new file mode 100644
index 0000000..4db7f93
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/links.html
@@ -0,0 +1,83 @@
+<!--
+** $Id: links.html 3685 2009-04-09 18:35:55Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<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</td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki">
+ http://trac.vidalia-project.net/wiki</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Bugtracker</td>
+ <td>
+ <a href="http://trac.vidalia-project.net/report">
+ http://trac.vidalia-project.net/report</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://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ">
+ https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki</td>
+ <td>
+ <a href="https://wiki.torproject.org/noreply/TheOnionRouter">
+ https://wiki.torproject.org/noreply/TheOnionRouter</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Bugtracker</td>
+ <td>
+ <a href="https://bugs.torproject.org/flyspray/">
+ https://bugs.torproject.org/flyspray</a>
+ </td>
+</table>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/log.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/log.html
new file mode 100644
index 0000000..f22df83
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/log.html
@@ -0,0 +1,105 @@
+<!--
+** $Id: log.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<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>
+ 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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/netview.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/netview.html
new file mode 100644
index 0000000..43c5f39
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/netview.html
@@ -0,0 +1,174 @@
+<!--
+** $Id: netview.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/running.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/running.html
new file mode 100644
index 0000000..21c437c
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/running.html
@@ -0,0 +1,106 @@
+<!--
+** $Id: running.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/server.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/server.html
new file mode 100644
index 0000000..8c7bf29
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/server.html
@@ -0,0 +1,242 @@
+<!--
+** $Id: server.html 4241 2010-03-16 18:54:19Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<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:
+ <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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/services.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/services.html
new file mode 100644
index 0000000..4ad627c
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/services.html
@@ -0,0 +1,146 @@
+<!--
+** $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.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.
+-->
+
+<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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/troubleshooting.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/troubleshooting.html
new file mode 100644
index 0000000..49b9337
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/en/troubleshooting.html
@@ -0,0 +1,149 @@
+<!--
+** $Id: troubleshooting.html 3151 2008-09-25 04:58:06Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<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 two common situations, though, where
+Vidalia may prompt you for a password:
+</p>
+
+<ul>
+ <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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/bridges.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/bridges.html
new file mode 100644
index 0000000..4951e93
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/bridges.html
@@ -0,0 +1,53 @@
+<!--
+** $Id: /local/vidalia/trunk/src/vidalia/help/content/en/contents.xml 145 2008-02-29T04:28:40.821411Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Siltareitittimet</h1>
+<hr />
+
+<a name="about"/>
+<h3>Mitä ovat siltareitittimet?</h3>
+<p>
+Jotkut Internet-operaattorit (engl. ISP, Internet Service Provider) yrittävät estää Tor-verkkoon pääsyn torjumalla yhteyden oton tunnettuihin Tor-reitittimiin. Siltareitittimet (tai <i>reitittimet</i> lyhyesti) ovat Tor-reitittimiä, jotka auttavat sensuroituja käyttäjiä pääsemään Tor-verkkoon. Toisin kuin muut Tor-reitittimet, siltoja ei ole listattuna samassa listoissa kuin normaalit reitittimet. Koska ei ole täydellistä listaa julkisista silloista, vaikka operaattori suodattaa yhteydet [...]
+</p>
+
+<a name="finding"/>
+<h3>Miten löydän siltareitittimen?</h3>
+<p>
+Kahdella tavalla voi saada sillan osoitteen:
+<ol>
+ <li>Pyytää ystävää pyörittämään omaa yksityistä siltaa</li>
+ <li>Käyttää jotain julkista siltaa</li>
+</ol>
+</p>
+
+<p>
+Käyttääkseen yksityisiä siltoja, kysy ystäviäsi käynnistämään Vidalia ja käyttävän Tor-ohjelmaa sensuroimattomalla Internet-alueella. Klikkaa sitten <i>Auta sensuroituja käyttäjiä pääsemään Tor-verkkoon</i>
+Vidalian <a href="server.html">Reititin-asetuksetsivulta</a>. Sitten heidän pitäisi lähettää heidän <i>Siltaosoite</i>-rivi heidän Reitin-sivun alaosasta. Toisin kuin poistumisreititin, siltareititin vain päästää tietoa itsensä kautta Tor-verkkoon ja verkosta, joten se ei mahdollista ylläpitäjää erilaisiin väärinkäyttöihin.
+</p>
+
+<p>
+Julkisen sillan osoitteen löytää menemällä
+<b>https://bridges.torproject.org</b>.
+Vastaukset tällä sivulla muuttuvat muutaman päivän välein, joten kannattaa käydä jaksoittain katsomassa jos tarvitsee lisää siltojen osoitteita. Toinen tapa saada julkisen sillan osoitteen on lähettää viesti <b>englannin kielellä</b> osoitteeseen <b>bridges at torproject.org</b> rivillä
+<b>get bridges</b> (engl. siltojen saaminen) viestiä lähetettäessä. Joten voimme tehdä vaikeaa hakkerille tietää siltojen osoitteita, kannattaa lähettää pyyntö Gmail- tai Yahoo!-tililtä.
+</p>
+
+<p>
+Tor-yhteyksien vakauttamiseksi on suositeltavaa määrittää useiden siltojen osoitteita, siltä varalta että jos jokin niistä ei ole jostain syystä käytettävissä.
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/config.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/config.html
new file mode 100644
index 0000000..952c448
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/config.html
@@ -0,0 +1,140 @@
+<!--
+** $Id: config.html 2539 2008-04-25 19:25:31Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Vidalian ja Tor-ohjelman asetusten muokkaaminen</h1>
+<hr />
+
+<p>
+Vidalia mahdollistaa Vidalian ja Tor-ohjelman yleisten toimintojen säätelyn. Vidalialla voi myös oman pystyttää <a
+href="server.html">Tor-reitittimen, hallitta sitä</a> mahdollistaen Tor-verkon kasvamisen.
+</p>
+
+<a name="general"/>
+<h3>Yleiset-asetukset</h3>
+<p>
+Yleiset-asetukset -sivun asetukset ovat yleisimmin muutettuja asetuksia.
+</p>
+<ul>
+ <li><b>Tor-ohjelma</b>:
+ Tor-ohjelma, jonka Vidalia käynnistää kun valitaan
+ <i>Käynnistä</i> tehtäväpalkin Vidalian valikosta. Jos koneella on monta eri versiota Tor-ohjelmasta, voi valita mitä Vidalia käyttää klikkaamalla
+ <i>Selaa</i>-painiketta ja siirtymällä kyseisen Tor-ohjelman asennuskansioon.
+ </li>
+ <li><b>Käynnistys</b>:
+ Tällä asetuksella Vidalia käynnistää Tor-ohjelman samalla sen jälkeen kun on itsensä käynnistänyt. Vidalian voi myös määrittää käynnistymään käyttöjärjestelmän käynnistymisen yhteydessä (<i>Vain Windows</i>).
+ </li>
+</ul>
+
+<a name="network"/>
+<h3>Verkkoasetukset</h3>
+<p>
+<i>Verkko</i>-asetussivulla voi päättää kuinka Tor-ohjelma yhdistää Tor-verkkoon.
+</p>
+<ul>
+ <li><b>Käytän välityspalvelinta käyttääkseen Internettiä</b>:
+ Jos Internetyhteytesi vaatii toimiakseen HTTP-välityspalvelimen, voi säätää Tor-ohjelman lähettämään yhteyspyyntönsä ja Tor-reititin yhteytensä välityspalvelimen kautta. Toimiakseen täytyy määrittää Vidaliaan välityspalvelimen osoite ja sen portti, jolla sitä käytetään. Jos välityspalvelin tarvitsee toimiakseen kirjautua, voi myös asettaa sen <i>käyttäjänimen</i> ja <i>salasananan</i>.
+ Muuten noi kentät jätetään tyhjäksi.
+ </li>
+ <li><b>Palomuuri sallii yhteydet vain tiettyihin portteihin</b>:
+ Jos on rajoittavan palomuurin takana tai välityspalvelin rajoittaa yhdistettävien porttien käyttöä, voi määrittää Tor-ohjelman ottavan yhteyden sillaisiin reitittimiin jotka kuuntelevat niissä porteissa joita palomuuri tai välityspalvelin sallii. Laittaa vain listan niistä porteista, jotka ovat sallittuja palomuurin tai välityspalvelimen kautta, eroteltuna pilkuilla. (<i>Esimerkiksi: 80,443,8080</i>)
+ </li>
+ <li><b>Operaattori torjuu yhteydet Tor-verkkoon</b>:
+ Jos ISP (Internet Palvelun Tarjoajasi engl. Internet Service Provider) torjuu yhteydet Tor-verkkoon, Tor-ohjelma voi välttää suodatuksen suojaamalla, tarkemmin ottaen kryptaamalla, sen yhteydet ja yhdistämällä Tor-verkkoon <i>siltareittimen</i> kautta (vain Tor 0.2.0.3-alpha tai uudempi). Siltareitittimiä voi määrittää joko osoitteella ja portilla tai niiden osoitteella, portilla ja tunnisteella.<br>
+
+ Esimerkkejä sopivista siltaosoitteiden kirjoitustyyleistä:
+ <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>
+ Vaikka ei tiedä yhdenkään siltareitittimen osoitetta, rastittamalla tämän laatikon voi olla hyödyllistä. Silloin Tor-ohjelma suojaa yhteydet kryptaamalla ne, joka päihittää joitakin torjumistekniikoita, jotka yleensä rajoittavat Tor-verkon käyttöä. Jos yhteydet normaaleihin Tor-reitittimiin torjutaan, täytyy jonkin siltareitittimen osoite saada selville ja lisätä tänne. Lue lisää ohjeenaiheesta <a href="bridges.html#finding">Miten löydän siltareitittimen?</a> saadakseen lisää tietoa [...]
+ </li>
+</ul>
+
+<a name="server"/>
+<h3>Reititinasetukset</h3>
+<p>
+<i>
+ Katso <a href="server.html">tätä ohjeenaihetta</a> saadakseen lisätietoa reitittimen pystyttämisestä ja käyttämisestä.
+</i>
+</p>
+
+<a name="appearance"/>
+<h3>Ulkoasun asetukset</h3>
+<p>
+Vidalian ulkonäköä voi muuttaa <i>Ulkoasut</i>-sivulla olevilla asetuksilla.
+</p>
+<ul>
+ <li><b>Kieli</b>:
+ Vidalian käyttöliittymä on käännetty usealle kielelle avuliaiden vapaaehtoisten avulla. Ensimmäisellä Vidalian käynnistys kerralla Vidalia yrittää arvata mitä kieltä tietokone käyttää. Jos Vidalia arvaa väärin tai haluaa muuten valita toisen, niin kielen voi vaihtaa kehyksestä. Vidalia pitää käynnistää kielen vaihdon jälkeen, jotta muutokset pääsevät voimaan.
+ </li>
+ <li><b>Tyyli</b>:
+ Monissa tapauksissa Vidalia käyttää alustan oletusulkoasutyyliä. Tyylin voi vaihtaa valitsemalla kehyksestä.
+ </li>
+</ul>
+
+<a name="advanced"/>
+<h3>Lisäasetukset</h3>
+<p>
+<i>Lisäasetukset</i>-sivun asetuksia yleensä muuttaa vain kokeneet käyttäjät.
+</p>
+<ul>
+ <li><b>Ohjausportti</b>:
+ <i>Portti</i>, jolla Vidalia käyttää Tor-ohjelmaa tai jolla voi ohjata ja tarkkailla Tor-ohjelmaa toisella tietokoneella.
+ Tätä ei tarvitse muuttaa, jos ei ole ristiriitaa oman tietokoneen muun palvelun kanssa.
+ </li>
+ <li><b>Ohjausporttiin kirjautuminen</b>:
+ Ohjausportin kirjautumisella voidaan rajoittaa ohjelmia ottamasta yhteyttä Tor-ohjelmaan ja muuttamasta sen asetuksia. Käytössä olevat kirjautumistavat:
+ <ul>
+ <li>
+ <b>Ei lainkaan</b> -- Kirjautumista ei tarvita. Tätä valintaa
+ <b>ehdottomasti</b> ei suosita. Mikä tahansa ohjelma tai käyttäjä koneella voi uudelleen määrittää Tor-ohjelman toiminnan.
+ </li>
+ <li>
+ <b>Salasana</b> <i>(Oletus)</i> -- Jos tämän tavan valitsee, voi määrittää salasanan jonka Tor tarvitsee aina kun käyttäjä tai ohjelma ottaa yhteyttä Tor-ohjelman ohjausporttiin. Jos Vidalia käynnistää Tor-ohjelman, Vidalia voi luoda joka kerta kun se käynnistää Tor-ohjelman uuden salasanan rastittamalla <i>Luo satunnaisesti</i>-ruutu.
+ </li>
+ <li>
+ <b>Eväste</b> -- jos evästekirjautuminen on valittuna, Tor-ohjelma kirjoittaa tiedoston (toisin sanoen <i>evästeen</i>) sisältäen satunnaisia tavuja tietokansioon käynnistyessä. Jokaisen käyttäjän tai ohjelman joka yrittää yhdistää Tor-ohjelman ohjausporttiin pitää tarjota tämän evästeen sisällön.
+ </li>
+ </ul>
+ </li>
+ <li><b>Tor-asetustiedosto</b> <i>(valinnainen)</i>:
+ Tällä saa Vidalian käynnistämään Tor-ohjelman jollakin erikseen määrätyllä Tor-asetustiedostolla <i>(torcc-tiedosto)</i>. Jos kentän jättää tyhjäksi Vidalia käyttää Tor-ohjelman oletusasetustiedostoa.
+ </li>
+ <li><b>Tor-ohjelman tietokansio</b> <i>(valinnainen)</i>:
+ Kansio, jossa Tor säilyttää tallentamansa tiedon kuten Tor-reititin tietoja, reititin avaimia ja asetustiedostoja voidaan määrittää. Jos tämän kehyksen jättää tyhjäksi, Tor-ohjelma käyttää omaa oletustietojen tallennuskansiota.
+ </li>
+ <li><b>Oikeudet</b> <i>(Valinnainen, ei ole käytössä Windowssissa)</i>:
+ Tor-ohjelmaa voi käyttää toisella käyttäjätilillä, jos laittaa arvon Suorita käyttäjänä. Silloin Tor-ohjelma suorittaa <i>setuid</i> tällä käyttäjällä käynnistyessään.
+Tor-ohjelma voi myös käynnistyä toisen ryhmän oikeuksien mukaisesti, jos laittaa arvon Suorita ryhmänä. Silloin Tor-ohjelma suorittaa <i>setgid</i> tällä ryhmällä käynnistyessään.
+ </li>
+</ul>
+
+
+<a name="services"/>
+<h3>Piilopalveluasetukset</h3>
+<p>
+Piilopalvelut antavat mahdollisuuden tarjoa minkälaisen tahansa TCP-pohjaisen palvelun, esim. HTTP-palvelimen, näyttämättä muille IP-osoitetta.
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/contents.xml b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/contents.xml
new file mode 100644
index 0000000..7e4c3da
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/contents.xml
@@ -0,0 +1,63 @@
+<!--
+** $Id: contents.xml 2807 2008-06-27 19:27:58Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<Contents name="Vidalian ohje" html="index.html">
+ <Topic id="running" name="Tor-ohjelman käyttö" html="running.html">
+ <Topic id="starting" name="Käynnistäminen ja pysäyttäminen" html="running.html" section="starting"/>
+ <Topic id="monitoring" name="Tor-ohjelman tilan tarkkaileminen" html="running.html" section="monitoring"/>
+ </Topic>
+ <Topic id="log" name="Tapahtumaloki" html="log.html">
+ <Topic id="basic" name="Perustietoa" html="log.html" section="basic"/>
+ <Topic id="severities" name="Tapahtumien tärkeys" html="log.html" section="severities"/>
+ <Topic id="logfile" name="Tapahtumien tallennus" html="log.html" section="tofile"/>
+ </Topic>
+ <Topic id="netview" name="Verkkokartta" html="netview.html">
+ <Topic id="overview" name="Yleistä" html="netview.html" section="overview"/>
+ <Topic id="netmap" name="Verkkokartta" html="netview.html" section="netmap"/>
+ <Topic id="status" name="Reitittimien tila" html="netview.html" section="status"/>
+ <Topic id="details" name="Reitittimien tiedot" html="netview.html" section="details"/>
+ </Topic>
+ <Topic id="config" name="Vidalian ja Tor-ohjelman asetukset" html="config.html">
+ <Topic id="general" name="Yleiset-asetukset" html="config.html" section="general"/>
+ <Topic id="network" name="Verkkoasetukset" html="config.html" section="network"/>
+ <Topic id="server" name="Reititinasetukset" html="config.html" section="server"/>
+ <Topic id="appearance" name="Ulkoasun asetukset" html="config.html" section="appearance"/>
+ <Topic id="advanced" name="Lisäasetukset" html="config.html" section="advanced"/>
+ <Topic id="services" name="Piilopalvelut" html="config.html" section="services"/>
+ </Topic>
+ <Topic id="server" name="Reitittimen asentaminen" html="server.html">
+ <Topic id="basic" name="Yleiset-asetukset" html="server.html" section="basic"/>
+ <Topic id="bandwidth" name="Nopeudenrajoittaminen" html="server.html" section="bandwidth"/>
+ <Topic id="exitpolicy" name="Poistumiskäytännöt" html="server.html" section="exitpolicy"/>
+ <Topic id="upnp" name="Porttien läpivienti" html="server.html" section="upnp"/>
+ </Topic>
+ <Topic id="bridges" name="Siltareitittimet" html="bridges.html">
+ <Topic id="about" name="Mitä ovat siltareitittimet?" html="bridges.html" section="about"/>
+ <Topic id="finding" name="Miten löydän siltareitittimen?" html="bridges.html" section="finding"/>
+ </Topic>
+ <Topic id="services" name="Piilopalvelut" html="services.html">
+ <Topic id="about" name="Mikä on piilopalvelu?" html="services.html" section="about"/>
+ <Topic id="provide" name="Miten voin luoda piilopalvelun?" html="services.html" section="provide"/>
+ <Topic id="data" name="Mitä tietoa tarvitsee tarjoa?" html="services.html" section="data"/>
+ <Topic id="buttons" name="Mihin jokaista nappulaa käytetään?" html="services.html" section="buttons"/>
+ <Topic id="advanced" name="Miten voin määrittää piilopalveluiden lisäasetuksia?" html="services.html" section="advanced"/>
+ <Topic id="client" name="Miten Vidalia auttaa käyttääkseen muita piilopalveluita?" html="services.html" section="client"/>
+ </Topic>
+ <Topic id="troubleshooting" name="Vianetsintä" html="troubleshooting.html">
+ <Topic id="start" name="Tor ei käynnisty" html="troubleshooting.html" section="start"/>
+ <Topic id="connect" name="Vidalia ei yhdistä Tor-ohjelmaan" html="troubleshooting.html" section="connect"/>
+ <Topic id="torexited" name="Tor lopetti yllättäen" html="troubleshooting.html" section="torexited"/>
+ <Topic id="stop" name="Tor ei pysähdy" html="troubleshooting.html" section="stop"/>
+ </Topic>
+ <Topic id="links" name="Hyödyllisiä linkkejä" html="links.html"/>
+</Contents>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/index.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/index.html
new file mode 100644
index 0000000..83e79ad
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/index.html
@@ -0,0 +1,35 @@
+<!--
+** $Id: index.html 2538 2008-04-25 18:17:40Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Vidalian ohje</h1>
+<hr />
+
+<p>Vasemmalta voi valita ohjeenaiheen tai klikkaamalla Etsi-nappulaa listan yläpuolelta, voi etsiä kaikista ohjeenaiheista.
+</p>
+
+<p>Ylhäällä työkalurivillä olevalla <i>Etsi</i>-nappulalla voi etsiä jotain tiettyä ohjeenaihetta.
+</p>
+
+<p>
+<i>Koti</i>-nappulalla pääsee takaisin tälle Koti-aloitussivulle.
+</p>
+
+<p>
+Tutustumalla <a href="links.html">Hyödyllisiin linkkeihin</a> -aiheeseen voi löytää lisää tietoa ja apua liittyen Vidaliaan, Tor-ohjelmaan ja Tor-verkkoon.
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/links.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/links.html
new file mode 100644
index 0000000..9112619
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/links.html
@@ -0,0 +1,83 @@
+<!--
+** $Id: links.html 2686 2008-06-10 14:51:55Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Hyödyllisiä linkkejä</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Kotisivu</td>
+ <td>
+ <a href="http://www.vidalia-project.net/">
+ http://www.vidalia-project.net/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki</td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki">
+ http://trac.vidalia-project.net/wiki</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Vianilmoitus (Bugtracker)</td>
+ <td>
+ <a href="http://trac.vidalia-project.net/report">
+ http://trac.vidalia-project.net/report</a>
+ </td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Kotisivu</td>
+ <td>
+ <a href="https://www.torproject.org/">https://www.torproject.org/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>UKK (FAQ)</td>
+ <td>
+ <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ">
+ https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki</td>
+ <td>
+ <a href="https://wiki.torproject.org/noreply/TheOnionRouter">
+ https://wiki.torproject.org/noreply/TheOnionRouter</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Vianilmoitus (Bugtracker)</td>
+ <td>
+ <a href="https://bugs.torproject.org/flyspray/">
+ https://bugs.torproject.org/flyspray</a>
+ </td>
+</table>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/log.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/log.html
new file mode 100644
index 0000000..dcb0ad4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/log.html
@@ -0,0 +1,89 @@
+<!--
+** $Id: log.html 2539 2008-04-25 19:25:31Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Tapahtumaloki</h1>
+<hr />
+
+Tapahtumaloki antaa lisätietoa käynnissä olevasta Tor-ohjelmasta.
+
+<a name="basic"/>
+Jokaisella tapahtumalla on oma <i>tärkeys/prioriteetti</i>, vakavasta
+<b>Virheestä</b> <b>Debug-tietoihin</b> (monisanainen). Tarkempaa tietoa on ohjeenaiheessa <a href="#severities">Tapahtumien tärkeys</a>.
+
+
+<a name="severities"/>
+<h3>Tapahtumien tärkeys</h3>
+<p>
+Tapahtuman tärkeydellä saa tiedon kuinka vakava on kyseinen tapahtuma. Lieviä tapahtumia tulee sattumanvaraisesti normaalin Tor-toiminnan yhteydessä, joita ei tarvitse kirjata lokiin.
+</p>
+
+<p>
+Mahdolliset tapahtumatyypit, vakavimmista ja lievimpään:
+</p>
+<ul>
+ <li>
+ <b>Virhe</b>: Tapahtumat, jotka tapahtuvat kun jotain on pahasti mennyt pieleen eikä Tor-ohjelma pysty jatkamaan toimintaansa. Nämä tapahtumat korostetaan <i>punaisella</i> tapahtumalokissa.
+ </li>
+ <li>
+ <b>Varoitus</b>: Tapahtumat, jotka tapahtuvat kun jotain on mennyt pieleen Tor-ohjelman kanssa, mutta eivät ole vakavia ja Tor-ohjelma voi jatkaa toimintaansa. Nämä tapahtumat korostetaan <i>keltaisella</i>.
+ </li>
+ <li>
+ <b>Ilmoitus</b>: Tapahtumat, jotka tapahtuvat sattumanvaraisesti normaalin Tor-toiminnan yhteydessä ja joita ei pidetä virheinä, mutta joiden tarkkailu on suositeltavaa.
+ </li>
+ <li>
+ <b>Tiedote</b>: Tapahtumat, jotka tapahtuvat säännöllisesti normaalin Tor-toiminnan yhteydessä ja joista käyttäjien ei tarvitse välittää.
+ </li>
+ <li>
+ <b>Debug</b>: Erittäin monisanaisia tapahtumia, jotka kiinnostavat erityisesti Tor-ohjelmoijia. Debug-tapahtumia ei kannata kirjata lokiin, jos ei ole erityisen suurta tarvetta sen kaltaiseen.
+ </li>
+</ul>
+
+<p>
+Käyttäjien kannattaa yleensä kirjata vain <i>Virhe-</i>, <i>Varoitus-</i>, ja <i>Ilmoitus-</i>tapahtumat.
+</p>
+
+<p>
+Valitakseen kuinka tärkeitä tapahtumia haluaa nähdä, niin tee seuraavanlaisesti:
+<ol>
+ <li>Avaa tapahtumaloki tehtäväpalkin Vidalian valikosta.</li>
+ <li>Klikkaa <i>Näytä asetukset</i> tapahtumaloki-ikkunan alaosasta.</li>
+ <li>
+ Rastita tapahtumatyypit tapahtumiensuodatuksesta vasemmalta, jotka haluat nähdä ja poista rasti niistä joita et halua.
+ </li>
+ <li>Klikkaa <i>Tallenna asetukset</i> hyväksyäksesi muutokset tapahtumien suodattaakseen.</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Tapahtumien tallennus</h3>
+<p>
+Vidalialla voi tallentaa tapahtumat erilliselle tiedostolle samanaikaisesti kun se kirjaa ne tapahtumaloki-ikkunaan. Tapahtumien tallentaminen automaattisesti lokiin saadaan:
+</p>
+
+<ol>
+ <li>Avaa tapahtumaloki tehtäväpalkin Vidalian valikosta.</li>
+ <li>Klikkaa <i>Näytä asetukset</i> tapahtumaloki-ikkunan alaosasta.</li>
+ <li>Rastita ruutu <i>Tallenna tapahtumat tiedostoon</i>.
+ <li>
+ Tiedosto, johon loki tallennetaan voidaan vaihtaa joko kirjoittamalla sijainti ja tiedostonnimi tekstikehykseen tai klikkaamalla <i>Selaa</i>
+ ja siirtymällä sijaintiin, johon haluaa lokitiedoston.
+ </li>
+ <li>Klikkaa <i>Tallenna asetukset</i> tallentaakseen loki kohteeseen.</li>
+</ol>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/netview.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/netview.html
new file mode 100644
index 0000000..6d31bb0
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/netview.html
@@ -0,0 +1,142 @@
+<!--
+** $Id: netview.html 2539 2008-04-25 19:25:31Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Verkkokartta</h1>
+<hr />
+
+<p>
+Verkkokartalla voi nähdä Tor-verkossa olevat reitittimet ja mihin omat yhteydet kulkevat.
+</p>
+
+
+<a name="overview"/>
+<h3>Yleistä</h3>
+<p>
+Kun halutaan kommunikoida tuntemattomasti Tor-verkon kautta (esim. internetsivulle), niin Tor-ohjelma luo yhteyden <i>(engl. circuit)</i> koostuen erillisistä suojatuista yhteyksistä reititinsarjojen läpi verkossa. Ohjelman liikenne kulkee datavirtoina <i>(engl. stream)</i> edellä mainitun yhteystyypin mukaisesti. Toiminnan tehostuksena yksittäisessä yhteydessä voi olla useaita datavirtoja.
+</p>
+
+<a name="netmap"/>
+<h3>Verkkokartta</h3>
+<p>
+Verkkokartta koostuu Maan kartasta ja punaisista pisteistä, joilla ilmaistaan Tor-verkon reitittimien maantieteelliset sijainnit. Reitittimien välille piirretyt vihreät viivat näyttävät oman Tor-ohjelman ja Tor-verkon välissä olevien yhteyksien reitin.
+</p>
+<p>
+Karttaa voi skaalata klikkaamalla <b>Suurenna</b>- ja
+<b>Pienennä</b> -nappuloita työkalupalkista. Karttaa voi myös vierittää klikkaamalla sitä tai vetämällä sitä omaan haluttuun suuntaan.
+</p>
+<p>
+Tor-reitittimien maantieteellinen sijainti selvitetään tarkistamalla IP-osoite GeoIP-tietokannasta, jonka on tehnyt MaxMind ja sijaitsee osoitteessa geoip.vidalia-project.net.
+</p>
+<p>
+Keskellä ruutua kartan alla on lista käytössä olevista yhteyksistä, kuten myös minkä tahansa ohjelmien datavirta näissä yhteyksissä. Kun verkkokartta latautuu, ruudusta näkee yhteyden geoip.vidalia-project.net -osoitteeseen, joka tapahtuu kun Vidalia tarkistaa Tor-reitittimien maantieteellistensijaintien tietoja. Tärkeää on huomioida, että pyyntö luodaan käyttämällä Tor-verkkoa, joten omaa sijaintia ei ilmoiteta GeoIP-palvelimelle. Pyyntöjen tulokset tallennetaan kiintolevylle välimuisti [...]
+</p>
+
+
+<a name="serverlist"/>
+<h3>Reitittimien tila</h3>
+<p>
+Vasemmassa reunassa verkkokartassa on lista Tor-verkon reitittimistä. Jokaisen reitittimen vieressä on kuvake, joka ilmaisee sen tilan.
+Seuraavassa taulukossa on käytössä olevat reitittimien tilat:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+ <td valign="middle">
+ Reititin on poispäältä (offline-tilassa) tai ei vastaa.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+ <td valign="middle">
+ Reititin on <i>lepotilassa</i> eli se on päällä (online-tilassa), mutta on käyttänyt yhteyttä niin paljon kuin operaattori on sallinnut tietyn ajan kuluessa.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+ <td valign="middle">
+ Reititin on online-tilassa ja sen kautta kulkee vähän liikennettä.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+ <td valign="middle">
+ Reititin on online-tilassa ja sen kautta välittyy >= 20 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+ <td valign="middle">
+ Reititin on online-tilassa ja sen kautta välittyy >= 60 KB/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+ <td valign="middle">
+ Reititin on online-tilassa ja sen kautta välittyy >= 400 KB/s.
+ </td>
+</tr>
+</table>
+</p>
+<p>
+Kaikki yhteysnopeusarvot ovat arvioita vähimmäis yhteysnopeuksista sisään tai ulos yli kymmenen sekunnin aikana kuluneessa päivässä.
+</p>
+
+
+<a name="details"/>
+<h3>Reitittimien tiedot</h3>
+<p>Reititin-tietoruutussa oikealla kerrotaan lisätietoa
+<a href="#serverlist">reititinlistasta</a> valitusta reitittimestä tai reitittimistä. Jos yhteys tai datavirta on valittu datavirrat-listasta, niin tässä ruudussa näkyy tietoa kaikista reitittimistä joiden kautta oman koneen välittyy liikenne.
+</p>
+<p>
+Tiedot, jotka ovat nähtävissä ruudusta ovat samanlaisia kuten seuraavat (<i>Huomaa</i>: ei kaikki seuraavaksi mainituista ole aina välttämättä näkyvillä):
+</p>
+<p>
+<table>
+<tr>
+ <td><b>Sijainti</b></td>
+ <td>Tor-reitittimen maantieteellinen sijainti.</td>
+</tr>
+<tr>
+ <td><b>IP-osoite</b></td>
+ <td>IP-osoite, josta Tor-reititin voidaan tavoittaa.</td>
+</tr>
+<tr>
+ <td><b>Alusta</b></td>
+ <td>
+Tietoa sen käyttöjärjestelmästä ja Tor-ohjelmasta sillä Tor-reitittimellä.
+ </td>
+</tr>
+<tr>
+ <td><b>Yhteys</b></td>
+ <td>
+ Arvioitu enimmäisnopeus, joka on välittynyt hiljattain tältä reitittimeltä listareitittimien kautta.
+ </td>
+</tr>
+<tr>
+ <td><b>Päällä</b></td>
+ <td>
+ Aika, kuinka kauan reititin on ollut päällä ja, josta voi olla apua arvioidakseen reitittimen vakaus.
+ </td>
+</tr>
+<tr>
+ <td><b>Viimeksi päivitetty</b></td>
+ <td>Ajankohta, jolloin on viimeksi reitittimen tiedot päivitetty.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/running.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/running.html
new file mode 100644
index 0000000..478ccab
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/running.html
@@ -0,0 +1,89 @@
+<!--
+** $Id: running.html 2495 2008-04-07 08:50:29Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Tor-ohjelman käyttö</h1>
+<hr />
+
+<p>
+Vidalialla voi ohjata omaa Tor-ohjelmaa; käynnistää ja pysäyttää sen, nähdä sen tilan ja huomata jos se pysähtyy yllättäen.
+</p>
+
+<a name="starting"/>
+<h3>Tor-ohjelman käynnistäminen ja pysäyttäminen</h3>
+<p>
+<i>Käynnistääkseen</i> Tor,
+<ol>
+ <li>Valitse <i>Käynnistä</i> tehtäväpalkin Vidalian valikosta tai paina <i>Ctrl+S</i></li>.
+ <li>
+ Vidalian tehtäväpalkin kuvake muuttuu sipulista, jossa on punainen X vihreäksi sipuliksi, kun on käynnistynyt Tor.
+ </li>
+</ol>
+Jos Vidalia ei onnistu käynnistämään Tor-ohjelmaa, niin Vidalia näyttää virheilmoituksen, jossa kerrotaan mitä ongelmia kohtasi Tor.
+<a href="log.html">Tapahtumalokista</a> voi nähdä tarkemmin mitä ongelmia Tor on kohdannut.
+</p>
+
+<p>
+<i>Pysäyttääkseen</i> Tor,
+<ol>
+ <li>Valitse <i>Pysäytä</i> tehtäväpalkin Vidalian valikosta tai paina <i>Ctrl+T</i></li>.
+ <li>
+ Vidalian tehtäväpalkin kuvake muuttuu vihreästä harmaaksi sipuliksi, jossa on punainen X, kun on pysäytetty Tor.
+ </li>
+</ol>
+Jos Vidalia ei onnistu pysäyttämään Tor-ohjelmaa, niin Vidalia näyttää virheilmoituksen, jossa kerrotaan mitä ongelmia kohtasi Tor.
+<a href="log.html">Tapahtumalokista</a> voi katsoa tarkemmin mitä Tor on kohdannut.
+</p>
+
+<a name="monitoring"/>
+<h3>Tor-ohjelman tilan tarkkaileminen</h3>
+<p>
+Vidalia ilmaisee Tor-ohjelman tilan näyttämällä kuvakkeen tehtäväpalkissa tai telakointialueella. Seuraavassa taulukossa on Vidalian käyttämät tilat Tor-ohjelman toiminnasta:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+ <td valign="middle">
+ Tor-ohjelma on pysähtynyt. Valitse <i>Käynnistä</i> Vidalian valikosta käynnistääkseen Tor.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+ <td valign="middle">
+ Tor-ohjelma käynnistyy.
+ <a href="log.html">Tapahtumalokista</a> voi tarkkailla Tor-ohjelman tilaa sen käynnistyessä.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+ <td valign="middle">
+ Tor-ohjelma on käynnissä. Jos haluat pysäyttää Tor-ohjelman, valitse <i>Pysäytä</i> Vidalian valikosta. Tor kirjaa
+ <a href="log.html">tapahtumalokiin</a> tietoja tapahtumista ollessaan käynnissä, joista voi nähdä mitä Tor tekee paraikaa.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+ <td valign="middle">Tor-ohjelmaa suljetaan.</td>
+</tr>
+</table>
+</p>
+
+<p>
+Jos Tor pysähtyy yllättäen, Vidalia muuttaa kuvakkeensa mustaksi sipuliksi, jossa on punainen X ja näyttää virheilmoituksen ilmoittaakseen mikä meni pieleen. <a href="log.html">Tapahtumalokista </a>voi nähdä lisätietoja ongelmista, joita Tor-ohjelmalla oli ennen pysähtymistä.
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/server.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/server.html
new file mode 100644
index 0000000..79522c4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/server.html
@@ -0,0 +1,190 @@
+<!--
+** $Id: server.html 4241 2010-03-16 18:54:19Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Reitittimen asentaminen</h1>
+<hr />
+
+Tor-verkko koostuu vapaaehtoisten jakaamasta yhteyskaistasta Tor-reitittiminä (pieninä palvelimina). Vidalia tarjoaa helpon keinon pystyttää oma reititin.
+
+<a name="basic"/>
+<h3>Yleiset-asetukset</h3>
+<p>
+Jos on kiinnostusta auttaa Tor-verkon toimintaa ylläpitämällä omaa reititintä, niin seuraavilla ohjeilla on mahdollista yksinkertaisesti pystyttää oma Tor-reititin:
+</p>
+<ol>
+ <li>
+ Avaa <i>Asetukset-ikkuna</i> valitsemalla <i>Asetukset</i> tehtäväpalkista Vidalian valikosta tai <i>Asetukset</i> järjestelmän valikosta Macintosh-järjestelmissä.
+ </li>
+ <li>Valitse <i>Reititin</i>-asetussivu.</li>
+ <li>Tor-ohjelmaa voidaan suorittaa joko normaalina reitittimenä tai <i>silta</i>reitittimenä (Tor 0.2.0.8-alpha tai uudempi). Siltareitittimet auttavat sensuroituja Tor-käyttäjiä, jotka eivät pysty suoraan käyttämään Tor-verkkoa.
+ Rasita ruutu <i>Välitä tietoa Tor-verkossa</i>, jos haluat suorittaa normaalia Tor-reitintä tai auttaa <i>Auta sensuroituja käyttäjiä pääsemään Tor-verkkoon</i>, jos haluat suorittaa Tor-reititinsiltaa.
+</li>
+ <li>Aseta seuraavat tiedot:
+ <ul>
+ <li><b>Nimi</b>:
+ Nimi, jolla reititin voidaan tunnistaa Tor-verkossa. Esimerkiksi "MinunVidaliareititin".
+ </li>
+ <li><b>Yhteystiedot</b>:
+ Sähköpostiosoitteesi, jolla voidaan ottaa yhteyttä vakavan Tor-ohjelman tietoturvapäivityksen tai reititinvian vuoksi. Oman PGP- tai GPG-tunnuksen ja sormenjäljen voi myös sisällyttää.
+ </li>
+ <li><b>Reititinportti</b>:
+ Portti, jolla reititin vastaanottaa liikennettä käyttäjiltä ja muilta Tor-reitittimiltä.
+ </li>
+ <li><b>Osoite</b>:
+ Aseta osoite, jolla muut Tor-reititin voivat tavoittaa tietokoneesi Internetin kautta. Jos ei omaa julkista IP-osoitetta tiedä, niin painamalla <i>Nouda osoite</i> Vidalia ottaa yhteyden ulkoiseen sivustoon (esim. <i>http://www.vidalia-project.net/iptest/ip.php</i>) selvittääkseen koneen julkisen IP-osoitteen.
+ </li>
+ </ul>
+ <li>
+ Jos haluat välittää listaa verkossa olevista Tor-reitittimistä, niin rastita ruutu <i>Välitä Tor-reititinlistaa</i>.
+ Jos yhteys on hidas, niin ei välttämättä ole kannattavaa rastittaa ruutua. Jos haluaa välittää listaa Tor-reitittimistä, niin varmista että <i>lista-portti</i> on eri kuin <i>reititinportti</i>.
+ </li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Nopeudenrajoittaminen</h3>
+<p>
+Tor-reitittimen ylläpito kuluttaa paljon yhteyskaistaa, jonka vuoksi Tor sallii käytettävän yhteyskaistamäärän rajoittamisen Tor-reitittimille. Reititintä voi pitää päällä samalla kun yhteyttä käytetään muihin tarkoituksiin.
+</p>
+<p>
+Valikosta kannattaa valita itselleen parhaiten sopivin nopeus. Oman erikoisnopeuden on mahdollista valita valitsemalla <i>muu</i>.</p>
+<h4>Muut rajoitukset</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. Jos kerkimääräinennopeus on sama kuin <i>enimmäisnopeus</i> Tor ei ylitä määriteltyä nopeutta. <i>Enimmäisnopeutesi</i> täytyy olla yhtä suuri tai suurempi kuin <i>keskimääräinen nopeus</i>.</p>
+<p><i>Keskimääräinennopeus</i> on suurin pitkäaikainenkeskimääräinen sallittu nopeus (kilotavua sekunnissa). Esimerkiksi on kannattavaa asettaa 2 megabittiä sekunnissa (2048 kt/s) tai 50 kilotavua sekunnissa (tyypillinen laajakaistayhteyden nopeus). Tor tarvitsee vähintään 20 kilotavua sekunnissa toimiakseen reitittimenä.
+
+</p>
+<p>
+Tärkeää on huomioida, että Tor laskee liikkuvan tiedon <b>tavuina</b> eikä bitteinä. Myös, Tor rajottaa vain tulevaa liikennettä lähettävän sijasta. Esimerkiksi, jos oma reititin välittää listaa Tor-reititin silloin lähettää enemmän tietoa kuin vastaanottaa. Jos tämä rasittaa liikaa yhteyttä, niin kannattaa poistaa rasti <i>Välitä Tor-reititinlistaa</i> kohdasta.
+</p>
+
+<a name="exitpolicy"/>
+<h3>Poistumiskäytännöt</h3>
+<p>
+Poistumiskäytännöillä määritellään millaista liikennettä sallitaan poistuvan oman Tor-reitittimen kautta. Tor käyttää oletuksena poistumiskäytäntölistaa, joka rajoittaa erilaisten palvelujen käyttöä kuten sähköpostia, estääkseen spammin tekoa ja oletus tiedostonjakoportteja estääksen hyväksikäyttämättä Tor-verkkoa.
+</p>
+
+<p>
+Jokainen vaihtoehto ilmaisee tietynlaista palvelua, jota voi sallia Tor-verkon kautta kulkemaan palvelimesi kautta. Jos poistaa rastin jonkin vierestä, Tor-ohjelma ei salli sen kaltaista liikennettä reitittimesi kautta ja jos on rastitettu <i>Monenlaiset muut palvelut</i>, Tor-ohjelma sallii muunlaisen liikenteen poistuvan reitittimesi kautta kuin edellä mainitut vaihtoehdot.
+</p>
+
+<p>
+Alla olevassa listassa esitetään jokaisen rastitettavan poistumiskäytännön. <b>Kuvaus</b>-sarake kertoo millaisia palveluita Tor-käyttäjät voivat käyttää reitittimesi kautta, jos sen laatikko on rastitettu.
+</p>
+
+<table border="1">
+<tr>
+ <td><b>Toiminto</b></td>
+ <td><b>Portit</b></td>
+ <td><b>Kuvaus</b></td>
+</tr>
+<tr>
+ <td>Verkkosivustot</td>
+ <td valign="middle">80</td>
+ <td>Normaalien suojaamattomien sivujen selaamista</td>
+</tr>
+<tr>
+ <td>Suojatut sivustot (SSL)</td>
+ <td valign="middle">443</td>
+ <td>Suojattujen sivujen selaamista</td>
+</tr>
+<tr>
+ <td>Sähköpostin vastaanotto (POP, IMAP)</td>
+ <td valign="middle">110, 143, 993, 995</td>
+ <td>Sähköpostiviestien lataamista (lähettämistä ei sallita)</td>
+</tr>
+<tr>
+ <td>Pikaviestintä (IM)</td>
+ <td valign="middle">703, 1863, 5050, 5190, 5222, 5223, 8300, 8888</td>
+ <td>Pikaviestintäohjelmien käyttämistä kuten esim. MSN Messenger, AIM, ICQ ja Jabber</td>
+</tr>
+<tr>
+ <td>Internet Relay Chat (IRC)</td>
+ <td valign="middle">6660-6669, 6697, 7000-7001</td>
+ <td>Keskustelemista IRC-käyttäjien ja -palvelimien kanssa</td>
+</tr>
+<tr>
+ <td>Monenlaiset muut palvelut</td>
+ <td valign="middle">*</td>
+ <td>Muut ohjelmat, joita edelliset toiminnot eivät kata</td>
+</tr>
+</table>
+
+<p>Jos ei halua sallia muiden Tor-käytäjien muodostaa yhteyksiä Tor-verkon ulkopuolelle oman reitittimen kautta, niin poista rasti jokaisesta ruudusta. Vaikka rastit on poistettu jokaisesta kohdasta, niin reitittimesi on hyödyllinen Tor-Verkolle. Reitittimesi sallii Tor-käyttäjien muodostaa yhteyksiä Tor-verkkoon ja välittää tietoa Tor-reitittimien välillä.
+</p>
+
+<p>
+Kun käynnistää siltareitittimen, <i>Poistumiskäytännöt</i>-välilehti muuttuu harmaaksi, koska siltareitittimet eivät salli poistumisyhteyksiä. Siltareitittimiä käytetään vain, että niiden avulla Tor-käyttäjät pääsevät Tor-verkkoon.
+</p>
+
+
+<a name="upnp"/>
+<h3>Porttien läpivienti</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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/services.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/services.html
new file mode 100644
index 0000000..4ad0ebd
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/services.html differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/troubleshooting.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/troubleshooting.html
new file mode 100644
index 0000000..53025d1
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fi/troubleshooting.html
@@ -0,0 +1,70 @@
+<!--
+** $Id: troubleshooting.html 2539 2008-04-25 19:25:31Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Vianetsintä</h1>
+<hr />
+
+Alapuolella on lista yleisimmistä ongelmista ja kysymyksistä, joita on Tor-ohjelman käyttäjillä. Jos ohjeesta ei löydy ratkaisua ongelmaan, niin Vidalian internetsivulta <i>www.vidalia-project.net</i> on mahdollista saada lisää apua.
+
+<a name="start"/>
+<h3>Tor ei käynnisty</h3>
+<p>
+Tyypillisin syy, että Vidalia ei onnistu käynnistämään Tor-ohjelmaa johtuu siitä, että Vidalia luulee Tor-ohjelman sijaitsevan jossakin muussa kansiossa. Tor-ohjelman sijainnin voi määrittää muuttamalla <i>Tor-ohjelma</i> -asetusta
+<a href="config.html#general">yleisistä-asetuksista</a>.
+</p>
+<p>
+Seuraava mahdollinen selitys on, että Tor-ohjelma on jo päällä. Kannattaa tarkistaa päällä olevien ohjelmien -listaa ja pysäyttää päällä oleva Tor-ohjelma, jos löytyy. Sen jälkeen kannattaa yrittää uudelleen.
+</p>
+<p>
+Jos tuosta ei ollut tarpeeksi apua, niin kannattaa tarkistaa <a href="log.html">tapahtumaloki</a>, sillä Tor-ohjelma on voinut kirjata tietoja käynnistymisessä kohdatuista virheistään.
+</p>
+
+<a name="connect"/>
+<h3>Vidalia ei yhdistä Tor-ohjelmaan</h3>
+<p>
+Vidalia käyttää Tor-ohjelmaa Tor-<i>ohjausportin</i> välityksellä.
+</p>
+<p>
+Yleisin syy miksi Vidalia ei onnistu yhdistämään Tor-ohjelmaan on, koska Tor-ohjelma on jo päällä ja on kohdannut virheen ja välittömästi lopettanut. Jonka jälkeen on suositeltavaa tarkistaa <a href="log.html">tapahtumaloki</a>, sillä Tor-ohjelma on voinut kirjata tietoja käynnistymisessä kohdatuista virheistään.
+</p>
+<p>
+Jos Tor-ohjelma kuuntelee toista porttia kuin Vidalia kuvittelee, niin Vidalia ei pysty muodostamaan yhteyttä Tor-ohjelmaan. Tätä asetusta harvoin tarvitsee muuttaa, mutta jos jokin muu tietokoneella oleva palvelu tuottaa häiriöitä, niin porttia voidaan joutua muuttamaan. Sen muuttaminen onnistuu Vidalian <a href="config.html#advanced">lisäasetuksista</a>.
+</p>
+
+<a name="torexited"/>
+<h3>Tor lopetti yllättäen</h3>
+<p>
+Jos Tor-ohjelma lopettaa yllättäen, kun sitä yritetään käynnistää, niin kenties Tor-ohjelma on jo päällä. Silloin on suositeltavaa tarkistaa <a href="log.html">tapahtumaloki</a>, jos sen lopussa on keltaisella korostettuja viestejä ja ovatko ne seuraavan kaltaisia:
+</p>
+<pre>
+connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use.
+Is Tor already running?
+</pre>
+<p>
+Jos tulee yllä mainitun kaltainen viesti, niin kannattaa sulkea muut päällä olevat Tor-ohjelmat ennen kuin yrittää käynnistää uuden Tor-ohjelman Vidalialla. Windowssissa <i>tor.exe</i>-niminen tiedosto pitäisi löytyä Tehtävienhallinnasta (engl. Task Manager). Useimmissa käyttöjärjestelmissä <i>ps</i>-komennolla on mahdollista löytää päällä olevat Tor-ohjelmat.
+</p>
+<p>
+Jos Tor-ohjelma on ollut onnistuneesti käynnissä hetken (pidempään kuin hetken), niin <a href="log.html">tapahtumalokista</a> voi löytyä tietoa, jos Tor-ohjelma on kirjannut tietoja kohdatuista virheistään ennen kuin lopetti yllättäen itsensä. Sen kaltaiset virheet ovat korostettu joko punaisella tai keltaisella.
+</p>
+
+<a name="stop"/>
+<h3>Tor ei pysähdy</h3>
+<p>
+Jos Vidalia ei onnistu pysäyttämään Tor-ohjelmaa, niin kannattaa tarkistaa <a href="log.html">tapahtumaloki</a>, jos Tor-ohjelma on kirjannut lopettaessaan virhetietoja.
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/bridges.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/bridges.html
new file mode 100644
index 0000000..db1c0ee
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/bridges.html
@@ -0,0 +1,74 @@
+<!--
+** $Id: bridges.html 2801 2008-06-26 14:21:51Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Relais passerelles</h1>
+<hr />
+
+<a name="about"/>
+<h3>Que sont les relais passerelles ?</h3>
+<p>
+Certains fournisseurs d'accès à Internet (FAI) tentent d'empêcher les
+utilisateurs d'accéder au réseau Tor en bloquant les connexions aux relais Tor
+connus. Les relais passerelles (ou simplement <i>passerelles</i>) sont des
+relais qui permettent à ces utilisateurs censurés d'accéder au réseau Tor.
+Contrairement aux autres relais Tor, les passerelles ne sont pas listées dans
+le même annuaire public que les relais normaux. Comme il n'existe pas de liste
+publique complète de ces passerelles, même si votre FAI filtre toutes les
+connexions vers les relais Tor connus, il ne pourra probablement pas bloquer
+l'ensemble des passerelles.
+</p>
+
+<a name="finding"/>
+<h3>Comment puis-je trouver un relais passerelle ?</h3>
+<p>
+Deux moyens principaux permettent de trouver l'adresse d'une passerelle :
+<ol>
+ <li>Demander à vos amis d'installer une passerelle privée pour vous</li>
+ <li>Utiliser une passerelle publique</li>
+</ol>
+</p>
+
+<p>
+Pour utiliser une passerelle privée, demandez à vos amis de lancer Vidalia et
+Tor dans une zone non censurée de l'Internet puis de cliquer sur le bouton
+<i>Aider un utilisateur censuré</i> situé dans la page <a
+href="server.html">Paramètres du relais</a> de Vidalia. Ensuite, ils doivent
+vous envoyer l'<i>adresse de la passerelle</i> indiquée en bas de leur page
+Relais. Contrairement à un relais de sortie, une passerelle transmet
+uniquement les données depuis et vers le réseau Tor. De ce fait, elle n'expose
+pas vos amis à une plainte de leur opérateur Internet pour utilisation
+abusive.
+</p>
+
+<p>
+Vous pouvez trouver des adresses de passerelles publiques en visitant
+<b>https://bridges.torproject.org</b>. Ces passerelles changent régulièrement.
+Vous devez en conséquence vérifier les réponses tous les quelques jours si
+vous avez besoin de nouvelles adresses passerelles. Un autre moyen de trouver
+des passerelles publiques est d'envoyer un courriel à
+<b>bridges at torproject.org</b> avec le texte <b>get bridges</b> dans le corps
+du message. Pour qu'il soit encore plus difficile pour un attaquant de repérer
+des passerelles, vous devez envoyer la requête depuis une messagerie en ligne
+telle que GMail ou Yahoo!.
+</p>
+
+<p>
+Configurer plusieurs passerelles rend la connexion Tor plus stable au cas où
+certaines passerelles deviennent inaccessibles.
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/config.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/config.html
new file mode 100644
index 0000000..e3a30bb
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/config.html
@@ -0,0 +1,201 @@
+<!--
+** $Id: config.html 2801 2008-06-26 14:21:51Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Configurer Vidalia et Tor</h1>
+<hr />
+
+<p>
+Vidalia vous permet de configurer les options les plus communes de Vidalia et
+de Tor. Il permet également de mettre en place et de gérer un <a
+href="server.html">relais Tor</a>. Vous pouvez ainsi aider facilement le
+réseau Tor à grossir.
+</p>
+
+<a name="general"/>
+<h3>Options générales</h3>
+<p>
+La page <i>Général</i> rassemble les options les plus souvent modifiées.
+</p>
+<ul>
+ <li><b>Application Tor</b>:
+ Ce champ contient le chemin de l'exécutable Tor que Vidalia lancera
+ lorsque vous sélectionnerez <i>Démarrer</i> à partir du menu Tor situé
+ dans la zone de notification. Si vous avez installé plusieurs versions de
+ Tor, vous pouvez indiquer à Vidalia la version qu'il doit utiliser en
+ cliquant sur le bouton <i>Parcourir</i> et en sélectionnant l'application
+ Tor que vous souhaitez.
+ </li>
+ <li><b>Options de démarrage</b> :
+ Cette option permet à Vidalia de lancer automatiquement Tor lorsqu'il
+ démarre. Vous pouvez également indiquer à Vidalia de démarrer
+ automatiquement lors du démarrage du système d'exploitation (<i>option
+ disponible seulement sur Windows</i>).
+ </li>
+</ul>
+
+<a name="network"/>
+<h3>Options de réseau</h3>
+<p>
+La page <i>Réseau</i> vous permet de modifier la façon dont Tor se connecte au
+réseau Tor.
+</p>
+<ul>
+ <li><b>J'utilise un serveur mandataire (proxy) pour accéder à l'Internet</b>:
+ Si votre connexion à l'Internet s'effectue par le biais d'un mandataire
+ HTTP, vous pouvez configurer Tor afin qu'il l'utilise pour envoyer toutes
+ ses requêtes d'annuaire et toutes ses connexions aux relais Tor. Vous
+ devez indiquer au moins le nom d'hôte ou l'adresse de votre mandataire et
+ le port que le mandataire utilise pour écouter les connexions. Si votre
+ mandataire nécessite une authentication, vous pouvez également entrer le
+ <i>nom d'utilisateur</i> et le <i>mot de passe</i> que vous utilisez pour
+ vous y connecter. Si ce n'est pas le cas, vous pouvez laisser ces champs
+ vides.
+ </li>
+ <li><b>Mon parefeu m'autorise à me connecter seulement sur certains ports</b>:
+ Si vous êtes derrière un parefeu restrictif ou un mandataire qui limite
+ les ports auxquels vous pouvez vous connecter, vous pouvez configurer Tor
+ pour qu'il se connecte uniquement sur les ports autorisés. Entrez
+ simplement la liste des ports dont l'accès est permis par votre parefeu ou
+ par votre mandataire, séparés par des virgules (<i>exemple: 80,443,8080</i>).
+ </li>
+ <li><b>Mon fournisseur d'accès à Internet (FAI) bloque les connexions au
+ réseau Tor</b>:
+ Si votre fournisseur d'accès à Internet bloque les connexions au réseau
+ Tor, Tor peut essayer de contourner les filtrages en chiffrant ses
+ connexions à l'annuaire et en se connectant au réseau Tor à travers de
+ relais appelés <i>passerelles</i> (seulement avec Tor 0.2.0.8-alpha ou
+ plus récent). Vous pouvez ajouter des relais passerelles en indiquant leur
+ adresse, leur numéro de port et éventuellement leur empreinte.<br>
+
+ Voici quelques exemples d'adresses de passerelles valides:
+ <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>
+
+ Cocher cette option est utile même si vous ne connaissez aucune adresse de
+ relais passerelle. Tor chiffrera ainsi ses requêtes d'annuaire, ce qui
+ peut faire échouer les systèmes de blocage qui essaient de filtrer les
+ requêtes Tor afin de trouver des informations sur les autres relais. Si
+ les connexions aux relais Tor normaux sont également bloqués, alors vous
+ devrez apprendre à trouver des adresses de relais passerelles et les
+ indiquer dans ce champ. Consultez la page <a
+ href="bridges.html#finding">Trouver une passerelle relais</a> pour avoir
+ davantage d'information sur ce sujet.
+ </li>
+</ul>
+
+<a name="relay"/>
+<h3>Options du relais</h3>
+<p>
+<i>
+Consultez la page <a href="server.html">Configurer un serveur</a> pour avoir des informations détaillées sur la manière de paramètrer et de gérer un relais Tor.
+</i>
+</p>
+
+<a name="appearance"/>
+<h3>Options de l'interface</h3>
+<p>
+Les options présentes sur la page <i>Interface</i> vous permettent de
+personnaliser l'apparence et l'ergonomie de Vidalia.
+</p>
+<ul>
+ <li><b>Langue</b>:
+ L'interface de Vidalia a été traduite dans de nombreuses langues par des
+ bénévoles. Lors de son premier démarrage, Vidalia essaie de trouver la
+ langue utilisée par le système d'exploitation. Si Vidalia se trompe ou si
+ vous préférez utiliser une langue différente, vous pouvez la choisir dans
+ la liste déroulante. Vous devez redémarrer Vidalia pour que la
+ modification prenne effet.
+ </li>
+ <li><b>Style</b>:
+ Dans la plupart des cas, Vidalia utilise par défaut le style de
+ l'interface de votre plateforme. Si ce choix vous déplaît, vous pouvez
+ utiliser n'importe quel autre style disponible dans la liste déroulante.
+ </li>
+</ul>
+
+<a name="advanced"/>
+<h3>Options avancées</h3>
+<p>
+Les options de la page <i>Avancé</i> ne doivent généralement être modifiées
+que par des utilisateurs expérimentés.
+</p>
+<ul>
+ <li><b>Adresse et port de contrôle</b>:
+ Le <i>Port de contrôle</i> est le port que Vidalia utilise pour
+ communiquer avec Tor. Il n'est pas nécessaire de le changer sauf si un
+ conflit existe avec un autre service ou si vous utilisez Vidalia pour
+ gérer et surveiller une instance de Tor fonctionnant sur un autre
+ ordinateur.
+ </li>
+ <li><b>Authentication du port de contrôle</b>:
+ L'authentication du port de contrôle permet de restreindre les
+ applications de votre ordinateur qui peuvent se connecter à votre
+ installation de Tor et la reconfigurer. Les modes d'authentication permis
+ sont les suivantes:
+
+ <ul>
+ <li>
+ <b>Aucun</b> -- Aucune authentification n'est nécessaire pour accéder
+ à votre installation de Tor. Ce choix est <b>fortement</b>
+ déconseillé. Toutes les applications et tous les utilisateurs de votre
+ ordinateur pourront reconfigurer votre installation de Tor.
+ </li>
+ <li>
+ <b>Mot de passe</b> <i>(Défaut)</i> -- Lorsque ce mode est
+ sélectionné, vous pouvez spécifier le mot de passe que Tor demandera
+ chaque fois qu'un utilisateur ou une application se connectera à son
+ port de contrôle. Si vous avez demandé à Vidalia de démarrer
+ automatiquement Tor, vous pouvez également lui demander de créer un
+ nouveau mot de passe aléatoire chaque fois en cochant la case
+ <i>défini aléatoirement</i>.
+ </li>
+ <li>
+ <b>Témoin (cookie)</b> -- Si le mode d'authentification par témoin est
+ sélectionné, Tor écrit un fichier témoin (ou <i>cookie</i>) contenant
+ des octets aléatoires provenant de son dossier de données lorsqu'il
+ démarre. Pour se connecter au port de contrôle de Tor, l'utilisateur
+ ou l'application doit être en mesure de fournir le contenu de ce
+ témoin.
+ </li>
+ </ul>
+ </li>
+ <li><b>Fichier de configuration de Tor</b> <i>(facultatif)</i>:
+ Cette option permet à Vidalia de démarrer Tor en utilisant un fichier de
+ configuration <i>torrc</i> spécifique. Si ce champ est vide, Tor utilisera
+ le fichier de configuration défini par défaut.
+ </li>
+ <li><b>Dossier des données de Tor</b> <i>(facultatif)</i>:
+ Vous pouvez spécifier le dossier que Tor utilisera pour enregistrer ses
+ données, par exemple les informations sur les relais Tor, les clés des
+ relais et les fichiers de configuration. Si vous laissez ce champ vide,
+ Tor utilisera le dossier configuré par défaut.
+ </li>
+ <li><b>Autorisations</b> <i>(facultatif, indisponible sur Windows)</i>:
+ Si vous entrez une valeur pour <b>Exécuter en tant qu'utilisateur</b>, Tor
+ s'identifiera avec ce nom en utilisant <i>setuid</i> lorsqu'il démarrera.
+ Si vous entrez une valeur pour <b>Exécuter en tant que groupe</b>, Tor
+ s'identifiera avec ce nom de groupe en utilisant <i>setgid</i> lorsqu'il
+ démarrera.
+ </li>
+</ul>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/contents.xml b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/contents.xml
new file mode 100644
index 0000000..73c7bbf
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/contents.xml
@@ -0,0 +1,62 @@
+<!--
+** $Id: contents.xml 2801 2008-06-26 14:21:51Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<Contents name="Aide Vidalia" html="index.html">
+ <Topic id="running" name="Utiliser Tor" html="running.html">
+ <Topic id="starting" name="Démarrer et arrêter Tor" html="running.html" section="starting"/>
+ <Topic id="monitoring" name="Surveiller l'état de Tor" html="running.html" section="monitoring"/>
+ </Topic>
+ <Topic id="log" name="Journal des messages" html="log.html">
+ <Topic id="basic" name="Informations de base" html="log.html" section="basic"/>
+ <Topic id="severities" name="Niveaux de gravité des messages" html="log.html" section="severities"/>
+ <Topic id="logfile" name="Enregistrer les messages dans un fichier" html="log.html" section="tofile"/>
+ </Topic>
+ <Topic id="netview" name="Aperçu du réseau Tor" html="netview.html">
+ <Topic id="overview" name="Présentation" html="netview.html" section="overview"/>
+ <Topic id="netmap" name="Carte du réseau" html="netview.html" section="netmap"/>
+ <Topic id="status" name="États des relais" html="netview.html" section="status"/>
+ <Topic id="details" name="Détails du relais" html="netview.html" section="details"/>
+ </Topic>
+ <Topic id="config" name="Configurer Vidalia et Tor" html="config.html">
+ <Topic id="general" name="Options générales" html="config.html" section="general"/>
+ <Topic id="network" name="Options de réseau" html="config.html" section="network"/>
+ <Topic id="server" name="Options du relais" html="config.html" section="server"/>
+ <Topic id="appearance" name="Options de l'interface" html="config.html" section="appearance"/>
+ <Topic id="advanced" name="Options avancées" html="config.html" section="advanced"/>
+ <Topic id="services" name="Services Cachés" html="config.html" section="services"/>
+ </Topic>
+ <Topic id="server" name="Installer un relais Tor" html="server.html">
+ <Topic id="basic" name="Paramétrage élémentaire" html="server.html" section="basic"/>
+ <Topic id="bandwidth" name="Limites de bande passante" html="server.html" section="bandwidth"/>
+ <Topic id="exitpolicy" name="Politiques de sortie" html="server.html" section="exitpolicy"/>
+ <Topic id="upnp" name="Transferts de Port" html="server.html" section="upnp"/>
+ </Topic>
+ <Topic id="bridges" name="Relais passerelles" html="bridges.html">
+ <Topic id="about" name="Que sont les relais passerelles ?" html="bridges.html" section="about"/>
+ <Topic id="finding" name="Comment puis-je trouver un relais passerelle ?" html="bridges.html" section="finding"/>
+ </Topic>
+ <Topic id="services" name="Services cachés" html="services.html">
+ <Topic id="about" name="Qu'est ce qu'un service caché ?" html="services.html" section="about"/>
+ <Topic id="provide" name="Comment proposer un service caché ?" html="services.html" section="provide"/>
+ <Topic id="data" name="Quelles sont les données que je dois fournir ?" html="services.html" section="data"/>
+ <Topic id="buttons" name="A quoi servent les cinq boutons ?" html="services.html" section="buttons"/>
+ <Topic id="advanced" name="Comment configurer les paramètres avancés des services cachés ?" html="services.html" section="advanced"/>
+ <Topic id="client" name="Est-ce que Vidalia m'aide à accéder aux autres services cachés ?" html="services.html" section="client"/>
+ </Topic>
+ <Topic id="troubleshooting" name="Dysfonctionnements" html="troubleshooting.html">
+ <Topic id="start" name="Je ne peux pas lancer Tor" html="troubleshooting.html" section="start"/>
+ <Topic id="connect" name="Vidalia ne peut se connecter à Tor" html="troubleshooting.html" section="connect"/>
+ <Topic id="torexited" name="Tor s'est terminé de manière inattendue" html="troubleshooting.html" section="torexited"/>
+ <Topic id="stop" name="Vidalia ne parvient pas à arrêter Tor" html="troubleshooting.html" section="stop"/>
+ </Topic>
+ <Topic id="links" name="Liens utiles" html="links.html"/>
+</Contents>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/index.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/index.html
new file mode 100644
index 0000000..3f1ee6f
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/index.html
@@ -0,0 +1,41 @@
+<!--
+** $Id: index.html 2801 2008-06-26 14:21:51Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Aide Vidalia</h1>
+<hr />
+
+<p>
+Choisissez un sujet dans l'arborescence de gauche ou cliquez sur le bouton
+Recherche situé au-dessus de la liste des sujets pour lancer une recherche
+dans l'ensemble de l'aide.
+</p>
+
+<p>
+Utilisez le bouton <i>Chercher</i> de la barre d'outils pour trouver un mot ou
+une expression dans la page en cours.
+</p>
+
+<p>
+Le bouton <i>Accueil</i> permet de revenir sur cette page.
+</p>
+
+<p>
+Visitez <a href="links.html">Liens utiles</a> pour avoir de l'aide et des
+informations complémentaires sur Vidalia et Tor.
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/links.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/links.html
new file mode 100644
index 0000000..4f580b9
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/links.html
@@ -0,0 +1,83 @@
+<!--
+** $Id: links.html 2801 2008-06-26 14:21:51Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Liens utiles</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Page d'accueil</td>
+ <td>
+ <a href="http://www.vidalia-project.net/">
+ http://www.vidalia-project.net/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki</td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki">
+ http://trac.vidalia-project.net/wiki</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Rapport de Bogues</td>
+ <td>
+ <a href="http://trac.vidalia-project.net/report">
+ http://trac.vidalia-project.net/report</a>
+ </td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Page d'accueil</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://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ">
+ https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki</td>
+ <td>
+ <a href="https://wiki.torproject.org/noreply/TheOnionRouter">
+ https://wiki.torproject.org/noreply/TheOnionRouter</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Rapport de Bogues</td>
+ <td>
+ <a href="https://bugs.torproject.org/flyspray/">
+ https://bugs.torproject.org/flyspray</a>
+ </td>
+</table>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/log.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/log.html
new file mode 100644
index 0000000..d43c77d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/log.html
@@ -0,0 +1,129 @@
+<!--
+** $Id: log.html 2801 2008-06-26 14:21:51Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Journal des messages</h1>
+<hr />
+
+Le Journal permet de suivre les informations d'état d'une instance de Tor en
+cours d'utilisation.
+
+<a name="basic"/>
+Chaque message est associé a un niveau de <i>gravité</i>, depuis <b>Erreur</b>
+(le plus sérieux) jusqu'à <b>Débogage</b> (le plus bavard). Consultez la
+section suivante sur la <a href="#severities">gravité des messages</a> pour
+davantage d'informations.
+
+<a name="severities"/>
+<h3>Niveaux de gravité des messages</h3>
+<p>
+Le niveau de gravité permet de connaître l'importance d'un message. Un message
+de gravité supérieure indique généralement qu'un problème est survenu avec
+Tor. Les messages de gravité inférieure sont fréquents durant les opérations
+normales de Tor et il est habituellement inutile de les enregistrer.
+</p>
+
+<p>
+Les niveaux de gravité sont les suivants, du plus au moins sévère:
+</p>
+<ul>
+ <li>
+ <b>Erreur</b> : Ces messages apparaissent lors des erreurs fatales,
+ lorsque Tor ne peut pas poursuivre. Ces messages sont surlignés en
+ <i>rouge</i> dans le Journal.
+ </li>
+ <li>
+ <b>Avertissement</b> : Ces messages s'affichent lorsque Tor rencontre
+ un problème qui ne l'empêche pas de continuer. Ils sont surlignés en
+ <i>jaune</i>.
+ </li>
+ <li>
+ <b>Signalement</b> : Ces messages apparaissent quelquefois lors des
+ opérations normales de Tor. Ils ne sont pas considérés comme des erreurs,
+ mais vous devez cependant y prêter attention.
+ </li>
+ <li>
+ <b>Information</b> : Ces messages renvoient aux opérations normales
+ de Tor et ne présentent généralement pas d'intérêt pour la plupart des
+ utilisateurs.
+ </li>
+ <li>
+ <b>Débogage</b> : Ces messages extrêmement complets sont avant tout
+ destinés aux développeurs. Vous ne devez généralement pas les afficher,
+ sauf si vous savez exactement ce que vous faîtes.
+ </li>
+</ul>
+
+<p>
+La majorité des utilisateurs doivent afficher seulement les messages
+d'<i>erreur</i>, d'<i>avertissement</i> et de <i>signalement</i>.
+</p>
+
+<p>
+Pour choisir les niveaux de gravité des messages que vous souhaitez afficher,
+vous devez suivre cette procédure :
+<ol>
+ <li>
+ Ouvrez le Journal des messages à partir du menu Vidalia situé dans la zone
+ de notification.
+ </li>
+ <li>
+ Cliquez <i>Options</i> en haut de la fenêtre du Journal.
+ </li>
+ <li>
+ Cochez les niveaux de gravité que vous souhaitez afficher dans la fenêtre
+ du Journal des messages et décochez les autres.
+ </li>
+ <li>
+ Cliquez <i>Enregistrer les options</i> pour utiliser votre nouveau filtre
+ des messages.
+ </li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Enregistrer les messages dans un fichier</h3>
+<p>
+Vidalia peut également enregistrer le Journal des messages dans un fichier en
+même temps qu'il les affiche dans la fenêtre du Journal. Pour permettre cet
+enregistrement, suivez ces étapes:
+</p>
+
+<ol>
+ <li>
+ Ouvrez le Journal des messages à partir du menu Vidalia situé dans la zone
+ de notification.
+ </li>
+ <li>
+ Cliquez <i>Options</i> en haut de la fenêtre du Journal.
+ </li>
+ <li>
+ Cochez la case intitulé <i>Enregistrer automatiquement les nouveaux
+ messages dans un fichier </i>.
+ </li>
+ <li>
+ Si vous voulez changer le fichier dans lequel les messages sont
+ enregistrés, entrez le chemin et le nom du fichier dans le champ ou
+ cliquez <i>Parcourir</i> pour naviguer jusqu'à votre fichier d'historique.
+ </li>
+ <li>
+ Cliquez <i>Enregistrer les options</i> pour sauvegarder le chemin du
+ Journal.
+ </li>
+</ol>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/netview.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/netview.html
new file mode 100644
index 0000000..ef5ba07
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/netview.html
@@ -0,0 +1,177 @@
+<!--
+** $Id: netview.html 2801 2008-06-26 14:21:51Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Aperçu du réseau Tor</h1>
+<hr />
+
+<p>
+L'aperçu du réseau Tor permet de connaître les relais du réseau Tor et de
+suivre ses propres données.
+</p>
+
+<a name="overview"/>
+<h3>Présentation</h3>
+<p>
+Lorsque vous voulez communiquer anonymement à travers le réseau Tor, par
+exemple pour vous connecter à un site Web, Tor crée un tunnel (ou un
+<i>circuit</i>) de connexions chiffrées à travers une série de relais
+appartenant au réseau Tor. Le trafic de votre application est alors envoyé
+comme un <i>flux</i> au travers de ce circuit. Pour améliorer l'efficience du
+réseau Tor, de multiples flux peuvent partager le même circuit.
+</p>
+
+<a name="netmap"/>
+<h3>Carte du réseau</h3>
+<p>
+La carte du réseau est une mappemonde sur laquelle des points rouges indiquent
+la localisation géographique des relais du réseau Tor. Les lignes vertes
+tracées entre certains relais correspondent aux circuits que votre client Tor
+a créé dans le réseau Tor.
+</p>
+<p>
+Vous pouvez augmenter ou diminuer l'échelle de la carte en cliquant sur les
+boutons <b>Rapprocher</b> et <b>Éloigner</b> de la barre d'outils. Vous pouvez
+également faire défiler la carte en la cliquant et en bougeant la souris dans
+la direction que vous souhaitez.
+</p>
+<p>
+La localisation géographique d'un relais Tor est déterminée en envoyant son
+adresse IP dans la base de données GeoIP créée by MaxMind et localisée sur le
+serveur geoip.vidalia-project.net.
+</p>
+<p>
+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
+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
+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.
+</p>
+
+
+<a name="status"/>
+<h3>États des relais</h3>
+<p>
+À gauche de la mappemonde est affichée la liste des relais du réseau Tor.
+L'état de chaque relais est indiqué par une icône. La table suivante donne le
+sens des différentes icônes.
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+ <td valign="middle">
+ Le relais est hors ligne ou ne répond pas.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+ <td valign="middle">
+ 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.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+ <td valign="middle">
+ Le relais est en ligne, mais il supporte seulement un trafic minimal.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+ <td valign="middle">
+ Le relais est en ligne et supporte un trafic >= 20 Ko/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+ <td valign="middle">
+ Le relais est en ligne et supporte un trafic >= 60 Ko/s.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+ <td valign="middle">
+ Le relais est en ligne et supporte un trafic >= 400 Ko/s.
+ </td>
+</tr>
+</table>
+</p>
+
+<p>
+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.
+</p>
+
+
+<a name="details"/>
+<h3>Détails du relais</h3>
+<p>
+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.
+</p>
+<p>
+Les informations affichées dans ce panneau sont les suivantes
+(<i>Note</i> : certains champs ne sont pas forcément affichés) :
+</p>
+<p>
+<table>
+<tr>
+ <td><b>Localisation</b></td>
+ <td>Localisation géographique de ce relais Tor.</td>
+</tr>
+<tr>
+ <td><b>Adresse IP</b></td>
+ <td>Adresse IP par laquelle ce relais Tor peut être atteint.</td>
+</tr>
+<tr>
+ <td><b>Plateforme</b></td>
+ <td>
+ Informations sur le système d'exploitation et sur la version de Tor
+ utilisés par le relais.
+ </td>
+</tr>
+<tr>
+ <td><b>Bande passante</b></td>
+ <td>
+ Niveau maximal de bande passante que le relais Tor a supporté récemment,
+ estimé par les relais de l'annuaire.
+ </td>
+</tr>
+<tr>
+<td><b>Durée de fonctionnement</b></td>
+ <td>
+ Durée pendant laquelle le relais a été disponible, ce qui est utile pour
+ en évaluer la stabilité.
+ </td>
+</tr>
+<tr>
+ <td><b>Dernière mise à jour</b></td>
+ <td>Date à laquelle les informations sur ce relais ont été mises à jour.</td>
+</tr>
+</table>
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/running.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/running.html
new file mode 100644
index 0000000..485d910
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/running.html
@@ -0,0 +1,106 @@
+<!--
+** $Id: running.html 2801 2008-06-26 14:21:51Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Utiliser Tor</h1>
+<hr />
+
+<p>
+Vidalia facilite le contrôle de votre instance Tor en permettant aussi bien
+son démarrage et son arrêt que la surveillance de son état et l'analyse des
+causes d'un éventuel arrêt impromptu.
+</p>
+
+<a name="starting"/>
+<h3>Démarrer et arrêter Tor</h3>
+<p>
+Pour <i>lancer</i> Tor, sélectionnez <i>Démarrer</i> dans le menu de Vidalia
+situé dans la zone de notification ou appuyez sur <i>Ctrl+S</i>. L'icône de
+Vidalia de la zone de notification change lorsque Tor démarre : l'oignon
+barré par un X rouge est remplacée par un oignon vert.
+</p>
+
+<p>
+Si Vidalia ne parvient pas à démarrer Tor, il affiche un message d'erreur pour
+indiquer qu'un problème est survenu. Vous pouvez également consulter le <a
+href="log.html">Journal des messages</a> pour voir si Tor n'a pas donné
+d'autres informations sur le problème.
+</p>
+
+<p>
+Pour <i>arrêter</i> Tor, sélectionnez <i>Arrêter</i> dans le menu de Vidalia
+situé dans la zone de notification ou appuyez sur <i>Ctrl+T</i>. L'icône de
+Vidalia de la zone de notification change lorsque Tor s'arrête : l'oignon
+vert est remplacé par un oignon barré par un X rouge.
+</p>
+
+<p>
+Si Vidalia ne parvient pas à arrêter Tor, il affiche un message d'erreur pour
+indiquer qu'un problème est survenu. Vous pouvez également consulter le <a
+href="log.html">Journal des messages</a> pour voir si Tor n'a pas donné
+d'autres informations sur le problème.
+</p>
+
+<a name="monitoring"/>
+<h3>Surveiller l'état de Tor</h3>
+<p>
+Vidalia indique l'état de Tor par le biais d'une icône située dans la zone de
+notification ou dans la barre des tâches. Le tableau suivant précise la
+correspondance entre cette icône et l'état de Tor.
+</p>
+
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+ <td valign="middle">
+ Tor est arrêté. Sélectionnez <i>Démarrer</i> dans le menu de Vidalia pour
+ lancer Tor.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+ <td valign="middle">
+ Tor est en cours d'initialisation. Vous pouvez consulter le <a
+ href="log.html">Journal des messages</a> pour connaître les informations
+ sur l'état de Tor lorsqu'il démarre.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+ <td valign="middle">
+ Tor est en cours de fonctionnement. Si vous voulez savoir ce qu'il fait,
+ vous pouvez consultez le <a href="log.html">Journal des messages</a> que
+ Tor envoie à Vidalia. Si vous voulez arrêter Tor, sélectionnez
+ <i>Arrêter</i> dans le menu de Vidalia.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+ <td valign="middle">Tor est en cours d'arrêt.</td>
+</tr>
+</table>
+</p>
+
+<p>
+Si Tor s'arrête de manière inattendue, Vidalia affiche l'icône de l'oignon
+noir barré d'un X rouge et montre un message d'erreur pour vous signaler le
+problème. Vous pouvez également consulter le <a href="log.html">Journal des
+messages</a> pour avoir davantage de details sur les problèmes rencontrés par
+Tor avant de se terminer.
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/server.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/server.html
new file mode 100644
index 0000000..f10dfef
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/server.html
@@ -0,0 +1,267 @@
+<!--
+** $Id: server.html 4241 2010-03-16 18:54:19Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Installer un relais Tor</h1>
+<hr />
+Le réseau Tor est constitué par des bénévoles du monde entier qui donnent une
+partie de leur bande passante perdue en installant un relais Tor. Vidalia vous
+aide à participer au réseau Tor en facilitant l'installation de votre propre
+relais.
+
+<a name="basic"/>
+<h3>Options de base</h3>
+<p>
+Si vous décidez de participer à la croissance du réseau Tor en installant un
+relais, vous pouvez suivre la procédure suivante.
+</p>
+<ol>
+ <li>
+ Ouvrez la <i>fenêtre de configuration</i> en sélectionnant <i>Options</i>
+ dans le menu de la zone de notification ou <i>Préférences</i> dans la
+ barre de menu système pour les systèmes Macintosh.
+ </li>
+ <li>Sélectionnez la page de configuration <i>Relais</i>.</li>
+ <li>
+ Précisez si vous souhaitez installer un relais Tor normal ou un relais
+ <i>passerelle</i> (Tor 0.2.0.8-alpha ou plus récent). Une passerelle
+ permet d'aider les utilisateurs de Tor bloqués par la censure et qui ne
+ peuvent pas accéder directement au réseau Tor. Cochez la case <i>Relayer
+ le trafic pour le réseau Tor</i> si vous voulez installer un relais Tor
+ normal ou <i>Aider les utilisateurs censurés à accéder au réseau Tor</i>
+ si vous voulez installer un relais passerelle.
+ </li>
+ <li>Indiquez les informations suivantes:
+ <ul>
+ <li><b>Surnom (nickname)</b>:
+ Le nom qui permettra à votre relais d'être connu sur le réseau Tor. Il
+ s'agit par exemple de "MonRelaisVidalia".
+ </li>
+ <li><b>Information de contact</b>:
+ Votre adresse électronique. Cette adresse sera utilisée seulement pour
+ vous signaler une mise à jour de sécurité importante ou un problème avec
+ votre relais. Vous pouvez également préciser votre identifiant PGP ou
+ GPG et votre empreinte.
+ </li>
+ <li><b>Port du relais</b>:
+ Le port par lequel votre relais écoutera le trafic de clients ou
+ d'autres relais Tor.
+ </li>
+ </ul>
+ <li>
+ Si vous voulez également installer un miroir de l'annuaire Tor des relais,
+ cochez la case <i>Servir de miroir à l'annuaire des relais</i>. Si vous
+ disposez d'une bande passante limitée, décochez cette case. Si vous
+ décidez malgré tout d'installer un miroir de l'annuaire, assurez-vous que
+ le <i>port de l'annuaire</i> est différent du <i>port du relais</i> que
+ vous avez indiquez plus haut. Les passerelles <i>doivent</i> avoir un
+ miroir de l'annuaire des relais.
+ </li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Limites de la bande passante</h3>
+<p>
+Un relais Tor peut consommer une grande quantité de bande passante. C'est la
+raison pour laquelle Tor vous permet de préciser le niveau de bande passante
+que vous souhaitez accorder au réseau Tor. Cela vous permet de faire
+fonctionner un relais Tor tout en conservant une connexion suffisante pour
+votre propre usage.
+</p>
+
+<p>
+Vous devez sélectionner dans la liste déroulante l'option qui correspond le
+mieux au débit de votre connexion. Si vous choisissez <i>Personnalisé</i>,
+vous pourrez paramétrer vous-mêmes les seuils.
+</p>
+
+<h4>Limites personnalisées</h4>
+<p>
+Le <i>débit maximal</i> correspond au nombre d'octets utilisables pour répondre
+aux requêtes pendant les courtes périodes où le trafic est supérieur au
+<i>débit moyen</i> que vous avez spécifié, mais qui permet de respecter la
+moyenne sur une longue période. Un débit moyen bas et un débit maximal élevé
+améliorent le niveau de trafic à long terme en autorisant davantage de trafic
+lors des pics, tant que le débit moyen n'a pas été atteint. Si votre débit moyen
+est identique à votre <i>débit maximal</i>, alors Tor ne dépassera jamais ce
+débit. Le <i>débit maximal</i> doit toujours être supérieur ou égal au <i>débit
+moyen</i>.
+</p>
+
+<p>
+Le <i>débit moyen</i> correspond à la bande passante moyenne maximale autorisée
+à long terme (en kilo-octets par seconde). Par exemple, vous pouvez choisir de
+contribuer au réseau Tor pour 2 méga-octets par seconde (2048 Kio/s) ou 50
+kilo-octets par seconde (soit une connexion moyenne par cable). Tor a besoin
+au minimum de 20 kilo-octets par seconde pour faire fonctionner un relais.
+</p>
+
+<p>
+Il est important de se rappeler que Tor mesure la bande passante en
+<b>octets</b> et non en bits. En outre, Tor comptabilise les octets entrants
+et non les octets sortants. De ce fait, si votre relais est également un
+miroir de l'annuaire des relais, vous enverrez davantage de données que vous
+n'en recevrez. Si vous constatez que cela constitue une contrainte trop forte
+pour votre bande passante, vous devrez penser à décocher la case <i>Servir
+de miroir à l'annuaire des relais</i>.
+</p>
+
+<a name="exitpolicy"/>
+<h3>Politiques de sortie</h3>
+<p>
+Les politiques de sortie vous permettent de spécifier les ressources Internet
+auxquelles les utilisateurs du réseau Tor peuvent accéder par le biais de
+votre relais. Par défaut, Tor utilise une liste de politiques de sortie qui
+empêche l'utisation de certains services, notamment l'envoi de courriels (afin
+d'éviter les spams) et certains ports de partage de fichiers (afin de réduire
+l'usage abusif du réseau Tor).
+</p>
+
+<p>
+Chaque case représente un type de ressources. Vous pouvez permettre ou refuser
+aux utilisateurs de Tor de passer par votre relais pour y accéder. Si vous
+décocher une case, les utilisateurs de Tor ne seront pas autorisés à accéder à
+la ressource correspondante à travers votre relais. Si la case <i>Autres
+services</i> est cochée, les utilisateurs de Tor pourront accéder aux services
+non couverts par les autres cases à cocher ou par la politique de sortie par
+défaut de Tor.
+</p>
+
+<p>
+Pour information, le tableau suivant liste les numéros de ports des politiques
+de sortie. La colonne <b>Description</b> signale les ressources auxquelles les
+clients Tor pourront accéder à travers votre relais, si la case correspondante
+est coché.
+</p>
+
+<table border="1">
+<tr>
+ <td><b>Case à cocher</b></td>
+ <td><b>Ports</b></td>
+ <td><b>Description</b></td>
+</tr>
+<tr>
+ <td>Sites web</td>
+ <td valign="middle">80</td>
+ <td>Normal, navigation web non chiffrée</td>
+</tr>
+<tr>
+ <td>Sites web sécurisés (SSL)</td>
+ <td valign="middle">443</td>
+ <td>Accès aux sites web sécurisés</td>
+</tr>
+<tr>
+ <td>Téléchargement des courriels (POP, IMAP)</td>
+ <td valign="middle">110, 143, 993, 995</td>
+ <td>Téléchargement des courriels (ne permet pas d'en envoyer)</td>
+</tr>
+<tr>
+ <td>Messagerie instantanée (IM)</td>
+ <td valign="middle">703, 1863, 5050, 5190, 5222, 5223, 8300, 8888</td>
+ <td>
+ Applications de messageries instantanées telles que Jabber, MSN
+ Messenger, AIM et ICQ
+ </td>
+</tr>
+<tr>
+ <td>Chat (IRC)</td>
+ <td valign="middle">6660-6669, 6697, 7000-7001</td>
+ <td>Clients et serveurs IRC</td>
+</tr>
+<tr>
+ <td>Autres services</td>
+ <td valign="middle">*</td>
+ <td>
+ Toutes les autres applications non couvertes par les précédentes cases à
+ cocher
+ </td>
+</tr>
+</table>
+
+<p>
+Si vous ne voulez pas autoriser les utilisateurs de Tor à sortir du réseau par
+votre relais, vous pouvez décocher toutes les cases. Même dans ce cas, votre
+relais est utile pour le réseau Tor, car il permet encore aux utilisateurs de
+s'y connecter. Il permet également de relayer du trafic entre les autres
+relais Tor.
+</p>
+
+<p>
+Si vous choisissez d'installer un relais passerelle, l'onglet des
+<i>Politiques de sortie</i> sera grisé et inacessible, puisque une passerelle
+n'autorise pas les sorties : elle sert uniquement à se connecter au
+réseau Tor.
+</p>
+
+<a name="upnp"/>
+<h3>Transfert de Ports</h3>
+<p>
+De nombreux utilisateurs se connectent à Internet par un <i>routeur</i>, qui
+permet plusieurs ordinateurs sur un réseau local de partager la même connexion
+Internet. Certains utilisateurs peuvent également être derrière un
+<i>pare-feu</i> qui bloque les connexions à votre ordinateur à partir d'autres
+ordinateurs d'Internet. Si vous voulez, toutefois, opérer un relais Tor,
+d'autres clients et relais Tor doivent être en mesure de se connecter à votre
+relais à travers votre routeur ou votre pare-feu.
+</p>
+
+<p>
+Pour rendre votre relais publiquement accessible, votre routeur ou pare-feu
+doit savoir quels ports autoriser pour votre ordinateur, la mise en place est
+connu sous le nom de <i> transfert de ports </i>. Le transfert de ports
+configure votre routeur ou pare-feu pour "rediriger" toutes les connexions de
+certains ports de votre routeur ou pare-feu locaux vers les ports ouverts
+correspondants de votre ordinateur.
+</p>
+
+<p>
+Si vous cochez la case <i>Tenter de configurer automatiquement le transfert de
+ports</ i>, Vidalia tentera de mettre en place automatiquement le transfert de
+port sur votre connexion réseau pour que les autres Tor clients puissent se
+connecter à votre relais. Mais, tous les routeurs ne supportent pas le
+transfert automatique de ports. Vous pouvez utiliser le bouton<i>Test</i> à
+côté de la case à cocher pour savoir si Vidalia est en mesure de mettre en
+place automatiquement le transfert de port pour vous.
+</p>
+
+<p>
+Si le <i>Test</i> estime que Vidalia n'est pas en mesure de mettre en place le
+transfert de port pour vous, vous pouvez activer cette fonctionalité sur
+votre routeur ou paramétrer la redirection de port manuellement. Certains
+périphériques réseau ont une fonction appelée <i>Universal Plug-and-Play</i>
+(UPnP). Si vous pouvez accéder à votre routeur interface d'administration,
+vous devriez chercher à activer une option UPnP. Le interface d'administration
+de la plupart des routeurs peut être accessible en ouvrant <a
+href="http://192.168.0.1/">http://192.168.0.1</a> ou <a
+href="http://192.168.1.1/">http://192.168.1.1</a> dans votre navigateur. Vous
+devriez consulter le manuel d'instruction de votre routeur pour de plus amples
+informations.
+</p>
+
+<p>
+Si vous devez configurer manuellement le transfert de port, le site <a href =
+"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm">
+portforward.com </a> contient des instructions sur la manière de mettre en
+place la redirection de port pour de nombreux types de routeurs et pare-feu.
+Au minimum, vous aurez besoin de transférer <i>votre Port Relais</i>, qui par
+défaut est le port 443 sur Windows et 9001 sur tous les autres systèmes
+d'exploitation. Si vous avez aussi coché la case <i>Servir de miroir à
+l'annuaire des relais</i>, vous devrez également trasferrer votre <i> Port
+Annuaire</ i>. Le <i> Port Annuaire</ i> est le port 9030 par défaut sur tous
+les les systèmes d'exploitation.
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/services.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/services.html
new file mode 100644
index 0000000..6e0f617
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/services.html
@@ -0,0 +1,164 @@
+<!--
+** $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.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.
+-->
+
+<html>
+<body>
+
+<h1>Les Services Cachés</h1>
+<hr />
+
+Attention: Le support des services cachés est neuf sur Vidalia. Vous pouvez
+vous attendre à avoir des bogues et dans certains cas des corruption de votre
+configuration des services cachées. Donc, ne comptez pas sur cette
+fonctionnalité, ou plutôt, ne pas nous blâmez pas si quelque chose ne va pas.
+Si vous trouvez des bogues ou vous avez des commentaires sur cette nouvelle
+fonctionnalité, merci de nous le faire savoir! Nous avons besoin de vos
+commentaires.
+
+<a name="about"/>
+<h3>Qu'est ce qu'un service caché ?</h3>
+<p>
+Les services cachés vous permettent de fournir n'importe quel type de service
+TCP, par exemple un service HTTP, à des tiers sans révéler votre adresse IP.
+Le protocole de fournir un service caché est construit pour utiliser les mêmes
+circuits que Tor utilise pour la navigation anonyme et a à peu près les mêmes
+caractéristiques d'anonymat.
+</p>
+
+<p>
+Pour plus d'information sur les services cachés vous pouvez vouloir lirela
+partie 5 de la spécification technique de Tor
+(doc/design-paper/tor-design.pdf) ou la spécification de Rendez-Vous
+(doc/spec/rend-spec.txt).
+</p>
+
+<a name="provide"/>
+<h3>Comment proposer un service caché ?</h3>
+<p>
+Fournir un service caché se fait en au moins deux étapes:
+<ol>
+ <li>Installer un serveur web local (ou un serveur pour le quelconque service
+ si vous souhaitez offrir, par ex IRC) pour écouter les requêtes
+ locales.</li>
+
+ <li>Configurez votre service caché, de sorte que Tor relaie les requêtes
+ entrantes des utilisateurs de Tor vers votre serveur local</li>
+</ol>
+
+Il y a un bon tutoriel sur le site web de Tor
+(https://www.torproject.org/docs/tor-hidden-service.html) qui décrit
+ces étapes plus en détails.
+</p>
+
+<a name="data"/>
+<h3>Quelles sont les données que je dois fournir ?</h3>
+<p>
+La table des services comporte cinq colonnes contenant les données sur les
+services cachés configurés:
+
+<ul>
+
+ <li>Addresse Oignon(générée): L'adresse du service (ou adresse oignon) est
+ créée par Tor pour identifier de manière unique votre service. Donnez cette
+ adresse au personnes qui doivent accèder à votre service. Vous pouvez
+ utiliser le bouton "Copier dans le presse-papiers" pour eviter les erreur de
+ saisie.Si vous avez juste créé, le champ affiche "[Créé par Tor]"; afin de
+ lui faire afficher l'adresse oignon réelle, vous devez sauver votre
+ configuration et réouvrir la fenêtre des paramètres.</li>
+
+ <li>Port Virtuel(obligatoire): C'est le port TCP que les clients auront
+ besoin à savoir pour avoir accès à votre service. En règle générale, vous
+ voudrez utiliser le port de servicespécifique, par ex port 80 pour HTTP.
+ Notez que le port virtuel a généralement rien à voir avec les paramètres de
+ pare-feu, car il n'est utilisé que par Tor de manière locale.</li>
+
+ <li>Destination (facultatif): Pratique si vous souhaitez que Tor relaie les
+ demandes de connexion locale sur un port différent que celui que vous avez
+ indiqué dans "Port virtuel". Par conséquent, vous pouvez spécifier une cible
+ composée de adresse physique et le port où les demandes de votre service
+ caché sont redirigés, par ex à localhost:5222 (ou sur n'importe quel port
+ votre serveur est à l'écoute). Si vous ne spécifiez pas aucune cible, Tor va
+ rediriger les demandes vers le port spécifié dans "port virtuel" de votre
+ machine locale (localhost).</li>
+
+ <li>Répertoire du Service (obligatoire): Tor a besoin pour de stocker
+ certains fichiers des services cachés dans un répertoire séparé, par ex la
+ clé privée et le fichier nom d'hôte contenant l'adresse oignon. Ce
+ répertoire devrait être doit être distinct du répertoire contenant le
+ contenu du service fourni. Une bonne chose ce peut être un service de
+ répertoire ce peut être un sous répertoire du répertoire Tor de données. --
+ Notez que vous ne pouvez pas changer le répertoire d'un service actif (cela
+ n'aurait pas beaucoup de sens de permettre cela, car Vidalia n'est pas censé
+ déplacer les répertoires sur votre disque dur !). Si vous souhaitez déplacer
+ un service caché dans un autre répertoire, merci de procéder comme suit:
+ Commencez par désactiver le service dans Vidalia et sauver la configuration.
+ Puis déplacez le répertoire de votre disque dur au nouveau endroit. Enfin,
+ changez le répertoire dans Vidalia vers le nouvel emplacement, activez à
+ nouveau le service, et enregistrez la nouvelle configuration.</li>
+
+ <li>Activé: Si cette case à cocher est désactivée, Vidalia ne configurera
+ pas le service caché correspondant dans Tor. Cela peut être utile pour
+ garder une configuration d'un service non utilisée actuellement pour une
+ utilisation ultérieure. Tous services inactives sont stockées dans le
+ fichier de configuration spécifique de Vidalia vidalia.conf.</li>
+</ul>
+</p>
+
+<a name="buttons"/>
+<h3>A quoi servent les cinq boutons ?</h3>
+<p>
+<ul>
+ <li>Ajouter un service: Crée une nouvelle configuration de services.</li>
+
+ <li>Supprimer un service: Supprime de façon permanente une configuration de
+ service caché. (Si vous voulez temporairement retirer un service, décochez
+ sa case Activé.)</li>
+
+ <li>Copie dans le presse-papier: Copie l'adresse oignon dans le
+ presse-papiers, de sorte que vous puissiez l'annoncer à tous ceux qui
+ doivent être en mesure d'utiliser votre service.</li>
+
+ <li>Parcourir: Vous permet de naviguer pour trouver un répertoure de service
+ caché.</li>
+</ul>
+</p>
+
+<a name="advanced"/>
+<h3>Comment configurer les paramètres avancés des services cachés ?</h3>
+<p>
+Tor permet la configuration des paramètres plus spécifiques pour les services
+cachés, par ex forçer à utiliser (ou éviter), certains noeuds comme des points
+d'introduction, ou Fournir de multiples ports virtuels pour le même service.
+</p>
+
+<p>
+Toutefois, nous avons décidé de simplifier les choses dans Vidalia et de
+fournir seulement les paramètres les plus communs. Si vous voulez configurer
+les paramètres avancés, vous devez le faire Tor dans le fichier torrc. Vidalia
+ne supprimera pas ces paramètres, même lorsque vous modifiez vos services
+cachés. Si vous spécifier plus d'un port virtuel port, seule le premièr sera
+affiché et sera modifiable.
+</p>
+
+<a name="client"/>
+<h3>Est ce que Vidalia m'aide à accéder aux autres services cachés ?</h3>
+<p>
+Pas du tout. Il n'est pas nécessaire de faire quelque chose. Si vous voulez
+accéder à un autre service caché , tapez l'adresse onion du service dans votre
+navigateur (ou dans le client approprié si ce n'est pas un service web), et
+Tor fait le reste pour vous. Il n'est pas nécessaire de configurer Tor
+spécifiquement pour cela.
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/troubleshooting.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/troubleshooting.html
new file mode 100644
index 0000000..a8a0558
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/fr/troubleshooting.html
@@ -0,0 +1,111 @@
+<!--
+** $Id: troubleshooting.html 2801 2008-06-26 14:21:51Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Dysfonctionnements</h1>
+<hr />
+
+Les problèmes listés ci-dessous sont ceux que les utilisateurs rencontrent le
+plus souvent. Si vous ne trouvez pas la réponse à votre question, alors vous
+pouvez vérifier sur <a
+href="http://www.vidalia-project.net">www.vidalia-project.net</a> pour de
+l'aide et des informations complémentaires.
+
+<a name="start"/>
+<h3>Je ne peux pas démarrer Tor</h3>
+<p>
+Le plus souvent, Vidalia ne parvient pas à démarrer Tor parce qu'il cherche
+l'installation de Tor dans le mauvais dossier. Vous pouvez indiquer à Vidalia
+l'emplacement de Tor en mettant à jour l'option <i>Application Tor</i> dans la
+<a href="config.html#general">fenêtre de configuration générale</a>.
+</p>
+
+<p>
+Une autre raison du non-démarrage de Tor est qu'une autre instance de Tor est
+déjà en cours d'exécution. Vérifiez la liste de vos applications et services
+en cours de fonctionnement et arrêtez le cas échéant l'instance Tor. Ensuite,
+vous pouvez essayer de lancer Tor à nouveau.
+</p>
+
+<p>
+Si cette solution ne vous aide pas, consultez votre <a href="log.html">Journal
+des messages</a> pour vérifier si Tor n'a pas signalé les erreurs qu'il a
+rencontrées en essayant de démarrer.
+</p>
+
+<a name="connect"/>
+<h3>Vidalia ne parvient pas à se connecter à Tor</h3>
+<p>
+Vidalia gère Tor en communiquant par le biais de son <i>port de contrôle</i>.
+</p>
+
+<p>
+Le plus souvent, Vidalia ne parvient pas à se connecter à Tor parce que Tor a
+démarré, mais a rencontré uen erreur et s'est terminé immédiatement. Vous
+devez consulter le <a href="log.html">Journal des messages</a> pour vérifier
+si Tor a signalé une erreur lorsqu'il a démarré.
+</p>
+
+<p>
+Si Tor écoute un port différent de celui qu'utilise Vidalia, alors celui-ci ne
+peut pas se connecter à celui-là. Il est rarement utile de changer ce
+paramètre, mais si un service de votre ordinateur entre en conflit avec le
+port de contrôle de Tor, alors vous devez spécifier un port différent. Vous
+pouvez changer ce paramètre dans le panneau de <a
+href="config.html#advanced">configuration avancée</a> de Vidalia.
+</p>
+
+<a name="torexited"/>
+<h3>Tor s'est terminé de manière inattendue</h3>
+<p>
+Si Tor se termine immédiatement après avoir essayé de démarrer, il est très
+probable qu'une autre instance de Tor fonctionne déjà. Cherchez dans le <a
+href="log.html">Journal des messages</a> si l'un des derniers messages est
+surligné en jaune et contient un message tel que:
+</p>
+
+<pre>
+ connection_create_listener(): Could not bind to 127.0.0.1:9050: Address
+ already in use. Is Tor already running?
+</pre>
+
+<p>
+Si vous trouvez un message de ce type, vous devez arrêter l'instance en cours
+de Tor avant d'en démarrer une nouvelle avec Vidalia. Sur Windows, vous pouvez
+chercher <i>tor.exe</i> dans le gestionnaire des tâches. Sur la plupart des
+autres systèmes d'exploitation, la commande <i>ps</i> peut vous aider à
+trouver l'instance de Tor en cours.
+</p>
+
+<p>
+Si Tor a fonctionné correctement pendant plus de quelques secondes, alors vous
+pouvez chercher dans le <a href="log.html">Journal des messages</a> des
+informations sur les erreurs que Tor a rencontrées avant de se terminer. Ces
+erreurs sont surlignées en rouge ou en jaune.
+</p>
+
+<a name="stop"/>
+<h3>Vidalia ne parvient pas à arrêter Tor</h3>
+
+<p>
+Si Vidalia ne peut pas arrêter Tor, vous devez consulter votre <a
+href="log.html">Journal des messages</a> pour vérifier si Tor a signalé des
+erreurs en essayant de se terminer.
+</p>
+
+</body>
+</html>
+
+
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/bridges.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/bridges.html
new file mode 100644
index 0000000..765b52e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/bridges.html
@@ -0,0 +1,71 @@
+<!--
+** $Id: bridges.html 2392 2008-03-04 05:38:56Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<!--
+ en: 2243
+-->
+
+<html>
+<body>
+
+<h1>Bridge серверы</h1>
+<hr />
+
+<a name="about"/>
+<h3>Что такое bridge-серверы?</h3>
+<p>
+Bridge-серверы это серверы Tor которые не перечислены в главном каталоге.
+Так как полного публичного списка этих серверов не существует, то
+даже если ваш интернет-провайдер будет фильтровать все соединения к известным
+серверам Tor, он не сможет заблокировать доступ ко всем bridge-серверам.
+</p>
+
+<a name="finding"/>
+<h3>Как мне найти bridge-сервер?</h3>
+<p>
+Существует два основных способа узнать адрес bridge-сервера:
+<ol>
+ <li>Попросить друзей запустить приватный bridge-сервер специально для вас</li>
+ <li>Использовать некоторые из публичных bridge'ей</li>
+</ol>
+</p>
+
+<p>
+Чтобы использовать приватный bridge, попросите ваших друзей запустить Vidalia
+и Tor в свободной от цензуры зоне Интернете и кликнуть
+<i>Помочь заблокированным пользователям</i> на странице
+<a href="server.html">настроек сервера</a> в Vidalia. После этого они должны
+безопасным образом сообщить вам адрес своего bridge'а (указан в самом низу
+страницы настроек сервера). В отличие от обычного сервера bridge передаёт данные
+только в сеть Tor и обратно, поэтому оператор подвергается меньшему риску попасть
+в "чёрный список".
+</p>
+
+<p>
+Адреса публичных bridge-серверов можно узнать посетив
+<b>https://bridges.torproject.org</b>.
+Адреса на этой странице будут меняться каждые несколько дней, так что
+наведывайтесь периодически если вам понадобится больше bridge-адресов. Ещё
+один способ получить адрес bridge'а - отправить письмо на
+<b>bridges at torproject.org</b> с единственной строкой <b>get bridges</b>
+в теле письма. Но, для того чтобы атакующему было сложнее узнать много адресов,
+вы должны использовать почтовыя ящик на Gmail или Yahoo! для таких писем.
+</p>
+
+<p>
+Указав несколько bridge-серверов вы повысите надёжность своего соединения даже
+если некоторые из серверов отключатся.
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/config.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/config.html
new file mode 100644
index 0000000..55c4e8a
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/config.html
@@ -0,0 +1,193 @@
+<!--
+** $Id: config.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<!--
+ en: 2325
+-->
+
+<html>
+<body>
+
+<h1>Настройка Vidalia и Tor</h1>
+<hr />
+
+<p>
+С помощью Vidalia вы можете настроить некоторые из наиболее часто изменяемых
+параметров работы Vidalia и Tor. Также вы сможете запустить и настроить
+<a href="server.html">сервер Tor</a> тем самым увеличивая сеть Tor.
+</p>
+
+<a name="general"/>
+<h3>Общие настройки</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>
+
+</body>
+</html>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/contents.xml b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/contents.xml
new file mode 100644
index 0000000..9d5f115
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/contents.xml
@@ -0,0 +1,56 @@
+<!--
+** $Id: contents.xml 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<!--
+ en: 2227
+-->
+
+<Contents name="Справка Vidalia" html="index.html">
+ <Topic id="running" name="Running Tor" html="running.html">
+ <Topic id="starting" name="Starting and Stopping Tor" html="running.html" section="starting"/>
+ <Topic id="monitoring" name="Monitoring Tor's Status" html="running.html" section="monitoring"/>
+ </Topic>
+ <Topic id="log" name="Message Log" html="log.html">
+ <Topic id="basic" name="Basic Information" html="log.html" section="basic"/>
+ <Topic id="severities" name="Message Severities" html="log.html" section="severities"/>
+ <Topic id="logfile" name="Logging to a File" html="log.html" section="tofile"/>
+ </Topic>
+ <Topic id="netview" name="Network Viewer" html="netview.html">
+ <Topic id="overview" name="Overview" html="netview.html" section="overview"/>
+ <Topic id="netmap" name="Network Map" html="netview.html" section="netmap"/>
+ <Topic id="status" name="Relay Status" html="netview.html" section="status"/>
+ <Topic id="details" name="Relay Details" html="netview.html" section="details"/>
+ </Topic>
+ <Topic id="config" name="Configuring Tor" html="config.html">
+ <Topic id="general" name="General Settings" html="config.html" section="general"/>
+ <Topic id="network" name="Network Settings" html="config.html" section="network"/>
+ <Topic id="server" name="Relay Settings" html="config.html" section="server"/>
+ <Topic id="appearance" name="Appearance Settings" html="config.html" section="appearance"/>
+ <Topic id="advanced" name="Advanced Settings" html="config.html" section="advanced"/>
+ </Topic>
+ <Topic id="server" name="Setting Up a Tor Relay" html="server.html">
+ <Topic id="basic" name="Basic Setup" html="server.html" section="basic"/>
+ <Topic id="bandwidth" name="Bandwidth Limits" html="server.html" section="bandwidth"/>
+ <Topic id="exitpolicy" name="Exit Policies" html="server.html" section="exitpolicy"/>
+ </Topic>
+ <Topic id="bridges" name="Bridge серверы" html="bridges.html">
+ <Topic id="about" name="Что такое bridge-серверы?" html="bridges.html" section="about"/>
+ <Topic id="finding" name="Как мне найти bridge-сервер?" html="bridges.html" section="finding"/>
+ </Topic>
+ <Topic id="troubleshooting" name="Troubleshooting" html="troubleshooting.html">
+ <Topic id="start" name="I Can't Start Tor" html="troubleshooting.html" section="start"/>
+ <Topic id="connect" name="Vidalia Can't Connect to Tor" html="troubleshooting.html" section="connect"/>
+ <Topic id="torexited" name="Tor exited unexpectedly" html="troubleshooting.html" section="torexited"/>
+ <Topic id="stop" name="Vidalia Can't Stop Tor" html="troubleshooting.html" section="stop"/>
+ </Topic>
+ <Topic id="links" name="Helpful Links" html="links.html"/>
+</Contents>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/index.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/index.html
new file mode 100644
index 0000000..8059a3a
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/index.html
@@ -0,0 +1,42 @@
+<!--
+** $Id: index.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<!--
+ en: 2186
+-->
+
+<html>
+<body>
+
+<h1>Справка Vidalia</h1>
+<hr />
+
+<p>
+Выберите раздел помощи из дерева слева или используйте кнопку "Поиск" (над списком
+разделов) для поиска во всех доступных разделах сразу.
+</p>
+
+<p>
+Используйте кнопу <i>Найти</i> (вверху) чтобы найти текст в выбранном разделе.
+</p>
+
+<p>
+Кнопка <i>Домой</i> вернёт вас на эту стартовую страницу.
+</p>
+
+<p>
+В разделе <a href="links.html">Полезные Ссылки</a> перечислены некоторые
+места где можно найти дополнительную информацию по Vidalia и Tor.
+</p>
+
+</body>
+</html>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/links.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/links.html
new file mode 100644
index 0000000..0dcf632
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/links.html
@@ -0,0 +1,82 @@
+<!--
+** $Id: links.html 2686 2008-06-10 14:51:55Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>�������� ������</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>�������� ��������</td>
+ <td>
+ <a href="http://www.vidalia-project.net/">
+ http://www.vidalia-project.net/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki</td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki">
+ http://trac.vidalia-project.net/wiki</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Bugtracker</td>
+ <td>
+ <a href="http://trac.vidalia-project.net/report">
+ http://trac.vidalia-project.net/report</a>
+ </td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>�������� ��������</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://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ">
+ https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki</td>
+ <td>
+ <a href="https://wiki.torproject.org/noreply/TheOnionRouter">
+ https://wiki.torproject.org/noreply/TheOnionRouter</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Bugtracker</td>
+ <td>
+ <a href="https://bugs.torproject.org/flyspray/">
+ https://bugs.torproject.org/flyspray</a>
+ </td>
+</table>
+
+</body>
+</html>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/log.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/log.html
new file mode 100644
index 0000000..f22df83
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/log.html
@@ -0,0 +1,105 @@
+<!--
+** $Id: log.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<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>
+ 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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/netview.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/netview.html
new file mode 100644
index 0000000..43c5f39
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/netview.html
@@ -0,0 +1,174 @@
+<!--
+** $Id: netview.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/running.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/running.html
new file mode 100644
index 0000000..76d36a4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/running.html
@@ -0,0 +1,105 @@
+<!--
+** $Id: running.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/server.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/server.html
new file mode 100644
index 0000000..d46daab
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/server.html
@@ -0,0 +1,189 @@
+<!--
+** $Id: server.html 4241 2010-03-16 18:54:19Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<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:
+ <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>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/troubleshooting.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/troubleshooting.html
new file mode 100644
index 0000000..a385391
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/ru/troubleshooting.html
@@ -0,0 +1,97 @@
+<!--
+** $Id: troubleshooting.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<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="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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/bridges.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/bridges.html
new file mode 100644
index 0000000..99f20cb
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/bridges.html
@@ -0,0 +1,69 @@
+<!--
+** $Id: /local/vidalia/trunk/src/vidalia/help/content/en/contents.xml 145 2008-02-29T04:28:40.821411Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Bryggarouter</h1>
+<hr />
+
+<a name="about"/>
+<h3>Vad är en bryggarouter?</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>Hur kan jag hitta en brygga?</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 or Yahoo! 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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/config.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/config.html
new file mode 100644
index 0000000..6caf6d0
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/config.html
@@ -0,0 +1,199 @@
+<!--
+** $Id: config.html 2379 2008-03-02 02:10:00Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Konfigurerar Vidalia och 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>Allmänt-inställningar</h3>
+<p>
+Settings on the <i>Allmänt</i> page are the most commonly modified settings.
+</p>
+<ul>
+ <li><b>Körbar fil för Tor</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>Bläddra</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>Bara Windows</i>).
+ </li>
+</ul>
+
+<a name="network"/>
+<h3>Nätverk-inställningar</h3>
+<p>
+The <i>Nätverk</i> settings page lets you change how Tor connects to the Tor
+network.
+</p>
+<ul>
+ <li><b>Jag använder en proxy till 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>Min brandvägg gevs mig avsluta bara till säkra portarna</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>Min internetleverantör blockerar anslutningar till Tor-nätverket</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>Utdelning-inställningar</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>Utseende-inställningar</h3>
+<p>
+The settings on the <i>Utseende</i> page allow you to customize the
+look and feel of Vidalia.
+</p>
+<ul>
+ <li><b>Språk</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>Stil</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>Avancerat-inställningar</h3>
+<p>
+The settings on the <i>Avancerat</i> page should generally only be
+modified by more experienced users.
+</p>
+<ul>
+ <li><b>KontrollAdress Address & port</b>:
+ The <i>Kontrollport</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>Kontrollports styrkning</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>Inget</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>Lösenord</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>Konfigurationsfil för Tor</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-datakatalog</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>Rättigheter</b> <i>(optional, not available on Windows)</i>:
+ If you enter a value for <b>Kör som användaren</b>, Tor will <i>setuid</i> to this user
+ when it starts.
+ If you enter a value for <b>Kör som gruppen</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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/contents.xml b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/contents.xml
new file mode 100644
index 0000000..674c0cc
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/contents.xml
@@ -0,0 +1,63 @@
+<!--
+** $Id: contents.xml 2379 2008-03-02 02:10:00Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<Contents name="Vidalias hjälp" html="index.html">
+ <Topic id="running" name="Användning av Tor" html="running.html">
+ <Topic id="starting" name="Startar och stoppar Tor" html="running.html" section="starting"/>
+ <Topic id="monitoring" name="Övervakar Tors ställning" html="running.html" section="monitoring"/>
+ </Topic>
+ <Topic id="log" name="Meddelandelogg" html="log.html">
+ <Topic id="basic" name="Fundamental information" html="log.html" section="basic"/>
+ <Topic id="severities" name="Meddelandes stränghetar" html="log.html" section="severities"/>
+ <Topic id="logfile" name="Spara loggmeddelanden till en fil" html="log.html" section="tofile"/>
+ </Topic>
+ <Topic id="netview" name="Nätverkskarta" html="netview.html">
+ <Topic id="overview" name="Översikt" html="netview.html" section="overview"/>
+ <Topic id="netmap" name="Nätverkskarta" html="netview.html" section="netmap"/>
+ <Topic id="status" name="Routers ställning" html="netview.html" section="status"/>
+ <Topic id="details" name="Routers detaljen" html="netview.html" section="details"/>
+ </Topic>
+ <Topic id="config" name="Konfigurerar Vidalia och Tor" html="config.html">
+ <Topic id="general" name="Allmänt-inställningar" html="config.html" section="general"/>
+ <Topic id="network" name="Nätverk-inställningar" html="config.html" section="network"/>
+ <Topic id="server" name="Utdelning-inställningar" html="config.html" section="server"/>
+ <Topic id="appearance" name="Utseende-inställningar" html="config.html" section="appearance"/>
+ <Topic id="advanced" name="Avancerat-inställningar" html="config.html" section="advanced"/>
+ <Topic id="services" name="Hidden Services" html="config.html" section="services"/>
+ </Topic>
+ <Topic id="server" name="Installerar en Tor-router" html="server.html">
+ <Topic id="basic" name="Allmänt-inställningar" html="server.html" section="basic"/>
+ <Topic id="bandwidth" name="Bandbreddsbegränsningar" html="server.html" section="bandwidth"/>
+ <Topic id="exitpolicy" name="Användningspolicyn" html="server.html" section="exitpolicy"/>
+ <Topic id="upnp" name="Port Forwarding" html="server.html" section="upnp"/>
+ </Topic>
+ <Topic id="bridges" name="Bryggarouter" html="bridges.html">
+ <Topic id="about" name="Vad är en bryggarouter?" html="bridges.html" section="about"/>
+ <Topic id="finding" name="Hur kan jag hitta en brygga?" html="bridges.html" section="finding"/>
+ </Topic>
+ <Topic id="services" name="Hidden Services" html="services.html">
+ <Topic id="about" name="What is a hidden service?" html="services.html" section="about"/>
+ <Topic id="provide" name="How do I provide a hidden service?" html="services.html" section="provide"/>
+ <Topic id="data" name="What data do I need to provide?" html="services.html" section="data"/>
+ <Topic id="buttons" name="What are the five buttons used for?" html="services.html" section="buttons"/>
+ <Topic id="advanced" name="How can I configure advanced hidden service settings?" html="services.html" section="advanced"/>
+ <Topic id="client" name="How does Vidalia help me to access other hidden services?" html="services.html" section="client"/>
+ </Topic>
+ <Topic id="troubleshooting" name="Felsöka" html="troubleshooting.html">
+ <Topic id="start" name="Jag kan inte starta Tor" html="troubleshooting.html" section="start"/>
+ <Topic id="connect" name="Vidalia kan inte ansluta till Tor" html="troubleshooting.html" section="connect"/>
+ <Topic id="torexited" name="Tor har oväntat avslutats" html="troubleshooting.html" section="torexited"/>
+ <Topic id="stop" name="Vidalia kan inte stoppa Tor" html="troubleshooting.html" section="stop"/>
+ </Topic>
+ <Topic id="links" name="Nyttiga länkar" html="links.html"/>
+</Contents>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/index.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/index.html
new file mode 100644
index 0000000..be2b53b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/index.html
@@ -0,0 +1,37 @@
+<!--
+** $Id: index.html 2379 2008-03-02 02:10:00Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Vidalias hjälp</h1>
+<hr />
+
+<p>
+Från vänster du kan välja en hjälpavsnitt eller klicka Sök-knappen över lista du kan söka från alla hjälpavsnittet.
+</p>
+
+<p>
+Över på verktygsfält är <i>Sök</i>-knappen, vad du kan hitta något specifik hjälpavsnitt.
+</p>
+
+<p>
+Med <i>Hem</i>-knapp du kan kom tillbak den här hemsida.
+</p>
+
+<p>
+Du kan bekanta dig med <a href="links.html">Nyttiga länkar</a>-avsnitt för mer information och hjälp av Vidalia och Tor.
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/links.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/links.html
new file mode 100644
index 0000000..d76defc
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/links.html
@@ -0,0 +1,83 @@
+<!--
+** $Id: links.html 2379 2008-03-02 02:10:00Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Nyttiga länkar</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Websidan</td>
+ <td>
+ <a href="http://www.vidalia-project.net/">
+ http://www.vidalia-project.net/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki</td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki">
+ http://trac.vidalia-project.net/wiki</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Bugtracker</td>
+ <td>
+ <a href="http://trac.vidalia-project.net/report">
+ http://trac.vidalia-project.net/report</a>
+ </td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Websidan</td>
+ <td>
+ <a href="https://www.torproject.org/">https://www.torproject.org/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>OFF (FAQ)</td>
+ <td>
+ <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ">
+ https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki</td>
+ <td>
+ <a href="https://wiki.torproject.org/noreply/TheOnionRouter">
+ https://wiki.torproject.org/noreply/TheOnionRouter</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Bugtracker</td>
+ <td>
+ <a href="https://bugs.torproject.org/flyspray/">
+ https://bugs.torproject.org/flyspray</a>
+ </td>
+</table>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/log.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/log.html
new file mode 100644
index 0000000..eefe508
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/log.html
@@ -0,0 +1,105 @@
+<!--
+** $Id: log.html 2379 2008-03-02 02:10:00Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Meddelandelogg</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>Fel</b> (most serious) to <b>Avlusa</b> (most verbose). See the help
+section on <a href="#severities">message severities</a> for more information.
+
+
+<a name="severities"/>
+<h3>Meddelandes stränghetar</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>Fel</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>Varning</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>Underrättelser</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>Avlusa</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>
+Mest av användar skulle bara att logga <i>Fel</i>, <i>Varning</i>, och <i>Underrättelser</i>
+meddelanden.
+</p>
+
+<p>
+To select which message severities you would like to see, do the following:
+<ol>
+ <li>Öppna meddelandelogg från aktivitetsfälts Vidalias meny.</li>
+ <li>Klicka <i>Inställningar</i> från toppen av meddelandelogg.</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>Spara inställningar</i> to apply your new message filter.</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Spara loggmeddelanden till en fil</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>Öppna meddelandelogg från aktivitetsfälts Vidalias meny.</li>
+ <li>Klicka <i>Inställningar</i> från toppen av meddelandelogg.</li>
+ <li>Check the box labeled <i>Spara automatiskt nya loggmeddelanden till filen</i>.
+ <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>Bläddra</i>
+ to navigate to a location for your log file.
+ </li>
+ <li>Click <i>Spara inställningar</i> to save your log destination.</li>
+</ol>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/netview.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/netview.html
new file mode 100644
index 0000000..737b064
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/netview.html
@@ -0,0 +1,174 @@
+<!--
+** $Id: netview.html 2379 2008-03-02 02:10:00Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Nätverkskarta</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>Översikt</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>Nätverkskarta</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>Zooma In</b> and
+<b>Zooma Ut</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>Routers ställning</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>Routers detaljen</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">routerlista</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>Plats</b></td>
+ <td>Plats var liggar det router.</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>Plattform</b></td>
+ <td>
+ Operating system information and Tor version on which this relay is
+ currently running.
+ </td>
+</tr>
+<tr>
+ <td><b>Bandbredd</b></td>
+ <td>
+ Estimated maximum amount of bandwidth that the directory relays have
+ seen this relay handle recently.
+ </td>
+</tr>
+<tr>
+ <td><b>Uptid</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>Senast uppdaterad</b></td>
+ <td>Datum när det routers information har senast uppdaterad.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/running.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/running.html
new file mode 100644
index 0000000..fbda086
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/running.html
@@ -0,0 +1,99 @@
+<!--
+** $Id: running.html 2379 2008-03-02 02:10:00Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Användning av Tor</h1>
+<hr />
+
+<p>
+Med Vidalia du kan kontrolla Tor; startar och stoppar det, övervakar Tors ställning och vet om det har oväntat avslutats.
+</p>
+
+<a name="starting"/>
+<h3>Startar och stoppar Tor</h3>
+<p>
+För <i>starta</i> Tor,
+<ol>
+ <li>Välj <i>Starta</i> från aktivitetsfälts Vidalias meny eller trycka <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>
+Om Vidalia kan inte starta Tor, Vidalia skall visa en felmeddelande, som berättar vad var det problem. Du kan också titta din
+<a href="log.html">meddelandelogg</a>, om Tor har skrev något mer information av det problem.
+</p>
+
+<p>
+För <i>stoppa</i> Tor,
+<ol>
+ <li>Välj <i>Stoppa</i> från aktivitetsfälts Vidalias meny eller trycka <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>
+Om Vidalia kan inte stoppa Tor, Vidalia skall visa en felmeddelande, som berättar vad var det problem. Du kan också titta din
+<a href="log.html">meddelandelogg</a>, om Tor har skrev något mer information av det problem.
+</p>
+
+<a name="monitoring"/>
+<h3>Övervakar Tors ställning</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 har stoppat. Välj <i>Starta</i> från aktivitetsfälts Vidalias meny för startar Tor.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+ <td valign="middle">
+ Tor startas upp. You can check the
+ <a href="log.html">meddelandelogg</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 är igång. Om du vill stopppa Tor, välj <i>Stoppa</i> från
+ Vidalias meny. Tor will print informational messages to the
+ <a href="log.html">meddelandelogg</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 avslutas nu.</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">meddelandelogg</a> for details about any problems
+Tor encountered before it exited.
+</p>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/server.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/server.html
new file mode 100644
index 0000000..fc4a252
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/server.html
@@ -0,0 +1,242 @@
+<!--
+** $Id: server.html 2379 2008-03-02 02:10:00Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Installerar en Tor-router</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>Allmänt-inställningar</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:
+ <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>Bandbreddsbegränsningar</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>Användningspolicyn</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>Portarna</b></td>
+ <td><b>Description</b></td>
+</tr>
+<tr>
+ <td>Webbplatser</td>
+ <td valign="middle">80</td>
+ <td>Normal, unencrypted Web browsing</td>
+</tr>
+<tr>
+ <td>Säkra Webbplatser (SSL)</td>
+ <td valign="middle">443</td>
+ <td>Encrypted Web browsing</td>
+</tr>
+<tr>
+ <td>Hämta e-post (POP, IMAP)</td>
+ <td valign="middle">110, 143, 993, 995</td>
+ <td>Ladda ner e-posten (does not permit sending email)</td>
+</tr>
+<tr>
+ <td>Snabbmeddelanden (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-klientrar och -servrar</td>
+</tr>
+<tr>
+ <td>Andra övriga tjänster</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>Användningspolicyn</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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/services.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/services.html
new file mode 100644
index 0000000..11f5a95
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/services.html
@@ -0,0 +1,146 @@
+<!--
+** $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.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.
+-->
+
+<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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/troubleshooting.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/troubleshooting.html
new file mode 100644
index 0000000..c56a2bf
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/sv/troubleshooting.html
@@ -0,0 +1,97 @@
+<!--
+** $Id: troubleshooting.html 2379 2008-03-02 02:10:00Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Felsöka</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>Jag kan inte starta 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 kan inte ansluta till 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="torexited"/>
+<h3>Tor har oväntat avslutats</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 kan inte stoppa 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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/config.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/config.html
new file mode 100644
index 0000000..cc7ab46
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/config.html
@@ -0,0 +1,72 @@
+<!--
+** $Id: config.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>配置Vidalia和Tor</h1>
+<hr />
+
+<p>
+Vidalia可以帮助您对Vidalia和Tor的常用部分进行配置，还可以协助您配置
+<a href="server.html">Tor 服务器</a>，从而促进Tor网络的成长。
+</p>
+
+<a name="general"/>
+<h3>一般设置</h3>
+<p>
+<i>一般</i>页面上的是最常见的一些修改设置。
+</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>启动可选项</b>：
+ 这里您可以进行设置，使得Vidalia启动时，Tor也能自动启动。
+ 您也可以将Vidalia设置成系统启动时就开始运行 (<i>只针对Windows</i>)。
+ </li>
+</ul>
+
+<a name="server"/>
+<h3>服务器设置</h3>
+<p>
+<i>
+ 有关设置、管理Tor服务器的详情，请参见 <a href="server.html">此文件</a>。
+</i>
+</p>
+
+<a name="advanced"/>
+<h3>高级设置</h3>
+<p>
+<i>高级设置</i>主要针对较有经验的使用者。
+</p>
+<ul>
+ <li><b>控制端口</b>：
+ <i>控制端口</i>，Vidalia通过其与Tor交流。
+ 除非与本机的其它服务冲突，否则这个设置不需要更改。
+ </li>
+ <li><b>改变Tor的配置文件</b>:
+ 通过此可选项，可让Vidalia启动时采用指定的<i>torrc</i>
+ (Tor的配置文件)。
+ </li>
+ <li><b>权限</b>：
+ 如果您设置了此项，Tor启动时，就可以对用户<i>setuid</i>，或对用户组<i>setgid</i>。
+ </li>
+</ul>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/contents.xml b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/contents.xml
new file mode 100644
index 0000000..14bcb6e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/contents.xml
@@ -0,0 +1,47 @@
+<!--
+** $Id: contents.xml 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<Contents name="Vidalia帮助" html="index.html">
+ <Topic id="running" name="运行Tor" html="running.html">
+ <Topic id="starting" name="启动和停止Tor" html="running.html" section="starting"/>
+ <Topic id="monitoring" name="监视Tor的状态" html="running.html" section="monitoring"/>
+ </Topic>
+ <Topic id="log" name="消息日志" html="log.html">
+ <Topic id="basic" name="基本信息" html="log.html" section="basic"/>
+ <Topic id="severities" name="消息级别" html="log.html" section="severities"/>
+ <Topic id="logfile" name="记录到文件" html="log.html" section="tofile"/>
+ </Topic>
+ <Topic id="netview" name="Network Viewer" html="netview.html">
+ <Topic id="overview" name="Overview" html="netview.html" section="overview"/>
+ <Topic id="netmap" name="Network Map" html="netview.html" section="netmap"/>
+ <Topic id="status" name="Router Status" html="netview.html" section="status"/>
+ <Topic id="details" name="Router Details" html="netview.html" section="details"/>
+ </Topic>
+ <Topic id="config" name="配置Vidalia和Tor" html="config.html">
+ <Topic id="general" name="一般设置" html="config.html" section="general"/>
+ <Topic id="server" name="服务器设置" html="config.html" section="server"/>
+ <Topic id="advanced" name="高级设置" html="config.html" section="advanced"/>
+ </Topic>
+ <Topic id="server" name="运行Tor服务器" html="server.html">
+ <Topic id="basic" name="安装基础" html="server.html" section="basic"/>
+ <Topic id="bandwidth" name="Rate Limiting" html="server.html" section="bandwidth"/>
+ <Topic id="exitpolicy" name="退出策略" html="server.html" section="exitpolicy"/>
+ </Topic>
+ <Topic id="troubleshooting" name="问题多多" html="troubleshooting.html">
+ <Topic id="start" name="我无法运行Tor" html="troubleshooting.html" section="start"/>
+ <Topic id="connect" name="Vidalia Can't Connect to Tor" html="troubleshooting.html" section="connect"/>
+ <Topic id="torexited" name="Tor exited unexpectedly" html="troubleshooting.html" section="torexited"/>
+ <Topic id="stop" name="Vidalia Can't Stop Tor" html="troubleshooting.html" section="stop"/>
+ </Topic>
+ <Topic id="links" name="Helpful Links" html="links.html"/>
+</Contents>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/index.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/index.html
new file mode 100644
index 0000000..3a9ff20
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/index.html
@@ -0,0 +1,38 @@
+<!--
+** $Id: index.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Vidalia 帮助</h1>
+<hr />
+
+<p>
+请通过选择左边的树状菜单，或者点击主题列表上方的搜索按钮，以对所有帮助内容进行查找。
+</p>
+
+<p>
+你可以通过使用工具栏上的<i>查找</i>按钮，以在特定帮助主题内进行搜索。
+</p>
+
+<p>
+上方的<i>首页</i>按钮可以返回到本页。
+</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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/links.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/links.html
new file mode 100644
index 0000000..4c467de
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/links.html
@@ -0,0 +1,83 @@
+<!--
+** $Id: links.html 2686 2008-06-10 14:51:55Z djhasis $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Helpful Links</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>Homepage</td>
+ <td>
+ <a href="http://www.vidalia-project.net/">
+ http://www.vidalia-project.net/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki</td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki">
+ http://trac.vidalia-project.net/wiki</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Bugtracker</td>
+ <td>
+ <a href="http://trac.vidalia-project.net/report">
+ http://trac.vidalia-project.net/report</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://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ">
+ https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki</td>
+ <td>
+ <a href="https://wiki.torproject.org/noreply/TheOnionRouter">
+ https://wiki.torproject.org/noreply/TheOnionRouter</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Bugtracker</td>
+ <td>
+ <a href="https://bugs.torproject.org/flyspray/">
+ https://bugs.torproject.org/flyspray</a>
+ </td>
+</table>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/log.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/log.html
new file mode 100644
index 0000000..1f27db7
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/log.html
@@ -0,0 +1,88 @@
+<!--
+** $Id: log.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>消息日志</h1>
+<hr />
+
+通过消息日志您可以看到Tor进程的运行状态信息。
+<a name="basic"/>
+每则消息都有一个关联的<i>程度级别</i>，从<b>出错
+</b> (最严重) 到 <b>Debug</b> (最冗长)，可参考
+<a href="#severities">消息级别</a>段落的更多介绍。
+
+<a name="severities"/>
+<h3>消息级别</h3>
+<p>
+消息级别表明了该消息的重要程度。高级别的消息表明Tor出现了问题；
+低级别消息则在Tor的正常运行中出现，一般来说不需要纪录
+</p>
+
+<p>
+消息级别从高到低分为：
+</p>
+<ul>
+ <li>
+ <b>出错</b>：发生了严重的错误，Tor无法继续运行。此类消息在日志窗口中会以<i>红色</i>高亮显示。
+ </li>
+ <li>
+ <b>警告</b>：发生了错误，但还不致命，Tor可以继续运行。此类消息以<i>黄色</i>高亮显示。
+ </li>
+ <li>
+ <b>注意</b>：Tor正常运行中较少出现的消息，不被视作错误，但仍要引起注意。
+ </li>
+ <li>
+ <b>信息</b>：Tor正常运行中经常出现的消息，通常用不着关注。
+ </li>
+ <li>
+ <b>Debug</b>：非常冗长的消息，开发员会感兴趣。除非你知根知底，否则不需要纪录这类消息。
+ </li>
+</ul>
+
+<p>
+大部分用户只需要纪录<i>出错</i>、<i>警告</i>和<i>注意</i>三类消息。
+</p>
+
+<p>
+选择您要查看哪些消息级别，按如下步骤：
+<ol>
+ <li>从Vidalia托盘中打开消息日志；</li>
+ <li>在消息日志窗口底部点击<i>显示设置</i>；</li>
+ <li>
+ 在消息过滤器组中，将想查看的消息级别打勾；想隐藏的话，就取消勾选。
+ </li>
+ <li>点击<i>保存设置</i>，以应用新的消息过滤器。</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>记录到文件</h3>
+<p>
+除了将消息记录到窗口，也可以将其记录到一个文件。记录至文件的步骤如下：
+</p>
+
+<ol>
+ <li>从Vidalia托盘中打开消息日志；</li>
+ <li>在消息日志窗口底部点击<i>显示设置</i>；</li>
+ <li>勾选<i>将消息保存到文件</i>标签；
+ <li>
+ 您若想改变消息写入的文件，可以在文本框中直接输入文件路径、名称，也可以点击<i>浏览</i>以重新定位日志文件。
+ </li>
+ <li>最后点击<i>保存设置</i>。</li>
+</ol>
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/netview.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/netview.html
new file mode 100644
index 0000000..d52a15b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/netview.html
@@ -0,0 +1,174 @@
+<!--
+** $Id: netview.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>Network Viewer</h1>
+<hr />
+
+<p>
+The network viewer lets you see routers 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 routers 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 routers in the Tor network. Green lines are drawn
+between routers 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 router is determined by looking up the IP
+address of the router 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 routers. It is important to note
+that this request is done through Tor, so your location is not revealed to the
+GeoIP server.
+</p>
+
+
+<a name="status"/>
+<h3>Router Status</h3>
+<p>
+On the left side of the network view, you will see a list of routers in the
+Tor network. Next to each router is an icon indicating that router's status.
+The following table summarizes the possible router status icons:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+ <td valign="middle">
+ The router is offline or simply not responding.
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+ <td valign="middle">
+ The router 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 router 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 router 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 router 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 router 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>Router Details</h3>
+<p>
+The router details panel at the right side of the screen gives you details
+about the router or routers currently selected in the
+<a href="#routerlist">router 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 router through which your traffic is currently being
+relayed.
+</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 router.</td>
+</tr>
+<tr>
+ <td><b>IP Address</b></td>
+ <td>IP address at which this Tor router can be reached.</td>
+</tr>
+<tr>
+ <td><b>Platform</b></td>
+ <td>
+ Operating system information and Tor version on which this router is
+ currently running.
+ </td>
+</tr>
+<tr>
+ <td><b>Bandwidth</b></td>
+ <td>
+ Estimated maximum amount of bandwidth that the directory servers have
+ seen this router handle recently.
+ </td>
+</tr>
+<tr>
+ <td><b>Uptime</b></td>
+ <td>
+ Length of time this router has been available, which can be used to help
+ estimate this router's stability.
+ </td>
+</tr>
+<tr>
+ <td><b>Last Updated</b></td>
+ <td>Date this router's information was last updated.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/running.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/running.html
new file mode 100644
index 0000000..e4d07e6
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/running.html
@@ -0,0 +1,96 @@
+<!--
+** $Id: running.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>运行Tor</h1>
+<hr />
+
+<p>
+Vidalia可以帮助您控制Tor进程，包括启动、停止Tor，监视Tor的状态，包括意外退出。
+</p>
+
+<a name="starting"/>
+<h3>启动和停止Tor</h3>
+<p>
+<i>启动</i>Tor：
+<ol>
+ <li>从Vidalia托盘菜单中选择<i>启动</i>，或者按<i>Ctrl+S</i>；</li>
+ <li>
+ Tor启动后，Vidalia托盘图标会由红色的X，变成一稞绿色的洋葱；
+ </li>
+</ol>
+如果Vidalia无法启动Tor，它会显示出错信息，告诉您哪里出了问题。您也可以通过<a href="log.html">消息日志</a>，来查看Tor是否有更多的信息提示。
+</p>
+
+<p>
+<i>停止</i>Tor：
+<ol>
+ <li>从Vidalia托盘菜单中选择<i>停止</i>，或者按<i>Ctrl+T</i>；</li>
+ <li>
+ Tor停止后，Vidalia托盘图标会由绿色的洋葱，变成红色的X。
+ </li>
+</ol>
+如果Vidalia无法停止Tor，它会显示出错信息，告诉您哪里出了问题。您也可以通过<a href="log.html">消息日志</a>，来查看Tor是否有更多的信息提示。
+</p>
+
+<a name="monitoring"/>
+<h3>监视Tor的状态</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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/server.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/server.html
new file mode 100644
index 0000000..6bbbcb6
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/server.html
@@ -0,0 +1,152 @@
+<!--
+** $Id: server.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>运行Tor服务器</h1>
+<hr>
+
+Tor网络由分布于世界各地的志愿者构建，他们通过运行服务器，
+贡献自己的空余带宽。Vidalia协助您更容易地建立起自己的Tor服务器。
+<a name="basic">
+</a><h3><a name="basic">安装基础</a></h3>
+<p>
+<a name="basic">如果您决定通过运行服务器来帮助Tor网络成长，可按如下步骤进行：
+</a></p>
+<ol>
+<a name="basic"> </a><li>
+<a name="basic"> 通过托盘菜单选择<i>配置</i>(苹果机上是通过系统菜单栏的<i>属性</i>)，打开<i>配置对话框</i>；
+ </a></li>
+<a name="basic"> </a><li><a name="basic">选择<i>服务器</i>配置页；</a></li>
+<a name="basic"> </a><li><a name="basic">勾选<i>为Tor网络中继传输</i>标签；
+ </a></li><li><a name="basic">输入以下信息：
+ </a><ul>
+<a name="basic"> </a><li><a name="basic"><b>昵称</b>:
+
+ 在Tor网络中您服务器的名称，例如"张三的Vidalia服务器"。
+ </a></li>
+<a name="basic"> </a><li><a name="basic"><b>联系信息</b>:
+ 您的e-mail地址或者PGP key。仅当Tor由于安全原因需要升级或服务器出了问题，
+ 才可通过此方式与您联络。
+ </a></li>
+<a name="basic"> </a><li><a name="basic"><b>服务器端口：</b>:
+ 您服务器与客户端或其他服务器通信的侦听端口。
+ </a></li>
+<a name="basic"> </a><li><a name="basic"><b>地址</b>：
+ 输入您计算机的IP地址，因特网上其他Tor服务器通过此地址找到您的服务器。
+ 如果您不清楚自己的公共IP地址，可点击<i>获取地址</i>，Vidalia会联络外部站点
+ (比如<i>http://www.vidalia-project.net/iptest/ip.php</i>)来找出您的公共IP地址。
+ </a></li>
+<a name="basic"> </a></ul>
+<a name="basic"> </a></li><li>
+<a name="basic"> 如果您想要为网络上的其他服务器做Tor目录镜像，请勾选<i>镜像服务器的目录</i>。
+ 如果您没有那么多带宽，则不要勾选此项。如果您决定做镜像目录，请确保其<i>端口</i>
+ 不同于上面输入的<i>服务器端口</i>。
+ </a></li>
+<a name="basic"> </a><li>
+<a name="basic"> 如果通信从您这里路由退出Tor网路，将显示您的IP地址。如果您不希望如此，请勾选
+ <i>只进行其他Tor服务器之间的中继传输</i>，这样只扮演<i>中间人</i>的角色。
+ </a></li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Rate Limiting</h3>
+<p>
+Running a Tor server 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 server, while still keeping your network
+connection usable for your own use.
+</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
+server.
+</p>
+<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>
+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 server 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 server directory</i>.
+</p>
+
+<a name="exitpolicy">
+</a><h3><a name="exitpolicy">退出策略</a></h3>
+<p>
+<a name="exitpolicy">有了退出策略，您就可以对自己的Tor服务器，设定退出时允许的通信类别。
+Tor默认使用的退出策略，对信件做了限制，以防止垃圾邮件，
+有的则针对共享文件的端口，以防止Tor网络被滥用。 <i>提醒：</i>如果您是作为<i>中间人</i>服务器，就不需要考虑退出策略，因为没有任何流量会通过您服务器退出。</a></p>
+
+<p>
+<a name="exitpolicy">一项退出策略由零行到多行组成，每行代表了一项动作，只要通过您服务器的连接匹配其中某行指定的地址或端口，相应动作就会被执行。
+</a></p>
+
+<p>
+<a name="exitpolicy">Tor按照从头到尾的顺序来考虑策略，按照第一个找到的匹配动作来执行。任何您新添加的规则都会放到Tor退出策略列表的开头，由于优先级是从头到尾，可能就需要对策略重新排序。您可以通过上下箭头的按钮，来调整顺序。
+</a></p>
+
+<h4><a name="exitpolicy">动作</a></h4>
+<p>
+<a name="exitpolicy">每行策略都对应着一项关联动作，这些动作可以是：
+</a></p><ul>
+<a name="exitpolicy"> </a><li><a name="exitpolicy"><b>reject</b>：匹配该策略的连接将被<i>拒绝</i>；</a></li>
+<a name="exitpolicy"> </a><li><a name="exitpolicy"><b>accept</b>：匹配该策略的连接将被<i>接受</i>。</a></li>
+</ul>
+<p></p>
+
+<h4><a name="exitpolicy">地址</a></h4>
+<p>
+<a name="exitpolicy">策略中的地址可以是IP地址(比如 <i>123.45.67.8</i>)、IP地址与掩码(比如 <i>123.45.0.0/16</i>)，或者通配符"*"，这里的"*"表示"匹配所有地址"。
+</a></p>
+
+<h4><a name="exitpolicy">端口</a></h4>
+<p>
+<a name="exitpolicy">每项策略都关联有一个端口或者一段范围内的端口，合法的端口范围是从 1 到 65535，或者你可以指定一个"*"以匹配所有"所有端口"。
+</a></p>
+
+<h4><a name="exitpolicy">例子</a></h4>
+<p>
+<a name="exitpolicy">以下是几个合法的退出策略样例，以及相应的作用描述：
+</a></p><ul>
+<a name="exitpolicy"> </a><li><a name="exitpolicy"><b>reject 123.45.67.8:*</b> -
+ Tor将<i>拒绝</i>客户端，通过您服务器与<i>123.45.67.8</i>的任何端口进行连接；
+ </a></li>
+<a name="exitpolicy"> </a><li><a name="exitpolicy"><b>accept *:80</b> -
+ Tor将<i>接受</i>客户端，通过您服务器与任意IP地址的80端口进行连接；
+ </a></li>
+<a name="exitpolicy"> </a><li><a name="exitpolicy"><b>reject *:135-139</b> -
+ Tor将<i>拒绝</i>客户端，通过您服务器与任意IP地址的135到139端口进行连接；
+ </a></li>
+<a name="exitpolicy"> </a><li><a name="exitpolicy"><b>reject 128.23.0.0/16:*</b> -
+ Tor将<i>拒绝</i>客户端，通过您服务器与在<i>128.23.0.0</i>到<i>128.23.255.255</i>范围内IP地址的任何端口进行连接。
+ </a></li>
+</ul>
+<p></p>
+
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/troubleshooting.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/troubleshooting.html
new file mode 100644
index 0000000..b9f4b34
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/help/content/zh_CN/troubleshooting.html
@@ -0,0 +1,76 @@
+<!--
+** $Id: troubleshooting.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not 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.
+-->
+
+<html>
+<body>
+
+<h1>问题多多</h1>
+<hr>
+
+以下列出了一些常见的问题，包括运行Tor时出现的。如果您的问题没有解答，
+请访问我们的网站<i>www.vidalia-project.net</i>，以获得进一步的资讯支持。
+
+<a name="start">
+</a><h3><a name="start">我无法运行Tor</a></h3>
+<p>
+<a name="start">最常见的原因是已经有一个Tor进程在运行。请检查您的进程列表，如果找到先前进程，
+请将其停止。然后试试再运行Tor。
+</a></p>
+<p>
+如果这个办法不管用，请检查 <a href="http://trac.vidalia-project.net/browser/trunk/src/gui/help/content/zh-cn/log.html">消息日志</a>，
+查看Tor是否显示有启动时的出错信息。
+</p>
+
+<a name="connect">
+</a><h3><a name="connect">Vidalia无法连接到Tor</a></h3>
+<p>
+<a name="connect">Vidalia通过Tor的<i>控制端口</i>与Tor进行通讯。</a></p>
+<p>
+<a name="connect">Vidalia无法与Tor连接的最常见原因是Tor启动后，遇到一个问题而导致立即退出。您可以通过检查您的</a><a href="http://trac.vidalia-project.net/browser/trunk/src/gui/help/content/zh-cn/log.html">消息日志</a>，看看Tor是否记录了启动时遇到的问题。</p>
+<p>
+如果Tor侦听的不是Vidalia希望的那个端口，当然Vidalia就无法连接到Tor。您一般不需要改变这个设置，但如果您机器另外运行的服务，与Tor的控制端口相冲突，这时您就需要重新制定一个不同的端口。您可以通过<a href="http://trac.vidalia-project.net/browser/trunk/src/gui/help/content/zh-cn/config.html#advanced">高级设置</a>来改变原来的设定。
+</p>
+
+<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">
+</a><h3><a name="stop">Vidalia无法停止Tor</a></h3>
+<p>
+<a name="stop">如果Vidalia无法停止Tor，您可以检查</a><a href="http://trac.vidalia-project.net/browser/trunk/src/gui/help/content/zh-cn/log.html">消息日志</a>，看看Tor试图退出时是否有错误报告。</p>
+
+
+</body>
+</html>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/CMakeLists.txt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/CMakeLists.txt
new file mode 100644
index 0000000..24521d9
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/CMakeLists.txt
@@ -0,0 +1,89 @@
+##
+## $Id: CMakeLists.txt 4266 2010-04-17 21:45:21Z edmanm $
+##
+## This file is part of Vidalia, and is subject to the license terms in the
+## LICENSE file, found in the top level directory of this distribution. If
+## you did not 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.
+##
+
+
+## Vidalia translation files
+set(vidalia_PO
+ ar/vidalia_ar.po
+ bg/vidalia_bg.po
+ bms/vidalia_bms.po
+ cs/vidalia_cs.po
+ da/vidalia_da.po
+ de/vidalia_de.po
+ es/vidalia_es.po
+ fa/vidalia_fa.po
+ fi/vidalia_fi.po
+ fr/vidalia_fr.po
+ he/vidalia_he.po
+ hu/vidalia_hu.po
+ it/vidalia_it.po
+ ja/vidalia_ja.po
+ nb/vidalia_nb.po
+ nl/vidalia_nl.po
+ pl/vidalia_pl.po
+ pt/vidalia_pt.po
+ pt_BR/vidalia_pt_BR.po
+ ro/vidalia_ro.po
+ ru/vidalia_ru.po
+ sq/vidalia_sq.po
+ sv/vidalia_sv.po
+ th/vidalia_th.po
+ tr/vidalia_tr.po
+ vi/vidalia_vi.po
+ zh_CN/vidalia_zh_CN.po
+ zh_TW/vidalia_zh_TW.po
+)
+vidalia_add_po(vidalia_QMS ${vidalia_PO})
+
+## Qt translation files
+set(qt_PO
+ ar/qt_ar.po
+ bg/qt_bg.po
+ bms/qt_bms.po
+ cs/qt_cs.po
+ da/qt_da.po
+ de/qt_de.po
+ es/qt_es.po
+ fa/qt_fa.po
+ fi/qt_fi.po
+ fr/qt_fr.po
+ he/qt_he.po
+ hu/qt_hu.po
+ it/qt_it.po
+ ja/qt_ja.po
+ nb/qt_nb.po
+ nl/qt_nl.po
+ pl/qt_pl.po
+ pt/qt_pt.po
+ pt_BR/qt_pt_BR.po
+ ro/qt_ro.po
+ ru/qt_ru.po
+ sq/qt_sq.po
+ sv/qt_sv.po
+ th/qt_th.po
+ tr/qt_tr.po
+ vi/qt_vi.po
+ zh_CN/qt_zh_CN.po
+ zh_TW/qt_zh_TW.po
+)
+vidalia_add_po(qt_QMS ${qt_PO})
+
+## Create a target that converts all .po files to Qt .qm files
+add_custom_target(i18n DEPENDS ${vidalia_QMS} ${qt_QMS})
+add_dependencies(i18n po2ts)
+
+## Create a target that runs lupdate for all Vidalia source and UI files
+add_custom_target(i18n-update)
+add_dependencies(i18n-update po2ts ts2po)
+vidalia_update_po(i18n-update ${vidalia_PO})
+vidalia_update_po(i18n-update templates/vidalia.pot)
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/af/qt_af.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/af/qt_af.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/af/qt_af.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/af/vidalia_af.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/af/vidalia_af.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/af/vidalia_af.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ar/qt_ar.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ar/qt_ar.po
new file mode 100644
index 0000000..9d26343
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ar/qt_ar.po
@@ -0,0 +1,443 @@
+msgid ""
+msgstr ""
+"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: 2009-12-09 15:52-0700\n"
+"Last-Translator: Anas Qtiesh <anasqtiesh at gmail.com>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n>=3 && "
+"n<=10 ? 3 : n>=11 && n<=99 ? 4 : 5;\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "تفعيل"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "البرنامج '%1' يتطلّب Qt %2، تمّ إيجاد Qt %3."
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "خطأ: مكتبة Qt غير موافقة"
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "RTL"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "تفعيل شاشة البرنامج الرئيسية"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "موافق"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "حفظ"
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "فتح"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "إلغاء"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "إغلاق"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "تطبيق"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "إعادة"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "مساعدة"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "لا تحفظ"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "تجاهل"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "&نعم"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "نع&م للكل"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "&لا"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "ل&ا للكل"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "إحفظ الكل"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "إبطال"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "إعادة المحاولة"
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "تجاهل"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "استرجاع الإعدادات الافتراضية"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "إغلاق بدون حفظ"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "&موافق"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "الاسم"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "الحجم"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "النوع"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "الطّراز"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "تاريخ التعديل"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "جميع الملفّات (*)"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "المجلدات"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "&فتح"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "&حفظ"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "فتح"
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"%1 موجود أصلا.\n"
+"هل ترغب بإستبداله؟"
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+"%1\n"
+"ملف غير موجود.\n"
+"رجاءاً تأكد من صحة إسم الملف."
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "جهاز الكمبيوتر الخاص بي"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "ت&غيير الإسم"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "ح&ذف"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "ع&رض الملفّات المخفية"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "رجوع"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "المجلد الرئيسي"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "عرض القائمة"
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "عرض التفاصيل"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "ملفات النوع:"
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "دليل:"
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+"\n"
+"%1مجلد غير موجود.\n"
+"رجاءاً تأكد من صحة إسم المجلد."
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+"'%1' محمي من الكتابة.\n"
+"هل تريد حذفه علي أي حال؟"
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "هل أنت متأكد أنك تريد حذفه '%1'؟"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "لا تستطيع حذف المجلد."
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "جميع الملفّات (*.*)"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "حفظ بإسم"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "السواقة"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "ملفّ"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "غير معروف"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "إيجاد المسار"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "إعرض"
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "التالي"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "مجلد جديد"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "م&جلد جديد"
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "إ&ختار"
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "حذف"
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "إسم ال&ملف"
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "إنظر في:"
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "أنشئ مجلد جديد"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+"<b>لايمكن إستعمال الاسم \"%1\".</b>حاول إستخدام اسم أخر, مع تقليل عدد المحارف "
+"أو عدم استخدام علامات التنقيط<p>"
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr "الاسم"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "السّعة"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "النوع"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "الطّراز"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "تاريخ التعديل"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "جهاز الكمبيوتر"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "كمبيوتر"
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr "%1 تيرابايت"
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr "%1 جيجابايت"
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr "%1 ميجابايت"
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr "%1 كيلو بايت"
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr "%1 بايت"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ar/vidalia_ar.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ar/vidalia_ar.po
new file mode 100644
index 0000000..a499282
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ar/vidalia_ar.po
@@ -0,0 +1,3377 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:55+0000\n"
+"PO-Revision-Date: 2010-05-03 11:45-0600\n"
+"Last-Translator: Anas Qtiesh <anasqtiesh at gmail.com>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n>=3 && "
+"n<=10 ? 3 : n>=11 && n<=99 ? 4 : 5;\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "عن ڤيداليا"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "ترخيص"
+
+# لا توجد تعليقات.
+msgctxt "AboutDialog"
+msgid "Vidalia 0.2.0"
+msgstr "فيداليا 0.2.0"
+
+msgctxt "AboutDialog"
+msgid "Tor 0.2.0.32"
+msgstr "تور 0.2.0.32"
+
+# لا توجد تعليقات.
+msgctxt "AboutDialog"
+msgid "Qt 4.4.2"
+msgstr "4.4.2 QT "
+
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr "ڤيداليا"
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "تور"
+
+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 "لقد اخترت \"كلمة سر\" كنظام التحقق، لكنك لم تحدد كلمة سر."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "اختر ملف إعدادات تور"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "الملف غير موجود"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 غير موجود. أتريد إنشاءه؟"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "تعذَّر إنشاء الملف"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "تعذَّر إنشاء الملف %1 [%2]"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "إختار مجلد لحفظ بيانات التور"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "تعذَّرت إزالة خدمة تور"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "تعذَّر تثبيت خدمة تور"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "لم يتمكن ڤيداليا من تثبيت خدمة تور."
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "مدخل التحكم"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "المصادقة:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "العنوان:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "لا شيء"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "كعكة"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "كلمة مرور"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "توليد عشوائي"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "ملف إعدادات التور"
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "إبدأ برنامج تور بملف الإعدادات المحدد (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 "إحفظ بيانات برنامج تور في الدليل التالي"
+
+msgctxt "AdvancedPage"
+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"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+"ڤيداليا لم يتمكن من إزالة خدمة تور\n"
+"\n"
+"سيتوجب عليك إزالتها يدوياً."
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "اللغة"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "اختر اللغة المستخدمة في فيداليا"
+
+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 "ڤيداليا لم يتمكن من تحميل ملف ترجمة اللغة المحدد."
+
+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 "العملاء من الدول التالية استخدموا تحويلتك منذ %1"
+
+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 "<Path Empty>"
+
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "الاتصال"
+
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "الحالة"
+
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "إقترب إلى الدائرة"
+
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "أغلق الدائرة (Del)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "أغلق الجدول (Del)"
+
+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 "فيداليا لم يتمكن من حفظ إعداداتك لـ%1"
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "خطأ في تطبيق الإعدادات"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "فيداليا لا يستطيع تطبيق إعداداتك %1 في تور"
+
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "إعدادات"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "فيداليا لا يستطيع الإتصال بتور. (%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 ""
+"اتصل فيداليا بعملية تور جارية تتطلب كلمة مرور. يرجى أن تدخل كلمة مرور التحكم "
+"الخاصة بك:"
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "مقبس التحكم غير متصل."
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "خطأ في إرسال أمر تحكم. [%1]"
+
+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"
+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 "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 "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "الملفات التنفيذية (*.exe)"
+
+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 "The proxy arguments specified are not properly formatted."
+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 "%1 ك.ب/ثا"
+
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr "%1 ك.ب"
+
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr "%1 م.ب."
+
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr "%1 ج.ب."
+
+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 "مساعدة ڤيداليا"
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "عودة"
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "انتقل إلى الصفحة السابقة (Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "تقدَّم"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "تقدم إلى الصفحة التالية (Shift+Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "الصفحة الرئيسية"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "اذهب إلى الصفحة الرئيسية (Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "بحث"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "ابحث عن كلمة أو عبارة في الصفحة الحالية (Ctrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "أغلق"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "أغلق مساعدة ڤيداليا"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+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 "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 "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 "تور"
+
+msgctxt "MainWindow"
+msgid "View"
+msgstr "عرض"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "مساعدة ڤيداليا"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "خطأ في إطلاق متصفح الإنترنت"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "لم يتمكن فيداليا من إطلاق المتصفح المضبوطة إعداداته"
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "خطأ في إطلاق وكيل التراسل المباشر"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "لم يتمكن فيداليا من إطلاق وكيل التراسل المباشر المضبوطة إعداداته"
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "خطأ في إطلاق مخدم الوكيل"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "لم يتمكن فيداليا من إطلاق مخدم الوكيل المضبوطة إعداداته"
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "جاري الاتصال بدليل التحويلات"
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "جاري إنشاء اتصال مشفر بالدليل"
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "استعادة حالة الشبكة"
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "تحميل حالة الشبكة"
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "تحميل شهادات السلطة"
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "جاري طلب معلومات التحويلة"
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "جاري تحميل معلومات التحويلة"
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "جاري الاتصال بشبكة تور"
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "إنشاء دائرة تور"
+
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr "تم الاتصال بشبكة تور"
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "لم بتم التعرف على حالة بدء التشغيل"
+
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr "متفرقات"
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "لم تتطابق الهوية"
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr "تم"
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "تم رفض الاتصال"
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "الاتصال عاطل"
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "خطأ في القراءة/الكتابة"
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "لا طريق للمضيف"
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "الموارد غير كافية"
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "غير معروف"
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "تور غير مشغل"
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "جاري إغلاق تور"
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "أوقف تور الآن"
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr "أوقف تور"
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "جاري بدء تشغيل برنامج تور"
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "بدء تشغيل تور"
+
+msgctxt "MainWindow"
+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."
+msgstr ""
+"تعذَّر على ڤيداليا تشغيل تور. تفحص إعداداتك للتأكد من صحة تحديد اسم وموضع "
+"ملف تور التنفيذي."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "جار الاتصال بتور"
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "خطأ في الاتصال"
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "التحويل مفعل"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "خطأ في إيقاف التشغيل"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "فيداليا لم يتمكن من إيقاف برنامج تور"
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "خطأ غير متوقع"
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "جار المصادقة إلى تور"
+
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "مطلوب المصادقة على الكعكات (cookies)"
+
+msgctxt "MainWindow"
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgstr ""
+"برنامج تور يتطلب من فيداليا إرسال محتويات كعكة التصديق ولكن لم يتمكن فيداليا "
+"من إيجادها."
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "هل تود بالتصفح لإيجاد ملف 'control_auth_cookie' بنفسك؟"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "دليل البيانات"
+
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "كعكة التحكم (control_auth_cookie)"
+
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "خطأ في تسجيل الأحداث"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+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 "يتوفر تحديث لتور"
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr ""
+"إصدار تور المنصب حالياً قديم أو لاينصح به بعد الآن. يرجى زيارة موقع تور "
+"لتنزيل آخر إصدار."
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "موقع تور %1"
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "ستبدو كل الاتصالات اللاحقة مختلفة عن الاتصالات السابقة."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "تعذَّر إنشاء هوية جديدة"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "فشل تقديم المدخل"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "لم يتمكن فيداليا من ضبط إعدادات تقديم المدخل."
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+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 "إخفاء هذه النافذة"
+
+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 "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 ""
+"يبدو أن أحد تطبيقاتك %1 يتصل بشكل غير مشفر بالمدخل %2. أي شيء يرسل عبر هذا "
+"الاتصال يمكن أن تتم مراقبته. يرجى التحقق من إعدادات التطبيق واستخدام "
+"البروتوكولات المشفرة حصراً، مثل SSL، إن أمكن."
+
+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 "failed (%1)"
+msgstr "فشل (%1)"
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+"جار إيقاف تحويلتك.\n"
+"يرجى النقر على \"إيقاف\" مرة أخرى لتوقف تحويلتك الآن."
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
+"أنت حالياً تشغل تحويلة. إيقاف هذه التحويلة سيقاطع أي اتصالات مفتوحة من "
+"العملاء.\n"
+"\n"
+"هل تود إيقاف التحويلة ببطء لإعطاء العملاء وقتاً كافياُ للبحث عن تحويلة "
+"جديدة؟"
+
+msgctxt "MainWindow"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr ""
+"فيداليا وجد أن برنامج تور توقف عن العمل بشكل مفاجئ.\n"
+"\n"
+"يرجى التحقق من سجل الرسائل للتحذيرات أو رسائل الخطأ الحديثة."
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr "، غالباً Telnet، "
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr "، غالباً وكيل بريد إلكتروني، "
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "ڤيداليا"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr "ملف"
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "عن ڤيداليا"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "الصفحة الرئيسية"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr "تحقق من وجود تحديثات"
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "عُطل في ضبط الفلتر"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "تعذّر على ڤيداليا التسجيل لسجل أحداث تور."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "عُطل في فتح ملف السجِّل"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "تعذّر على ڤيداليا فتح ملف السّجل المذكور."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "اسم ملف السّجل مطلوب"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "يجب إدخال اسم ملف ليمكن حفظ مدخلات السّجل فيه."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "اختر ملف السجِّل"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "احفظ رسائل السجِّل"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "ملفات نصية (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "ڤيداليا"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "بحث في سِجِّل الرسائل"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "بحث:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "لا يوجد"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "البحث وجد 0 نتيجة مطابقة"
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "سِجِّل الرسائل"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "فلاتر الرسائل..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "ضبط فلاتر الرسائل"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "حجم التاريخ..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "تحديد أقصى عدد يعرض من الرسائل"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "مسح"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "مسح كل الرسائل من سِجِّل الرسائل (Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "نسخ"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "نسخ الرسائل المختارة إلى لوح القصاصات (Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "اختر الكل"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "اختيار كل الرسائل (Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "حفظ الكل"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "حفظ كل الرسائل في ملف"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "حفظ المختارة"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "حفظ الرسائل المختارة في ملف"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "إعدادات"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "تعديل إعدادات سِجِّل الرسائل"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "مساعدة"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "أظهر متصفح المساعدة"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "إغلاق"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "إغلاق سِجِّل الرسائل"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "بحث"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "جد كل الرسائل المحتوية على نص البحث (Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "الوقت"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "النوع"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "الرسالة"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "حفظ إعدادات سجل الرسائل الحالية"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "حفظ الإعدادات"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "إلغاء التغييرات في الإعدادات"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "إلغاء"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "فلتر الرسائل"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "خطأ"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "تحذير"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "تنبيه"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "معلومات"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "تشخيص المشاكل"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "تاريخ سّجل الرسائل"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "عدد الرسائل المعروضة في نافذة سِّجل الرسائل"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "رسائل"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log 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 "Messages that appear when something has \n"
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+"الرسائل التي تظهر عندما يحصل \n"
+"شيء ما بشكل خاطئ جداً ولا يستطيع تور المتابعة."
+
+msgctxt "MessageLog"
+msgid "Messages that only appear when \n"
+"something has gone wrong with Tor."
+msgstr ""
+"الرسائل التي تظهر فقد عندما \n"
+"يحصل شيء خطأ في تور."
+
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently \n"
+"during normal Tor operation and are \n"
+"not considered errors, but you may \n"
+"care about."
+msgstr ""
+"الرسائل التي تظهر بشكل قليل \n"
+"أثناء تشغيل تور بشكل طبيعي ولا \n"
+"يعتبرن أخطاء، ولكن يمكن \n"
+"أن يهموك."
+
+msgctxt "MessageLog"
+msgid "Messages that appear frequently \n"
+"during normal Tor operation."
+msgstr ""
+"الرسائل التي تظهر بشكر متكرر \n"
+"أثناء تشغيل تور بشكل طبيعي."
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+"رسائل مطولة جداً تهم مطوري \n"
+"تور بشكل رئيسي."
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+"لا يمكن كتابة الملف %1\n"
+"\n"
+"%2."
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "خريطة شبكة تور"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "تحديث"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "تحديث قائمة تحويلات ووصلات تور"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "مساعدة"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "إظهار المساعدة الخاصة بخريطة الشبكة"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "إظهار مساعدة خريطة الشبكة"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "إغلاق"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "إغلاق خريطة الشبكة"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "تكبير"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "كبّر خريطة الشبكة"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "تصغير"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "تصغير خريطة الشبكة"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "ملء النافذة"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "يملأ المنظور بكل الدوائر الظاهرة حاليا"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "لم يتم العثور التحويلة"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr "لا تتوفر تفاصيل حول التحويلة المختارة."
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "غير معروف"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr "عرض على كامل الشاشة"
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr "استعراض خريطة الشبكة على كامل الشاشة"
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+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."
+msgstr ""
+"يجب أن تحدد عنوان IP أو اسم مضيف ورقم مدخل لضبط إعدادات تور لاستخدام وكيل "
+"(بروكسي) للوصول إلى الإنترنت."
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "يجب أن تحدد مدخلاً واحداً أو أكثر يسمح لك الجدار الناري بالاتصال بهم."
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' ليس رقماً صالحاً."
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr "تحقق إذا كانت شبكتك المحلية تتطلب وكيلاً (بروكسي) للاتصال بالإنترنت"
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "أستخدم وكيل (بروكسي) للاتصال بالإنترنت"
+
+msgctxt "NetworkPage"
+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 "كلمة السر:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "مدخل:"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr "اختر لتتصل فقط عبر تحويلات تستخدم المداخل التي يسمح بها جدارك الناري"
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "جداري الناري يسمح لي بالاتصال بمداخل معينة فقط"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "إعدادات الجدار الناري"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "المداخل المسموحة:"
+
+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 ""
+"اختر لتشفر طلبات الدليل و -اختيارياً- تستخدم تحويلات الجسور للوصول إلى شبكة "
+"تور"
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "مزود خدمة الإنترنت الخاص بي يحجب الاتصال بشبكة تور"
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr "إعدادات الجسر"
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+"برنامج تور الذي تستخدمه حالياً لا يدعم الجسور. <br>سيبقى دليل الوصلات "
+"مشفراً."
+
+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 "إزالة الجسور المختارة من القائمة"
+
+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 "Policy"
+msgid "accept"
+msgstr "قبول"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "رفض"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "متصل"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "في وضع السبات"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "مفصول"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "الموضع:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "عنوان IP:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "المنصة:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "عرض الحزمة:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "مدة الاتصال:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "آخر تحديث:"
+
+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:"
+msgstr "الحالة:"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "الموضع:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "عنوان IP:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "المنصة:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "عرض الحزمة:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "مدة الاتصال:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "بيانات الاتصال:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "آخر تحديث:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr "الواصف"
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "مفصول"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "في وضع السبات"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 ك.ب/ث"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "تحويلة"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "كبّر إلى التحويلة"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 تحويلات فاعلة"
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "نسخ"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "الاسم المستعار"
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "البصمة"
+
+msgctxt "ServerPage"
+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."
+msgstr ""
+"يجب أن تضبط إعدادات تور ليتصرف على أنه تحويلة جسر للمستخدمين المحجوبين، ولكن "
+"نسخة تور الخاصة بك لا تدعم الجسور."
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "يرجى تحديث برنامج تور أو ضبط تور ليعمل على أنه تحويلة تور عادية."
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "تحويلة الجسر الخاصة بك لا تعمل."
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "يجب أن تختار اسما مستعاراً للتحويلة ورقم مدخل."
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "تشغيل كعميل فقط."
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "تمرير تدفقات شبكة تور"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "مدخل التحويلة:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "فعل عكس (mirror) دليل التحويلة"
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "حاول ضبط تقديم المدخل بشكل أوتوماتيكي"
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "فحص"
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "أظهر موضوع المساعدة حول تقديم المدخل"
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "مدخل الدليل:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "رقم مدخل الدليل"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "بيانات الاتصال:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "اسم تحويلتك"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "المدخل الذي يتواصل عبر المستخدمون والتحويلات الأخرى مع تحويلتك"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "الاسم المستعار:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "إعدادات أساسية"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr ""
+"لوصلات الإنترنت ذات سرعة التنزيل الكبيرة وسرعة رفع صغيرة، يرجى ذكر سرعة "
+"الرفع المتاحة هنا."
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "كابل/ديإسإل 256 ك.بت/ثا"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "كابل/ديإسإل 512 ك.بت/ثا"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "كابل/ديإسإل 768 ك.بت/ثا"
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/كابل/ديإسإل 1.5 م.بت/ثا"
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 1.5 م.بت/ثا"
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "مخصص"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "اختر أقرب ما يماثل اتصال الإنترنت الخاص بك"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "عرض موضوع المساعدة عن حدود معدل عرض الحزمة"
+
+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 ""
+"يجب أن يكون أكبر معدل عرض حزمة مساوياً أو أكبر من المعدل الوسطي لعرض الحزمة؛ "
+"و كلا القيمتين يجب أن تكونا 20 ك.بايت/ثا على الأقل."
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "حدود عرض الحزمة"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "المداخل 6660 - 6669 و 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "دردشة إنترنت بالتمرير (IRC)"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "المداخل 110 و 143 و 993 و 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "جلب البريد (POP و IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "مداخل لم يتم تحديدها في مربعات التأشير الأخرى"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "خدمات أخرى متنوعة"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "المداخل 706 و 1863 و 5050 و 5190 و 5222 و 5223 و 8300 و 8888"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "التراسل الفوري (IM)"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "المدخل 443"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "المواقع المؤمنة (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "المدخل 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "المواقع"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "عرض موضوع المساعدة حول سياسات المخرج"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr ""
+"ما هي موارد الإنترنت التي يجب أن يتمكن المستخدمون من الوصول إليها من "
+"تحويلتك؟"
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr ""
+"تور سيستمر بحجب بعض تطبيقات البريد الصادر وتشارك الملفات بشكل تلقائي للتخفيف "
+"من السخام (spam) وإساءات الاستخدام الأخرى."
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "سياسة المَخرج"
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr "دع الآخرين يصلون إلى جسرك بإعطائهم السطر التالي:"
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "هذه هوية تحويلة الجسر الخاص بك والتي يمكنك إعطاؤها للمستخدمين الآخرين"
+
+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 "تعذّر على ڤيداليا استعادة تاريخ استخدام الجسر الخاص بك."
+
+msgctxt "ServerPage"
+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"
+
+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 "Mirror the Relay Directory"
+msgstr "عكس (mirror) دليل التحويلات"
+
+msgctxt "ServerPage"
+msgid "Email address at which you may be reached if there is a\n"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr ""
+"عنوان البريد الذي يمكن الاتصال بك عبره في حال وجدت\n"
+"مشكلة في تحويلتك. يمكنك أيضاً تضمين بصمة PGP أو GPG الخاصة بك."
+
+msgctxt "ServicePage"
+msgid "Error while trying to unpublish all services"
+msgstr "خطأ أثناء محاولة إلغاء نشر جميع الخدمات"
+
+msgctxt "ServicePage"
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
+msgstr ""
+"يرجى ضبط خدمة الدليل ومدخل افتراضي على الأقل لكل خدمة تريد حفظها. احذف "
+"الآخرين."
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "خطأ"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "يرجى اختيار خدمة."
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "اختر دليل خدمة"
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "يمكن للمدخل الافتراضي أن يحتوي على أرقام مدخل صالحة فقط [1..65535]."
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "الهدف يمكن فقط أن يحتوي عنوان:مدخل، عنوان، أو مدخلز"
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr "الدليل مستعمل بشكل مسبق في خدمة أخرى"
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "استمارة"
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr "الخدمات الموفرة المخفية"
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "عنوان البصلة"
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "المدخل الافتراضي"
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "الهدف"
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "مسار الدليل"
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "مفعل"
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "أضف خدمة جديدة إلى القائمة"
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "حذف الخدمات المختارة من القائمة"
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr "نسخ عنوان البصلة الخاص بالخدمات المختارة إلى لوح القصاصات"
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr "التصفح في نظام الملفات المحلي لاختيار دليل للخدمات المختارة"
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "أنشئ بواسطة تور"
+
+msgctxt "Stream"
+msgid "New"
+msgstr "جديد"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "جار الحل"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "جار الاتصال"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "مفتوح"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "فشل"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "مغلق"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "تجري إعادة المحاولة"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "تم إعادة رسم الموقع"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "غير معروف"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "تعذَّر إيقاف العملية %1. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "خدمة تور غير منصّبة."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "غير قادر على بدء تشغيل خدمة تور."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "فشل في حل كلمة سر التحكم."
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "نجاح"
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "لم يتم إيجاد أجهزة قادرة على UPnP"
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "لم يتم إيجاد بوابات إنترنت قادرة على UPnP"
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "فشل WSAStartup"
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "فشل في إضافة رسم المداخل (mapping)"
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "فشل في استعادة رسم (mapping) مدخل"
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "فشل في إزالة رسم (mapping) مدخل"
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "خطأ غير معروف"
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "اكتشاف الأجهزة القادرة على UPnP"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "تحديث دليل رسم المداخل (mapping)"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "تحديث رسم (mapping) مدخل التحويلة"
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "تم إكمال الإختبار بنجاح!"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "اختبار دعم UPnP"
+
+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 ""
+"لم يتمكن فيداليا من التحقق من وجود تحديثات للبرنامج لأنه لم يتمكن من إيجاد "
+"'%1'."
+
+msgctxt "UpdateProcess"
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgstr ""
+"لم يتمكن فيداليا من التحقق من وجود تحديثات للبرنامج لأن عملية تحديث تور "
+"أغلقت بشكل غير متوقع."
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for available updates..."
+msgstr "جاري التحقق من وجود التحديثات..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Hide"
+msgstr "إخفاء"
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr "جاري تنزيل التحديثات..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr "جاري تنصيب البرنامج المحدّث"
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr "انتهى التنصيب! تم تحديث البرامج بنجاح."
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr "موافق"
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr "تحديثات البرامج"
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr "جاري التحقق من وجود التحديثات"
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr "إلغاء"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr "هناك تحديثات للبرامج"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr "ذكرني لاحقاً"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr "تنصيب"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr "حزمات التحديث البرمجية التالية جاهزة للتنصيب:"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr "حزمة"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr "إصدار"
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "موافق"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "إلغاء"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "نعم"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "لا"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "مساعدة"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "حاول مجددا"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "استعرض السِّجِل"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "استعرض الإعدادات"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "متابعة"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "إنهاء"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "تصفّح"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "مُعطى غير صحيح"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "ڤيداليا يعمل بشكل مسبق"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "يعرض رسالة الاستخدام هذه وينهي."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "يصفِّر كل إعدادات ڤيداليا."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "يحدد الدليل الذي تستخدمه ڤيداليا لتخزين ملفات البيانات."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "يحدد اسم و موضع ملف pidfile لڤيداليا."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "يحدد اسم و موضع ملف سِجِّل ڤيداليا."
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "يحدد مدى تفصيل سِجِّل ڤيداليا."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "يحدد شكل واجهة ڤيداليا."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "يحدد لغة واجهة ڤيداليا."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "معلومات استخدام ڤيداليا."
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "تعذَّر فتح ملف السِّجل '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr "كود اللغة المحدد غير صحيح:"
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr "شكل واجهة المستخدم المحدد غير صالح:"
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr "مستوى السجل المحدد غير صالح:"
+
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+"إحتمال وجود نسخة أخرى من فيداليا تعمل مسبقاً. إذا كان فعلاً لاتوجد نسخة أخرى "
+"تعمل، يمكن إختيار المتابعة على أي حال.\n"
+"\n"
+"هل تريد مواصلة بدء تشغيل فيداليا؟"
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr "%1 ثوان"
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr "%1 ب/ثا"
+
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr "%1 ك.ب/ثا"
+
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr "%1 م.ب/ثا"
+
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
+msgstr "%1 ج.ب/ثا"
+
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr "%1 أيام"
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr "%1 ساعات"
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr "%1 دقائق"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bg/qt_bg.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bg/qt_bg.po
new file mode 100644
index 0000000..59a71d4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bg/qt_bg.po
@@ -0,0 +1,430 @@
+msgid ""
+msgstr ""
+"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: 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"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bg/vidalia_bg.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bg/vidalia_bg.po
new file mode 100644
index 0000000..d2cb375
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bg/vidalia_bg.po
@@ -0,0 +1,3292 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2009-12-30 05:43-0700\n"
+"Last-Translator: Kouber Saparev <kouber at gmail.com>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Относно Видалия"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Vidalia 0.2.0"
+msgstr "Видалия 0.2.0"
+
+msgctxt "AboutDialog"
+msgid "Tor 0.2.0.32"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Qt 4.4.2"
+msgstr "4.4.2"
+
+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."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Избери конфигурационен файл на Тор"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Файлът не е намерен"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 не съществува. Искате ли да го създадете?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Неуспешно създаване на файл"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "Невъзможност за създаване на %1 [%2]"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "Автентикация:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Адрес:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Бисквитка"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Парола"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "Случайно генериране"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Конфигурационен файл на Тор"
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "Стартиране на Тор с указания конфигурационен файл (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 ""
+
+msgctxt "AdvancedPage"
+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"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Език"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Избери език ползван във Видалиа"
+
+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 ""
+
+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 ""
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr "Свързване с %1:%2..."
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr ""
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "Нов"
+
+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 "<Path Empty>"
+
+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 ""
+
+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 ""
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr ""
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Грешка при изпращане на контролна команда. [%1]"
+
+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"
+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 "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 "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Изпълними (*.exe)"
+
+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 "The proxy arguments specified are not properly formatted."
+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 "%1 КБ/с"
+
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr "%1 КБ"
+
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr "%1 МБ"
+
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr "%1 ГБ"
+
+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 "Видалиа Помощ"
+
+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 "Търси за дума или фраза в страницата (Контрол+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+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 "Case sensitive"
+
+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 "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 "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor"
+msgstr "Тор"
+
+msgctxt "MainWindow"
+msgid "View"
+msgstr "Изглед"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Видалиа Помощ"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+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."
+msgstr "Видалиа не успя да стартира Тор. Проверете опциите си за да проверите дали е зададено правилно местоположението на Тор."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Control 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."
+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 ""
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "Всички последващи връзки ще изглеждат различни от старите ви връзки."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "Неуспех при създаване на Нова Самоличност"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+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 ""
+
+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 "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 "Провалени"
+
+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 "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+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 ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Видалиа"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "Относно Видала"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Начало"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Грешка при прилагане на филтър"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Видалиа не успя да регистрира Тор лог събития."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "Грешка приотваряне на Лог файл"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Видалиа не успя да отвори лог файла."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Избери Лог файл"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Запази Лог съобщения"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Текстови файлове (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Видалиа"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Намери в Съобщения Лог"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Намери:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Не е намерен"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "Търсенето намери 0 попадения."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Съобщения Лог"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Съобщение Филтри..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Настрий филтри са Съобщение"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "История големина..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Определи макс. брой съобщения за показване"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Изчисти"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Изчиства всички съобщения от Съобщения Лог (Контрол+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Копирай"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Копира избраните съобщения в клипборда (Контрол+С)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+С"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Избери всичко"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Избира всички съобщения (Контрол+АІ"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Контрол+А"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Запиши всичко"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Записва всички съобщения във файл"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Запиши избраните"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Записва избраните съобщения във файл"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Опции"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Промени Съобщение Лог настройки"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Помощ"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Покажи помощен броузър"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Затвори"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Затвори Съобщения Лог"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Ескейп"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Намери"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Намери всички съобщения съдържащи търсеният текст (Контроол+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Време"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Тип"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Съобщение"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Запазва сегашните опции за Съобщения Лог"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Запази Опции"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Отказва промените направени в опциите"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Отказ"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Съобщения филтър"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Грешка"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Предупреждение"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Съобщение"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Инфо"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Дебъг"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Always Save New Log 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 "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."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Опресни"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Помощ"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Показва помоща за мрежовата карта"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Показва помоща за мрежовата карта"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Затвори"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Затвори мрежовата карта"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Ескейп"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Приближи"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Приближи върху мрежовата карта"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Отдалечи"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Оталечи от мрежовата карта"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Нагоди изгледа"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Нагоди изгледада показва всички вериги"
+
+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 "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 ""
+
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+msgctxt "NetworkPage"
+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 ""
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+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 ""
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+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 ""
+
+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 "Policy"
+msgid "accept"
+msgstr "приеми"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "откажи"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Онлайн"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Хибернира"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Офлайн"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Местоположение:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "IP адрес:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Платформа:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Трансфер:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Ъптайм:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Последен Ъпдейт:"
+
+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:"
+msgstr "Статистика"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "Местоположение:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "IP адрес:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "Платформа:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "Трансфер:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "Ъптайм:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "Контект информация:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "Последен Ъпдейт:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Офлайн"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Хибернира"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 КБ/с"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Копирай"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr ""
+
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Предавай трафик за Тор мрежата"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Директория Порт:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Директория Порт Номер"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Контект информация:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Псевдоним:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Покажи помощ за ограничение на трансферната норма"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Средна норма"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Дългосрочен среден трансфер - лимит"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "КБ/с"
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Максимална норма"
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "Пикова трансферна норма - лимит"
+
+msgctxt "ServerPage"
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "Покажи помщ за изходни политики"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Изход Политика"
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+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 "Видалиа не успя да регистрира Тор лог събития."
+
+msgctxt "ServerPage"
+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 ""
+
+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 "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 ""
+
+msgctxt "ServicePage"
+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."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Грешка"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+msgctxt "Stream"
+msgid "New"
+msgstr "Нов"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Анализира"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Свързва"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "Отворен"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Провал"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Затворен"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Повторение"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Неизвестно"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "Процес %1 не успя да спре. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+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 ""
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "ОК"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Отказ"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Да"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Не"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Помощ"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Повтори"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Покажи Лог"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Покажи опции"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Разлисти"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Видалиа вече работи"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr "%1 Б/с"
+
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr "%1 КБ/с"
+
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr "%1 MБ/с"
+
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
+msgstr "%1 GБ/с"
+
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bms/qt_bms.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bms/qt_bms.po
new file mode 100644
index 0000000..0e23a44
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bms/qt_bms.po
@@ -0,0 +1,431 @@
+msgid ""
+msgstr ""
+"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-02-24 13:22-0500\n"
+"Last-Translator: Matthew Edman <edmanm at vidalia-project.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"
+"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 ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bms/vidalia_bms.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bms/vidalia_bms.po
new file mode 100644
index 0000000..875ce8c
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bms/vidalia_bms.po
@@ -0,0 +1,2776 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\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-11-03 21:56-0700\n"
+"Last-Translator: carolyn anhalt <carolyn at anhalt.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"
+"X-Generator: Pootle 1.1.0\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Vidalia အေၾကာင္း"
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "Qt"
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Tor"
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr "မရွိ"
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr "အလုပ္မလုပ္ပါ"
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr "0.2.0"
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr "0.2.0.31-alpha-dev (r123456)"
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr "4.4.2"
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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' ဆိုသည္မွာ အိုင္ပီလိပ္စာ ပံုစံမဟုတ္ပါ"
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+"'Password' ျဖင့္သာဝင္ရန္ဟုေရြးထားေသာ္လည္း၊ သင့္အေနျဖင့္ 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 "ထိန္းခ်ဳပ္ port"
+
+#: 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 "Tor ျပင္ဆင္ေရးဖိုင္"
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "ေရြးထားေသာ ျပင္ဆင္မွဳဖိုင္ (torrc) ျဖင့္ Tor အားစတင္ရန္"
+
+#: 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 "Tor software ၏ေဒတာမ်ားအား ေဖာ္ျပပါ ေနရာတြင္သိမ္းပါ"
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr "ေအာက္ေဖာ္ျပပါ ေနရာအား Tor software ၏ေဒတာမ်ားသိမ္းစည္းရန္ေရြးပါ"
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "ဘာသာစကား"
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Vidalia တြင္သံုးရန္ ဘာသာစကားကိုေရြးပါ"
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "စတိုင္"
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Vidalia ေရွ႕မ်က္ႏွာစာစတိုင္အားေရြးခ်ယ္ရန္"
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr "Vidalia အေနျဖင့္ေရြးခ်ယ္ထားေသာ ဘာသာစကားအားေဖာ္ျပ၍မရပါ။"
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr "ကတည္းက:"
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Setting မ်ားအား သိမ္းထားရန္"
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Setting မ်ားအားျပရန္"
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Tor bandwidth အသံုးျပဳမွဳအေျခအေန"
+
+#: 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 "Bandwidth ဇယား၏ ေဖာက္ထြင္းျမင္ႏိုင္မွဳ အားေျပာင္းသည္။"
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "၁၀၀"
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% ေဖာင္ထြင္းျမင္ေနရသည္"
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "သိမ္းရန္"
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "ထြက္ရန္"
+
+#: circuit.cpp:112
+msgctxt "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
+#, fuzzy
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Path Empty>"
+
+#: 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 "ပတ္လမ္းကို ပိတ္ပါ (Del)"
+
+#: 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 "setting မ်ားသိမ္းရာတြင္ error တတ္သည္"
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr "Vidalia အေနျဖင့္သင့္ %1 setting မ်ားအားမသိမ္းႏိုင္ပါ။"
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "setting မ်ားသိမ္းရာတြင္ error တတ္သည္"
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia အေနျဖင့္သင့္ Tor %1 setting မ်ားအားမသိမ္းႏိုင္ပါ။"
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "ထိန္းညိွမွဳ (setting)"
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Vidalia အေနျဖင့္ Tor အားခ်ိတ္ဆက္လို႔မရပါ။ (%1)"
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "ထိန္းခ်ဳပ္မွဳ socket အားခ်ိတ္ဆက္၍မရပါ။"
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "လွ်ိဳ႕ဝက္ကုဒ္လိုအပ္သည္"
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+msgstr ""
+"Vidalia အေနျဖင့္ Tor ျဖင့္ခ်ိတ္ဆက္မိျပီး အသံုးျပဳရန္အတြက္ "
+"လွ်ိဳ႕ဝက္ကုဒ္လိုအပ္သည္။ လွ်ိဳ႕ဝက္ကုဒ္အားရိုက္ထည့္ရန္။"
+
+#: controlpasswordinputdialog.ui:99
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
+msgstr "ကၽြႏု္ပ္ လွ်ိဳ႕ဝက္ကုဒ္အားမွတ္ထားရန္"
+
+#: controlsocket.cpp:70
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "ထိန္းခ်ဳပ္မွဳ socket အားမခ်ိတ္ဆက္ထားပါ။"
+
+#: controlsocket.cpp:80
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "control command ပို႔ရာတြင္ အယ္ရာတတ္သည္။ [%1]"
+
+#: controlsocket.cpp:117
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr "ေဒတာတစ္ေၾကာင္းအားဖတ္ရန္ၾကိဳးစားရာတြင္ Socket ခ်ိတ္ဆက္မွဳျပတ္သြားသည္။"
+
+#: controlsocket.cpp:156
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "မွားေနေသာ ထိန္းခ်ဳပ္မွဳျပန္ၾကားခ်က္"
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "exe ဖုိင္မ်ား"
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Tor အတြက္လမ္းေၾကာင္းေရြးခ်ယ္ရန္"
+
+#: generalpage.cpp:85
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "လုပ္ေဆာင္ႏုိင္ေသာ Proxy ကုိ ေရြးခ်ယ္ပါ"
+
+#: generalpage.cpp:98
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr "သင္၏ လုပ္ေဆာင္ႏိုင္ေသာ Tor ကုိ အမည္ သတ္မွတ္ေပးပါ"
+
+#: generalpage.cpp:106
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr "ေဖာ္ျပထားေသာ Proxy အခ်က္အလက္မ်ားမွာ မွန္ကန္ေသာ ပံုစံမ်ား မဟုတ္ပါ"
+
+#: generalpage.ui:28
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr "Vidalia ကုိ စနစ္စတင္ခ်ိန္တြင္ စတင္ပါ"
+
+#: generalpage.ui:121
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr "Browse"
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Tor ေဆာ့ဝဲကို Vidalia စတင္ခ်ိန္တြင္ စတင္ပါ"
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "Tor"
+msgstr "Tor"
+
+#: generalpage.ui:93
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr "Proxy Application (ေရြးခ်ယ္ႏုိင္ပါသည္)"
+
+#: generalpage.ui:99
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "Proxy application ကို Tor စတင္ခ်ိန္တြင္ စတင္ပါ"
+
+#: generalpage.ui:135
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Proxy Application ၏အခ်က္အလက္မ်ား :"
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr "လက္ခံရရွိ: "
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+msgid "Sent: "
+msgstr "ပို႕လႊတ္မႈ: "
+
+#: graphframe.cpp:259
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr "%1 KB"
+
+#: graphframe.cpp:262
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr "%1 MB"
+
+#: graphframe.cpp:265
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr "%1 GB"
+
+#: 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 "ေပးထားေသာ XML ဖိုင္သည္ မွန္ကန္ေသာ ဖိုင္ပံုစံမဟုတ္ပါ။"
+
+#: 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 "ရလဒ္ %1 ေတြ႔သည္"
+
+#: helpbrowser.ui:33
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Vadalia အကူ"
+
+#: helpbrowser.ui:484
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "ေနာက္သို႔"
+
+#: helpbrowser.ui:487
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "ယခင္စာမ်က္ႏွာသို႔သြားပါ (Backspace)"
+
+#: 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 "ေနာက္ထပ္စာမ်က္ႏွာတစ္ခုသို႕ သြားပါ (Shict+Backspace)"
+
+#: helpbrowser.ui:504
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+#: helpbrowser.ui:512
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "မူလစာမ်က္ႏွာ"
+
+#: helpbrowser.ui:515
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "မူလစာမ်က္ႏွာသို႕ သြားပါ (Ctrl+H)"
+
+#: helpbrowser.ui:518
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+#: 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 ""
+"စာလံုးတစ္ခု သို႕မဟုတ္ စာစုတစ္ခုကုိ လက္ရွိစာမ်က္ႏွာတြင္ ရွာေဖြရန္ (Ctrl+F)"
+
+#: helpbrowser.ui:541
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+#: helpbrowser.ui:549
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "ပိတ္ပါ"
+
+#: helpbrowser.ui:552
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Vidalia အကူအညီကုိ ပိတ္ပါ"
+
+#: helpbrowser.ui:555
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+#: helpbrowser.ui:152
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "ရွာပါ:"
+
+#: helpbrowser.ui:174
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "ေရွ႕သို႕ ျပန္ရွာရန္"
+
+#: helpbrowser.ui:187
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "ေနာက္ထပ္ရွာေဖြရန္"
+
+#: helpbrowser.ui:221
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "စာလံုးအၾကီးအသးႏွင့္အတိအက်"
+
+#: helpbrowser.ui:231
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "စာသားတစ္ခုလံုးႏွင့္သာ"
+
+#: helpbrowser.ui:305
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "ကူညီမႈ အေၾကာင္းအရာမ်ား"
+
+#: helpbrowser.ui:260
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "ပါဝင္သည့္ အခ်က္အလက္မ်ား"
+
+#: helpbrowser.ui:350
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "ရွာေဖြပါ"
+
+#: helpbrowser.ui:362
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "ရွာေဖြရန္ :"
+
+#: helpbrowser.ui:405
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "ေတြ႕ရိွသည့္ စာရြက္စာတမ္းမ်ား"
+
+#: helptextbrowser.cpp:54
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file: "
+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."
+msgstr ""
+"Vidalia သည္ သင္ေရြးခ်ယ္ထားေသာ ခ်ိတ္ဆက္မႈကို ပံုေသ Web browser တြင္ "
+"ဖြင့္လွစ္ႏိုင္ပါသည္။ အကယ္၍ သင္၏ browser သည္ Tor အသံုးျပဳရန္ "
+"ျပင္ဆင္သတ္မွတ္ထားျခင္း မရွိပါက ေတာင္းဆုိမႈသည္ အမည္မသိ ျဖစ္ႏုိင္မည္ မဟုတ္ပါ"
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr "Vidalia မွ သင္၏ web browser တြင္ ခ်ိတ္ဆက္မႈကုိ ဖြင့္လွစ္ေစလုိပါသလား ?"
+
+#: 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 ""
+"Vidalia သည္ သင္ေရြးခ်ယ္ထားေသာ ခ်ိတ္ဆက္မႈကို Web browser တြင "
+"မဖြင့္လွစ္ႏုိင္ပါ။ URL ကုိ သင္၏ browser တြင္ ေကာ္ပီကူးယူ "
+"ျပန္ပြားယူႏိုင္ေသးပါသည္။"
+
+#: 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 "Debug"
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "သတင္းအခ်က္အလက္"
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "သတိျပဳရန္"
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "သတိေပးခ်က္"
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "မွားယြင္းမႈ"
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "အမည္မသိ"
+
+#: mainwindow.ui:233
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "Tor ကုိ စတင္ပါ"
+
+#: mainwindow.ui:443
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "ထြက္ပါ"
+
+#: mainwindow.ui:304
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Bandwidth ျပ ဇယားပံု"
+
+#: mainwindow.ui:317
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "သတင္းေပးပို႕မႈ မွတ္တမ္း"
+
+#: mainwindow.cpp:348
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Netowrk ေျမပံု"
+
+#: 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 "Ctrl+T"
+
+#: mainwindow.cpp:438
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+#: mainwindow.cpp:439
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+#: mainwindow.cpp:440
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+#: mainwindow.cpp:441
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+#: mainwindow.cpp:442
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+#: mainwindow.cpp:443
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: 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 "Vidalia အကူအညီ"
+
+#: mainwindow.cpp:527
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "Web browser စတင္ရာတြင္ မွားယြင္းမႈ"
+
+#: mainwindow.cpp:528
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia မွ ျပင္ဆင္သတ္မွတ္ထားေသာ Web browser ကို မစတင္ႏုိင္ပါ"
+
+#: mainwindow.cpp:540
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "IM client ကုိ စတင္ရာတြင္ မွားယြင္းမႈ"
+
+#: mainwindow.cpp:541
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "Vidalia သည္ ျပင္ဆင္သတ္မွတ္ထားေသာ IM client ကုိ မစတင္ႏုိင္ပါ"
+
+#: mainwindow.cpp:562
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Proxy server စတင္ရာတြင္ မွားယြင္းမႈ"
+
+#: mainwindow.cpp:563
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia သည္ ျပင္ဆင္သတ္မွတ္ထားေသာ Proxy server ကို မစတင္ႏုိင္ပါ"
+
+#: mainwindow.cpp:579
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Relay directory ကုိ ဆက္သြယ္ေနပါသည္"
+
+#: mainwindow.cpp:583
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "Encrypt ျပဳလုပ္ထားေသာ Directory ဆက္သြယ္မႈ တစ္ခုကုိ ထုတ္လႊတ္ေနပါသည္။"
+
+#: mainwindow.cpp:586
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "Network အေျခအေနကို ျပန္လည္ ရယူေနပါသည္"
+
+#: mainwindow.cpp:589
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "Network အေျခအေနကုိ တင္ယူေနပါသည္"
+
+#: mainwindow.cpp:592
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "မွန္ကန္ေၾကာင္းစစ္ေဆးအသိအမွတ္ျပဳမႈ တင္ယူေနပါသည္"
+
+#: mainwindow.cpp:595
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "Relay သတင္းအခ်က္အလက္မ်ား ေတာင္းဆိုေနပါသည္"
+
+#: mainwindow.cpp:598
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "Relay သတင္းအခ်က္အလက္မ်ား တင္ယူေနပါသည္"
+
+#: mainwindow.cpp:1132
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "Tor Network ကို ဆက္သြယ္ေနပါသည္"
+
+#: mainwindow.cpp:605
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "Tor ပတ္လမ္းတစ္ခု ထုတ္လႊတ္ေနပါသည္"
+
+#: mainwindow.cpp:1297
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr "Tor Network သို႕ ခ်ိတ္ဆက္မႈရပါသည္ !"
+
+#: 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 "Host သုိ႕ လမ္းေၾကာင္းမရွိပါ"
+
+#: 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 " မေအာင္ျမင္ပါ (%1)"
+
+#: mainwindow.ui:168
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor အလုပ္လုပ္မေနပါ"
+
+#: mainwindow.cpp:686
+msgctxt "MainWindow"
+msgid "Your relay is shutting down."
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+"သင္၏ relay ကုိ ပိတ္သိမ္းေနပါသည္။ သင္၏ relay ကုိ ယခုပိတ္သိမ္းရန္ 'Stop' ကုိ "
+"ထပ္မံႏွိပ္ပါ"
+
+#: mainwindow.cpp:688
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "Tor ပိတ္သိမ္းေနပါသည္"
+
+#: mainwindow.cpp:693
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Tor ကုိ ယခု ရပ္တန္႕ပါ"
+
+#: mainwindow.cpp:695
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr "Tor ကုိ ရပ္တန္႕ပါ"
+
+#: mainwindow.cpp:711
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Tor ေဆာ့ဝဲ စတင္ေနပါသည္"
+
+#: mainwindow.ui:75
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "Tor ေဆာ့ဝဲ စတင္ေနပါသည္"
+
+#: mainwindow.cpp:859
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Tor စတင္မႈ ခ်ဳိ႕ယြင္းေနပါသည္"
+
+#: 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 ၏ မွန္ကန္ေသာ "
+"အမည္ႏွင့္ ေနရာကို ခ်ိန္ညိႇထားေၾကာင္း ေသခ်ာေစရန္ စစ္ေဆးပါ။"
+
+#: mainwindow.cpp:896
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "Tor သို႕ ဆက္သြယ္ေနပါသည္"
+
+#: mainwindow.cpp:906
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "ဆက္သြယ္မႈ ခ်ိဳ႕ယြင္းေနပါသည္"
+
+#: mainwindow.cpp:938
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "Relaying လုပ္ေဆာင္ႏုိင္ပါသည္"
+
+#: 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 ""
+"သင္ ယခု realy တစ္ခု လုပ္ငန္း လုပ္ေဆာင္ေနပါသည္။ Relay ကုိ ရပ္တန္႕ျခင္းသည္ "
+"သင္၏ client မ်ား ဖြင့္လွစ္ထားေသာ ဆက္သြယ္မႈမ်ားကို အေႏွာက္အယွက္ျဖစ္ေစပါမည္။ "
+"သင္ ၾကည္ျဖဴစြာ ပိတ္သိမ္းျပီး client မ်ားကို relay အသစ္ ရွာေဖြရန္ "
+"အခ်ိန္ေပးပါမည္လား ?"
+
+#: 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 "Vidalia သည္ Tor ေဆာ့ဝဲကို မရပ္တန္႕ႏိုင္ပါ"
+
+#: 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 ""
+"Vidalia မွ Tor ေဆာ့ဝဲသည္ မေမွ်ာ္လင့္ဘဲ ပိတ္သိမ္းသြားသည္ကုိ ေတြ႕ရိွရပါသည္။ "
+"ေက်းဇူးျပဳ၍ လတ္တေလာ သတိေပးခ်က္ သို႕မဟုတ္ ခ်ိဳ႕ယြင္းခ်က္ သတင္းေပးပို႕မႈ ရွိ "
+"မရွိ သတင္းေပးပို႕မႈ မွတ္တမ္းမ်ားတြင္ စစ္ေဆးပါ"
+
+#: mainwindow.cpp:1055
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Tor သို႕ မွန္ကန္ေၾကာင္း အစစ္ေဆးခံေနပါသည္"
+
+#: mainwindow.cpp:1075
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "မွန္ကန္ေၾကာင္း Cookie လိုအပ္ပါသည္"
+
+#: 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 ေဆာ့ဝဲသည္ Vidalia ေဆာ့ဝဲကုိ မွန္ကန္ေၾကာင္း cookie မ်ား ပို႕လႊတ္ရန္ "
+"လိုအပ္ပါသည္။ သို႕ေသာ္ Vidalia ရွာေဖြမေတြ႕ရွိႏုိင္ပါ"
+
+#: mainwindow.cpp:1080
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "သင္ 'control_auth_cookie' ဖိုင္ကုိ မိမိဘာသာ ရွာေဖြႏုိင္ပါသလား ?"
+
+#: mainwindow.cpp:1087
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "ေဒတာ Directory"
+
+#: mainwindow.cpp:1089
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Control Cookie (control_auth_cookie)"
+
+#: mainwindow.cpp:1141
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "Events အတြက္ မွတ္ပံုတင္မႈ ခ်ိဳ႕ယြင္းခ်က္"
+
+#: mainwindow.cpp:1143
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr ""
+"Vidalia အခ်ိဳ႕ event မ်ားအတြက္ မွတ္ပံုတင္မႈ မျပဳလုပ္ႏိုင္ပါ။ Vidalia ၏ "
+"လုပ္ေဆာင္ႏုိင္မႈမ်ား မရရွိႏုိင္ပါ"
+
+#: 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 "Vidalia မွ Tor ေဆာ့ဝဲသို႕ မွန္ကန္ေၾကာင္း စစ္ေဆးမႈ မျပဳလိုႏိုင္ပါ။ (%1)"
+
+#: mainwindow.cpp:1226
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr ""
+"ေက်းဇူးျပဳ၍ သင္၏ ထိန္းခ်ဳပ္မႈ port မွန္ကန္ေၾကာင္း စစ္ေဆးမႈ "
+"ခ်ိန္ညိွခ်က္မ်ားကို စစ္ေဆးပါ"
+
+#: mainwindow.cpp:1330
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "Tor အသစ္ျဖည့္သြင္းခ်က္မ်ား ရရွႏုိင္ပါျပီ"
+
+#: 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 ဝက္ဘ္ဆုိက္သို႕ သြား၍ ေနာက္ဆံုး version ကို "
+"ေဒါင္းလုဒ္လုပ္ပါ။"
+
+#: mainwindow.cpp:1333
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Tor ဝက္ဘ္ဆိုက္ : %1"
+
+#: mainwindow.cpp:1394
+msgctxt "MainWindow"
+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 "Port Forwarding မေအာင္ျမင္ပါ"
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+"Vidalia သည္ အလိုအေလ်ာက္ port forwarding ကုိ ခ်ိန္ညိႇျခင္း မျပဳလုပ္ႏုိင္ပါ"
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Vidalia Control Panel"
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "အေျခအေန"
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Vidalia Shortcuts"
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Relaying ကုိ ထည့္သြင္းျခင္း"
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Relay တစ္ခု ထည့္သြင္း၍ Network ကုိ ၾကီးထြားေအာင္ ျပဳလုပ္ပါ"
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Network ကုိ ၾကည့္ရႈရန္"
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Tor Network ၏ ေျမပံုကို ၾကည့္ရႈရန္"
+
+#: 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 "လတ္တေလာ bandwidth အသံုးျပဳမႈ ၾကည့္ရႈရန္"
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "သတင္းေပးပို႕မႈ မွတ္တမ္း history ကို ၾကည့္ရႈရန္"
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "အကူအညီ မွတ္တမ္းမ်ား ၾကည့္ရႈရန္"
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Vidalia ကုိ ခ်ိန္ညိႇယူရန္"
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "version ႏွင့္ လုိင္စင္ အခ်က္အလက္မ်ား ၾကည့္ရႈရန္"
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Vidalia မွ ထြက္ရန္"
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "ဤ windows ကို စနစ္စတင္လ်င္ ျပသရန္"
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "ဖံုးကြယ္ထားရန္"
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "ဤ windows ကုိ ဖုံုးကြယ္ထားရန္"
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr "စကားဝွက္ ျပင္ဆင္သတ္မွတ္ျခင္း မေအာင္ျမင္ပါ"
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+"Vidalia မွ Tor ၏ ထိန္းခ်ဳပ္မႈ စကားဝွက္ကုိ ျပင္ဆင္သတ္မွတ္စဥ္ Tor ေဆာ့ဝဲကုိ "
+"စတင္ျခင္း မျပဳလုပ္ႏုိင္ပါ။ ေက်းဇူးျပဳ၍ သင္၏ Task Manager တြင္ အျခား Tor "
+"လုပ္ငန္းစဥ္မ်ား ဖြင့္ထားျခင္း ရွိမရွိ စစ္ေဆးပါ။"
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+"တစ္စံုတစ္ခု လြန္စြာမွားယြင္းေနေသာ အခါႏွင့္ Tor လုပ္ငန္း "
+"မလုပ္ေဆာင္ႏုိင္ေသာအခါ သတင္းေပးပို႕ ဆက္သြယ္ပါ။"
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr "တစ္စံုတစ္ခုသည္ Tor ႏွင့္ ပတ္သတ္၍ မွားယြင္းေနမွသာ သတင္းေပးပို႕ ဆက္သြယ္ပါ"
+
+#: 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 ""
+"Tor ပံုမွန္ လုပ္ေဆာင္မႈမ်ားအတြင္း မၾကာခဏ ေတြ႕ရွိရ၍ ခ်ိဳ႕ယြင္းခ်က္အျဖစ္ "
+"ထည့္သြင္းျခင္း မျပဳေသာ္လည္း သင္ ဂရုျပဳသင့္ေသာအခါ သတင္းအခ်က္အလက္ေပးပို႕ပါ"
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr "Tor ပံုမွန္လုပ္ေဆာင္မႈအတြင္း မၾကာခဏ ေတြ႕ရွိရပါက သတင္းေပးပို႕ပါ"
+
+#: messagelog.cpp:136
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of "
+"interest to Tor developers."
+msgstr ""
+"Tor ေရးသားသူမ်ားအတြက္ စိတ္ဝင္စားေစမည္ဆိုလွ်င္ အလြန္ရွည္လ်ားေသာ "
+"သတင္းေပးပို႕ခ်က္မ်ား ေပးပို႕ပါ"
+
+#: 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 ""
+"Vidalia သည္ Tor ၏ မွတ္တမ္း အျဖစ္အပ်က္မ်ားသို႕ မွတ္ပံုတင္ျခင္း မျပဳႏုိင္ပါ"
+
+#: 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 "Vidalia သည္ ေဖာ္ျပထားေသာ မွတ္တမ္းဖိုင္ကို မဖြင့္လွစ္ႏုိင္ပါ"
+
+#: 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 "စာသားဖုိင္မ်ား (*.txt)"
+
+#: messagelog.cpp:309
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+#: messagelog.cpp:310
+msgctxt "MessageLog"
+msgid "Cannot write file %1"
+""
+"%2."
+msgstr "ဖိုင္ ေရးသားျခင္း မျပဳႏုိင္ပါ %1%2"
+
+#: 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 "ရွာေဖြမႈ 0 ခု ကုိက္ညီေတြ႕ရွိပါသည္"
+
+#: 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 "History အရြယ္အစား"
+
+#: 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 ""
+"သတင္းေပးပို႕မႈ မွတ္တမ္းမ်ားမွ သတင္းေပးပို႕မ်ား အားလံုး ရွင္းလင္းရန္ (Ctrl+E)"
+
+#: messagelog.ui:483
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+#: messagelog.ui:497
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "ေကာ္ပီကူးရန္"
+
+#: messagelog.ui:500
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "ေရြးခ်ယ္ထားေသာ သတင္းအခ်က္အလက္ကုိ clipboard သို႕ ေကာ္ပီကူးပါ (Ctrl+C)"
+
+#: messagelog.ui:503
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+#: messagelog.ui:514
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Select All"
+
+#: messagelog.ui:517
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "သတင္းေပပို႕မႈအားလံုး မွတ္သားရန္ (Ctrl+A)"
+
+#: messagelog.ui:520
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+#: 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 "Ctrl+T"
+
+#: messagelog.ui:567
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "အကူအညီ"
+
+#: messagelog.ui:570
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "အကူအညီ browser ျပသပါ"
+
+#: messagelog.ui:573
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+#: 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 "Esc"
+
+#: messagelog.ui:598
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "ရွာေဖြရန္"
+
+#: messagelog.ui:601
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "ရွာေဖြလိုေသာ စာသားပါသည့္သတင္းေပးပို႕မႈအားလံုး ရွာေဖြရန္ (Ctrl+F)"
+
+#: messagelog.ui:604
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+#: 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 "Debug"
+
+#: messagelog.ui:297
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "သတင္းအခ်က္အလက္ မွတ္တမ္း history"
+
+#: messagelog.ui:318
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "သတင္းအခ်က္အလက္ မွတ္တမ္း window တြင္ျပသရန္ သတင္းအခ်က္အလက္ အေရအတြက္"
+
+#: messagelog.ui:337
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "သတင္းအခ်က္အလက္မ်ား"
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "သတင္းအခ်က္အလက္မွတ္တမ္းအသစ္မ်ားကို အျမဲတမ္း သိမ္းပါ"
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "Browse"
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+"သတင္းအခ်က္အလက္မွတ္တမ္း အသစ္မ်ားကုိ ဖုိင္တစ္ခုသို႕ အျမဲတမ္း သိမ္းခြင့္ ျပဳပါ"
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "သတင္းအခ်က္အလက္မွတ္တမ္း အသစ္မ်ားကို အလိုအေလ်ာက္ ဖုိင္တစ္ခုသို႕ သိမ္းပါ"
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor Network ေျမပံု"
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "ျပန္လည္ အသစ္တင္ျပပါ"
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "Tor relays မ်ားႏွင့္ ဆက္သြယ္မႈမ်ား၏ စာရင္းကို ျပန္လည္ အသစ္တင္ျပပါ"
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "အကူအညီ"
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Network ေျမပံု အကူအညီကုိ ျပသပါ"
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Network ေျမပံု အကူအညီကုိ ျပသပါ"
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "ပိတ္ပါ"
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Network ေျမပံုကုိ ပိတ္ပါ"
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "ျမင္ကြင္းက်ယ္ ခ်ဲ႕ပါ"
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Network ေျမပံုကုိ ျမင္ကြင္းက်ယ္ခ်ဲ႕ပါ"
+
+#: 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 "Network ေျမပံုကုိ ျမင္ကြင္းခ်ံဳ႕ပါ"
+
+#: 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 "Ctrl+Z"
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "မဆီေလ်ာ္ေသာ Bridge"
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "ေဖာ္ျပထားေသာ bridge ေဖာ္ျပခ်က္သည္ မဆီေလ်ာ္ပါ"
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr "ကူးယူရန္ (Ctrl+C)"
+
+#: 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 ""
+"Tor ကုိ အသံုးျပဳ၍ အင္တာနက္ကုိ အသံုးျပဳရန္ အိုင္ပီလိပ္စာႏွင့္ hostname "
+"ႏွစ္ခုလံုးကုိ သတ္မွတ္ေဖာ္ျပေပးရမည္"
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+"သင္၏ firewall မွ သင့္ကုိ ဆက္သြယ္ခြင့္ရေစရန္ port တစ္ခုသို႕မဟုတ္ တစ္ခုထက္ပို၍ "
+"သတ္မွတ္ေဖာ္ျပေပးရမည္"
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' သည္ ဆီေလ်ာ္ေသာ port နံပါတ္မဟုတ္ပါ"
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+"အင္တာနက္အသံုးျပဳခြင့္ရရွိရန္ သင္၏ local network သည္ proxy လိုအပ္မႈ ရွိမရွိ "
+"စစ္ေဆးပါ"
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "အင္တာနက္အသံုးျပဳႏုိင္ရန္ proxy အသံုးျပဳရပါသည္"
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr "proxy သတ္မွတ္ခ်က္မ်ား"
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "HTTP Proxy:"
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr "အသံုးျပဳသူ၏ အမည္ :"
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "HTTPS အတြက္ပါ ဤ Proxy ကုိ အသံုးျပဳပါ"
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr "စကားဝွက္ :"
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "Port:"
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+"သင္၏ firewall မွ ခြင့္ျပဳေသာ port မ်ားကုိသာအသံုးျပဳ၍ relay မ်ားကို "
+"ဆက္သြယ္ေစရန္ စစ္ေဆးပါ"
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "မိမိ၏ firewall သည္ သတ္မွတ္ထားေသာ port မ်ားကိုသာ ဆက္သြယ္ေစပါသည္"
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "Firewall သတ္မွတ္ခ်က္မ်ား"
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "ခြင့္ျပဳထားေသာ Ports မ်ား :"
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr "80, 443"
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+"Directory request မ်ားကုိ encrypt ျဖစ္ေစရန္၊ Tor Network ကုိ "
+"အသံုးျပဳႏုိင္ရန္ bridge relay မ်ားကို အသံုးျပဳႏုိင္ေၾကာင္း စစ္ေဆးပါ"
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "မိမိ၏ ISP မွ Tor Network သို႕ ဆက္သြယ္မႈကို ပိတ္ပင္ထားပါသည္"
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr "Bridge သတ္မွတ္ခ်က္မ်ား"
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+"သင္ လက္ရွိ အသုံးျပဳေနေသာ Tor ေဆာ့ဝဲသည္ bridges ကို အေထာက္အကူမျပဳႏုိင္ပါ။ "
+"<br> Directory ဆက္သြယ္မႈသည္ encrypted အျဖစ္ ရွိေနဆဲ ျဖစ္ပါလိမ့္မည္။"
+
+#: networkpage.ui:295
+msgctxt "NetworkPage"
+msgid "Add a Bridge:"
+msgstr "Bridge တစ္ခု ေပါင္းထည့္ပါ :"
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Bridge တစ္ခု မည္ကဲ့သို႕ ရွာေဖြရမည္နည္း</a>"
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr "ေရြးခ်ယ္ထားေသာ bridges မ်ားကို စာရင္းမွ ဖယ္ရွားေပးပါ"
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr "ေရြးခ်ယ္ထားေသာ bridges မ်ားကုိ clipboard သို႕ ေကာ္ပီ ကူးပါ"
+
+#: policy.cpp:167
+msgctxt "Policy"
+msgid "accept"
+msgstr "လက္ခံပါသည္"
+
+#: policy.cpp:167
+msgctxt "Policy"
+msgid "reject"
+msgstr "ျငင္းပယ္ပါသည္"
+
+#: routerdescriptor.cpp:76
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Online"
+
+#: routerdescriptor.cpp:78
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Hibernating"
+
+#: routerdescriptor.cpp:80
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Offline"
+
+#: 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 "Platform:"
+
+#: routerdescriptorview.cpp:148
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Bandwidth:"
+
+#: routerdescriptorview.cpp:150
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "စတင္ႏိုးထခ်ိန္:"
+
+#: routerdescriptorview.cpp:156
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "ေနာက္ဆံုး အသစ္ျဖည့္သြင္းမႈ :"
+
+#: routerdescriptorview.cpp:100
+msgctxt "RouterDescriptorView"
+msgid "%1 days "
+msgstr "%1 ရက္ "
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr "%1 နာရီ"
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr "%1 မိနစ္ "
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr "%1 စကၠန္႕"
+
+#: routerdescriptorview.cpp:48
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "ေကာ္ပီကူးရန္"
+
+#: routerlistitem.cpp:67
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Offline"
+
+#: routerlistitem.cpp:71
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Hibernating"
+
+#: routerlistitem.cpp:83
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+#: routerlistwidget.cpp:49
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Relay"
+
+#: routerlistwidget.cpp:74
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "Relay သုိ႕ တုိးသြားပါ"
+
+#: routerlistwidget.cpp:220
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 relays online"
+
+#: 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 "Bridge ေထာက္ပံ့မႈ မရႏုိင္ပါ"
+
+#: 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 ကုိ bridge ကဲ့သို႕ လုပ္ေဆာင္ရန္ သတ္မွတ္ထားပါသည္။ သို႕ေသာ္ သင္၏ Tor "
+"version သည္ bridges သို႕ အေထာက္အပ့ံမေပးႏုိင္ပါ"
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr ""
+"ေက်းဇူးျပဳ၍ သင္၏ Tor ေဆာ့ဝဲကုိ အဆင့္ျမႇင့္ပါ သို႕မဟုတ္ Tor ကို ပံုမွန္ Tor "
+"relay ကဲ့သို႕ ျပင္ဆင္မႈျပဳလုပ္ပါ"
+
+#: serverpage.cpp:199
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "သင္၏ bridge relay အလုပ္လုပ္ေဆာင္ေနမႈ မရွိပါ"
+
+#: serverpage.cpp:263
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "သင္ အနည္းဆံုး relay အမည္ဝွက္ ႏွင့္ port ကုိ သတ္မွတ္ေပးရပါမည္"
+
+#: serverpage.ui:25
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "Client ကဲ့သုိ႕သာ အလုပ္လုပ္ေဆာင္ပါ"
+
+#: serverpage.ui:32
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Tor Network အတြက္ Relay traffic"
+
+#: serverpage.ui:39
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
+msgstr ""
+"ဆင္ဆာျဖတ္ခံထားရေသာ အသံုးျပဳသူမ်ားကုိ Tor Network သို႕ ေရာက္ရွိႏုိင္ရန္ "
+"ကူညီပါ (Tor 0.2.0.8-alpha သို႕မဟုတ္ ပိုမိုအသစ္ျဖစ္ေသာ)"
+
+#: serverpage.ui:91
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "Relay Port:"
+
+#: serverpage.ui:110
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "Relay directory ကုိ mirror ျပဳလုပ္ႏုိင္ရန္"
+
+#: serverpage.ui:113
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory "
+msgstr "Relay Directory ကုိ mirror ျပဳလုပ္ပါ"
+
+#: serverpage.ui:139
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr ""
+"Port forwarding ကို ျပင္ဆင္သတ္မွတ္ျခင္း အလိုအေလ်ာက္ျပဳလုပ္ရန္ လုပ္ေဆာင္မႈ"
+
+#: serverpage.ui:154
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "စမ္းသပ္ရန္"
+
+#: serverpage.ui:164
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "Port forwarding ေပၚတြင္ အကူအညီ အေၾကာင္းအရာမ်ား ျပသရန္"
+
+#: 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 ""
+"သင္၏ relay တြင္ျပႆနာ ရွိပါက သင့္ထံသို႕ ေရာက္ရွိႏိုင္ေသာ အီးေမးလ္။သင္၏ PGP "
+"သို႕မဟုတ္ GPG လက္ေဗြ ပါဝင္ႏုိင္ပါသည္။"
+
+#: serverpage.ui:234
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Directory Port:"
+
+#: serverpage.ui:267
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Directory Port နံပါတ္"
+
+#: serverpage.ui:279
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "ဆက္သြယ္ရန္ အခ်က္အလက္မ်ား :"
+
+#: serverpage.ui:337
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "သင္၏ relay အမည္"
+
+#: serverpage.ui:370
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr ""
+"အသံုးျပဳသူမ်ားႏွင့္ အျခား relay မ်ားမွ သင္၏ relay သို႕ ဆက္သြယ္ႏုိင္ေသာ port"
+
+#: 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."
+msgstr ""
+"ေဒါင္းလုဒ္ျမန္ဆန္၍ upload ေႏွးေကြးေသာ အင္တာနက္ ဆက္သြယ္မႈမ်ားအတြက္ သင္၏ "
+"upload အျမန္ႏႈန္းကို ဤေနရာတြင္ ေဖာ္ျပပါ။"
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "Cable/DSL 256 Kbps"
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "Cable/DSL 512 Kbps"
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "Cable/DSL 768 Kbps"
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/Cable/DSL 1.5 Mbps"
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 1.5 Mbps"
+
+#: 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 "Bandwidth ႏွန္း ကန္႕သတ္ခ်က္အတြက္ အကူအညီအေၾကာင္းအရာမ်ား ျပသရန္"
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "ပ်မ္းမွ် ႏႈန္း"
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "ေရရွည္ ပ်မ္းမွ် bandwidth သတ္မွတ္ခ်က္"
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "အျမင့္ဆံုး ႏႈန္း"
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "အျမင့္ဆံုး bandwidth ႏႈန္း ကန္႕သတ္ခ်က္"
+
+#: 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 ""
+"သင္၏ အျမင့္ဆံုး bandwidth ႏႈန္း သည္ပ်မ္းမွ် bandwidth ႏႈန္း ထက္ ပိုျခင္း "
+"သို႕မဟုတ္ တူညီရပါမည္။ တန္ဖိုး ႏွစ္ခုလံုးသည္ အနည္းဆံုး 20 KB/s ရွိရပါမည္။"
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Bandwidth ကန္႕သတ္ခ်က္"
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Ports 6660 - 6669 and 6697"
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Ports 110, 143, 993 and 995"
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "စာဆက္သြယ္ ရယူရန္ (POP, IMAP)"
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "အျခား checkboxes မ်ားမွ သတ္မွတ္မထားေသာ Ports မ်ား"
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "အျခား အေထြေထြ ဝန္ေဆာင္မႈမ်ား"
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "မက္ေဆ့ခ်က္ခ်င္းပို႕ေဆာင္မႈမ်ား (IM)"
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "Port 443"
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "လံုျခံဳမႈရွိေသာ ဝက္ဘက္ဆုိက္မ်ား (SSL)"
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Port 80"
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "ဝက္ဘ္ဆိုက္မ်ား"
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "အထြက္ေပၚလစီအတြက္ အကူအညီအေၾကာင္းအရာမ်ား ျပသရန္"
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr ""
+"သင္၏ relay မွ မည္သည့္ အင္တာနက္ အရင္းအျမစ္မ်ားကုိ အသံုးျပဳသူမ်ား "
+"အသံုးျပဳခြင့္ ရႏုိင္ေစပါသလဲ ?"
+
+#: 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 သည္ အခ်ိဳ႕ေသာ ျပင္ပသို႕ ို႕လႊတ္သည့္ ေမးလ္မ်ားႏွင့္ ဖိုင္မွ်ေဝေသာ "
+"application မ်ားကို spam ႏွင့္ အျခား အလဲြသံုးမႈမ်ား ေလ်ာ့ခ်ႏုိင္ရန္အတြက္ "
+"တားျမစ္ထားပါသည္"
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "ေပၚလစီမွ ထြက္ရန္"
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+"အျခားသူမ်ားကုိ သင္၏ bridge ကုိ အသံုးျပဳခြင့္ရေစရန္ ေအာက္ပါစာသားကုိ "
+"၄င္းတို႕အား ေပးပါ :"
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "၄င္းသည္ သင့္ bridge ၏ အျခားသူမ်ားသို႕ ေပးႏုိင္ေသာ အမွတ္အသားျဖစ္သည္"
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr "သင့္ Bridge ၏ အမွတ္အသားကို clipboard သို႕ ေကာ္ပီကူးပါ"
+
+#: 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."
+msgstr ""
+"ေက်းဇူးျပဳ၍ သင္ သိမ္းဆည္းလိုေသာ ဝန္ေဆာင္မႈတစ္ခုစီအတြက္ အနည္းဆံုး service "
+"directory ႏွင့္ virtual port တစ္ခုစီ သတ္မွတ္ပါ။ အျခား အရာမ်ားကို ဖယ္ရွားပါ"
+
+#: 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 "Service directory တစ္ခု ေရြးခ်ယ္ပါ"
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "Virtual Port သည္ Port နံပါတ္ ၁ မွ ၆၅၅၃၅ အထိသာ အက်ံဳးဝင္ႏုိင္ပါသည္"
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "ပစ္မွတ္သည္ လိပ္စာ:port, လိပ္စာ သို႕မဟုတ္ port သာ ပါဝင္ႏုိင္ပါသည္"
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr "Directory သည္ အျခား ဝန္ေဆာင္မႈတစ္ခုမွ အသံုးျပဳႏွင့္ျပီး ျဖစ္ပါသည္"
+
+#: 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 "Onion လိပ္စာ"
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "Virtual Port"
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "ပစ္မွတ္"
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "Directory လမ္းေၾကာင္း"
+
+#: 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 "ေရြးခ်ယ္ထားေသာ ဝန္ေဆာင္မႈ၏ Onion လိပ္စာကို clipboard သို႕ ကူးရန္"
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+"local ဖိုင္ စနစ္အတြင္းတြင္ ေရြးခ်ယ္ထားေသာ ဝန္ေဆာင္မႈအတြက္ directory "
+"ေရြးခ်ယ္ေပးပါ"
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "Tor မွ တီထြင္ဖန္တီးသည္"
+
+#: 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 " Remap ျပဳလုပ္ျပီးပါျပီ"
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "မသိရပါ"
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "လုပ္ေဆာင္မႈ %1 ရပ္တန္႕ရန္ မေအာင္ျမင္ပါ [%2]"
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "The Tor ဝန္ေဆာင္မႈ ထည့္သြင္းမထားပါ"
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "Tor ဝန္ေဆာင္မႈ မစတင္ႏုိင္ပါ"
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "စကားဝွက္ထိန္းခ်ဳပ္ရန္ Hash လုပ္ေဆာင္မႈ မေအာင္ျမင္ပါ"
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "ေအာင္ျမင္ပါသည္"
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "UPnP လုပ္ေဆာင္ႏုိင္ေသာ ပစၥည္းကိရိယာမ်ား မေတြ႕ရိွပါ"
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+"သင့္ေလွ်ာ္ေသာ UPnP လုပ္ေဆာင္ႏုိင္ေသာ အင္တာနက္ gateway ပစၥည္းကိရိယာမ်ား "
+"မေတြ႕ရွိပါ"
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "WSA စတင္မႈ မေအာင္ျမင္ပါ"
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "Port mapping ထည့္သြင္းမႈ မေအာင္ျမင္ပါ"
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "Port mapping ျပန္လည္ ရယူရန္ မေအာင္ျမင္ပါ"
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "Port mapping ဖယ္ရွားရန္ မေအာင္ျမင္ပါ"
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "အမည္မသိ ခ်ိဳ႕ယြင္းမႈ"
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "UPnP လုပ္ေဆာင္ႏုိင္ေသာ ပစၥည္းကိရိယာမ်ား ရွာေဖြေနပါသည္"
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "Directory port mapping ကို အသစ္ထည့္သြင္းေနပါသည္"
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "Relay port mapping ကုိ အသစ္ထည့္သြင္းေနပါသည္"
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "စမ္းသပ္မႈ ေအာင္ျမင္စြာ ျပီးစီးပါျပီ!"
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "UPnP ေထာက္ပံ့မႈ စမ္းသပ္ေနပါသည္"
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr "Universal Plug & Play ေထာက္ပံ့မႈ စမ္းသပ္ေနပါသည္"
+
+#: 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 "Browse"
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "မမွန္ကန္ေသာ Argument"
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia အလုပ္လုပ္ေဆာင္ေနျပီးျဖစ္ပါသည္"
+
+#: 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 လုပ္ငန္းစဥ္ အလုပ္လုပ္ေဆာင္ေနျပီး ျဖစ္ႏုိင္ပါသည္။ အကယ္၍ "
+"အျခား Vidalia လုပ္ငန္းစဥ္ လုပ္ေဆာင္ေနျခင္း မရွိလွ်င္ ဆက္လက္လုပ္ေဆာင္ရန္ "
+"ေရြးခ်ယ္ႏုိင္ပါသည္။ Vidalia စတင္ျခင္းကို ေရွ႕ဆက္လုပ္ေဆာင္လုိပါသလား ?"
+
+#: 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 ျပင္ဆင္ထိန္းညိွမႈမ်ား အားလံုးကုိ မူလသို႕ ျပန္လည္ ျပင္ဆင္ပါ"
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Vidalia data file မ်ား အတြက္ directory သတ္မွတ္ပါ"
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Vidalia ၏ pidfile ကုိ အမည္ႏွင့္ေနရာကုိ သတ္မွတ္ပါ"
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Vidalia ၏ မွတ္တမ္းဖုိင္ကုိ အမည္ႏွင့္ေနရာကုိ သတ္မွတ္ပါ"
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+"Vidalia ၏ မွတ္တမ္းတင္ျခင္း မည္မွ် ရွည္ၾကာစြာထားရွိမည္ဆိုသည္ကုိ သတ္မွတ္ပါ"
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Vidalia ၏ ၾကားခံဆက္သြယ္မႈ ပံုစံကုိ သတ္မွတ္ပါ"
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Vidalia ၏ ဘာသာစကားကုိ သတ္မွတ္ပါ"
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Vidalia အသံုးျပဳမႈ သတင္းအခ်က္အလက္မ်ား"
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr "မဆီေလ်ာ္ေသာ ဘာသာစကား code ေဖာ္ျပထားပါသည္ :"
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr "မဆီေလ်ာ္ေသာ GUI ပံုစံ ေဖာ္ျပထားပါသည္ :"
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr "အက်ံဳးမဝင္ေသာ မွတ္တမ္း အဆင့္ကို သတ္မွတ္ထားပါသည္ :"
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "မွတ္တမ္း ဖုိင္ကုိ မဖြင့္ႏိုင္ပါ '%1': %2"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bo/qt_bo.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bo/qt_bo.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bo/qt_bo.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bo/vidalia_bo.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bo/vidalia_bo.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/bo/vidalia_bo.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ca/qt_ca.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ca/qt_ca.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ca/qt_ca.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ca/vidalia_ca.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ca/vidalia_ca.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ca/vidalia_ca.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/cs/qt_cs.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/cs/qt_cs.po
new file mode 100644
index 0000000..508415a
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/cs/qt_cs.po
@@ -0,0 +1,430 @@
+msgid ""
+msgstr ""
+"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: 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"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/cs/vidalia_cs.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/cs/vidalia_cs.po
new file mode 100644
index 0000000..61e9adf
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/cs/vidalia_cs.po
@@ -0,0 +1,3293 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "O Vidalia"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Vidalia 0.2.0"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "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' neni platna IP adresa."
+
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Vyber Tor konfiguracni soubor"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Soubro nenalezen"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 neexistuje. Chces to vytvorit?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Vytvoreni souboru neuspesne"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "Nemohu vytvorit %1 [%2]"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Nemohu ostranit Sluzbu Tor"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "Nemohu instalovat Tor jako Sluzbu"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "Vidalia neni schopna instalovat Tor jako sluzbu"
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Kontrolni port"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Adresa:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Prochazet"
+
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "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 ""
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Jazyk"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Vyber jazyk pro puziti ve Vidalia"
+
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Styl"
+
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Vyber styl rozhrani Vidalia"
+
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr "Od:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Schovat nastaveni"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Ukaz nastaveni"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Vyuziti sirky pasma Tor."
+
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "Reset"
+
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Prijato"
+
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Odeslano"
+
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Vzdy viditelne"
+
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Styl"
+
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Zmena pruhlednosti Grafu toku dat"
+
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% Nepruhlednost"
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Uloz"
+
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Smaz"
+
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr ""
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "Nove"
+
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Otevrit"
+
+msgctxt "Circuit"
+msgid "Building"
+msgstr "Sestaveni"
+
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Neuspesne"
+
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Zavreno"
+
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Nezname"
+
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Prazdna cesta>"
+
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Pripojeni"
+
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "Status"
+
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Nahled na data okruh"
+
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "Hlavni"
+
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Podoba"
+
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Pokrocile"
+
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Pomoc"
+
+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 "Nastaveni"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "Kontrolni socket neni detekovan"
+
+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 ""
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "Kontrolni socket neni pripojen."
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Chyba v odeslani kontrolni instrukce. [%1]"
+
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr "Socket odpojen v prubehu cteni dat."
+
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Chybna controlni odpoved. [%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 "O Vidalia"
+
+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 "O aplikaci"
+
+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 "Smaz"
+
+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 "Hlavni"
+
+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 "Presmerovani"
+
+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 "Hlavni"
+
+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 "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 "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Spustitelne (*.exe)"
+
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Oznac cestu k Tor."
+
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr "Prohlizej"
+
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Tor"
+msgstr "Tor"
+
+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 "%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 "Zadany XML soubor nema validni obsah."
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "Hledani dosahlo konce dokumentu"
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "Hledani dosahlo zacatku dokumentu"
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "Text v dokumentu nenalezen"
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "%1 vysledku hledani"
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Napoveda k Vidalia"
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Nazpatek"
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Predchozi stranka (Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Presmerovani"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Jdi na dalsi stranku (Shift+Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Domu"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Na domaci stranku (Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Najdi"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "Najdi na strance slovo nebo frazi (Ctrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Zavri"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Zavri napovedu Vidalia"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Najdi:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Najdi predchozi"
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Najdi nasledujici"
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "Presne fraze"
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Pouze celel slova"
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Tema napovedy"
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Obsah"
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Hledat"
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Hledani:"
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Najdi dokument"
+
+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 "Ladici informace"
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Informace"
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Upozorneni"
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Varovani"
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Chyba"
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Nezname"
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Ukoncit"
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Provozni Graf"
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Log oznameni"
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Mapa site"
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr "Kontrolni panel"
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Nastaveni"
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr "O aplikaci"
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr "Napoveda"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "View"
+msgstr "Nahled"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Napoveda Vidalia"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor neni spusten"
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "Tor se vypina"
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Chyba pri spusteni 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 nemuze spustit Tor. Ujistete se, ze vase nastaveni identifikatoru a lokality je odpovidajici."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Control 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."
+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 ""
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "Vsechny nasledujici pripojeni budou od puvodnich rozdilne."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "Vytvoreni nove identity selhalo."
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Kontrolni panel Vidalia"
+
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "Status"
+
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Zkratky Vidalia"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Nastav Preposilani"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Pohled na Sit"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Pohled na Mapu Site Tor"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Pouzit Novou Identitu"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Vsechny dalsi pripojeni jako nove"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Dokumentace Napovedy"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Verze a licencni informace"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Ukoncit Vidalia"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Zobrazuj toto okno pri startu"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Schovat"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Schovat toto okno"
+
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgstr ""
+
+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 "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 "Neuspesne"
+
+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 "Vidalia neni schopna instalovat Tor jako sluzbu"
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+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 ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "O Vidalia"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Domu"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Chyba Nastaveni Filtru"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia nelze pripojit k zaznamu udalosti Tor."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "Otevreni zaznamu neuspesne"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia neni schopna otevrit oznaceni soubor zaznamu."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Jmeno Zaznamu Nutne"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "Pro ulozeni zaznamu je nutne zadat jmeno."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Oznac Soubor Zaznamu"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Uloz Soubor Zaznamu"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Textove soubory (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Najdi v Zaznamu"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Najdi:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Nenalezeno"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "Hledani nalezlo O zaznamu."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Zaznam logu"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Filtry oznameni.."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Nastav filtry oznamovani"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Velikost Historie..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Nastav maximalni pocet zobrazenych oznameni"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Vycistit"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Vycisti vsechna oznameni v Logu (Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Kopirovat"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Skopirovat oznacene oznameni do schranky (Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Oznacit vse"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Oznacit vsechna oznameni (Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Ulozit vse"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Ulozit oznameni do souboru"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Ulozit oznacene"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Ulozit oznacene oznameni do souboru"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Nastaveni"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Uprav Konfiguraci Zaznamu"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Napoveda"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Ukaz prohlizec napovedy"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Zavrit"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Zavrit log oznameni"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Najit"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "najdi vechna oznameni obsahujici hledani text (Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Cas"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Typ"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Oznameni"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Ulozit aktualni nastaveni Zobrazovani udalosti"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Uloz nastaveni"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Zrusit provedene zmeny nastaveni"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Zrusit"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Filtr Oznameni"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Chyba"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Varovani"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Oznameni"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Informace"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Ladeni"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "Histrorie Zaznamu"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Pocet zobrazenych zaznamu."
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "oznameni"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Vzdy Ukladat Nove Oznameni"
+
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "Prohlizet"
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr "Povol automaticke ukladani vsech novych oznameni do souboru."
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "Automaticky uloz nove oznameni do souboru"
+
+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."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Aktualizace"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Napoveda"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Zobrazit napovedu pro mapu site"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Zobrazit napovedu mapy site"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Zavrit"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Zavrit mapu site"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Zvetsit"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Priblizit mapu site"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Zmensit"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Oddalit mapu site"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Na cele okno"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Zobrazit dostupne okruhy na cele okno"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "Soubro nenalezen"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "Nezname"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+msgctxt "NetworkPage"
+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."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+msgctxt "NetworkPage"
+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 ""
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+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 ""
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+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 ""
+
+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 "Policy"
+msgid "accept"
+msgstr "prijmout"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "odmítnout"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Online"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Uspani"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Offline"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Umisteni:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "IP Adresa:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Platforma:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Sirka pasma:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Uptime:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Aktualizovano naposled:"
+
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Kopirovat"
+
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
+msgstr "Uspani"
+
+msgctxt "RouterInfoDialog"
+msgid "Online"
+msgstr "Online"
+
+msgctxt "RouterInfoDialog"
+msgid "Offline"
+msgstr "Offline"
+
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr "Nezname"
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr "Prezdivka:"
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr "Status"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "Umisteni:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "IP Adresa:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "Platforma:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "Sirka pasma:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "Uptime:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "Kontaktni informace:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "Aktualizovano naposled:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Offline"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Usapni"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Kopirovat"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr ""
+
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Prenos dat pro sit Tor"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Port Adresare:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Cislo Portu Adresare:"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Kontaktni informace:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Prezdivka:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Zakladni nastaveni"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Pro pripojeni s rychlym downloadem ale pomalym uploadem zde nastav rychlost pro uploadu."
+
+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 "Vlastni"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Oznac hodnotu nejbliz tvemu internetovemu pripojeni."
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Zobraz napovedu pro omezeni prutoku dat"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Prumer"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Dlouhodoby prumer prutoku dat"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Maximum"
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "Spicka prutoku dat"
+
+msgctxt "ServerPage"
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr "Tvoje maximalni prenosova kapacita musi byt vyssi nebo rovna prumerne. Obe hodnoty musi byt minimalne 20 KB/s (160kbps)."
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Limity pro prenos dat"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Porty 6660 - 6669 a 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Porty 110, 143, 993 a 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Povol Mail (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Porty nespecifikovane v nastaveni"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Ruzne dalsi sluzby"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Porty 706, 1863, 5050, 5190, 5222, 8300 a 8888 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
+
+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 "Secure Websites (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Port 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Webove stranky"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "Ukaza napovedu pro provozni pravidla"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Pravidla Provozu"
+
+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 "Histrorie Zaznamu"
+
+msgctxt "ServerPage"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgstr "Vidalia nelze pripojit k zaznamu udalosti Tor."
+
+msgctxt "ServerPage"
+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 ""
+
+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 "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 ""
+
+msgctxt "ServicePage"
+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."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Chyba"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+msgctxt "Stream"
+msgid "New"
+msgstr "Nove"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Preklad"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Pripojeni"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "Otevrit"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Selhani"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Zavrit"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Opakovat"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Nezname"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "Zastaveni procesu %1 selhalo. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "Tor neni instalovan jako servisni sluzba."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "Tor neni instalovan jako servis."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+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 "Schovat"
+
+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 "OK"
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr "Smaz"
+
+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 "Backspace"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Zrus"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Ano"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Ne"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Napoveda"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Opakovat"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Ukaz zaznam"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Ukaz nastaveni"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Pokracovat"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Ukoncit"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Prochazet"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Neplatny Argument"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia je spustena"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Zobrazi toto oznameni a ukonci se."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "Resetuj vechna nastaveni Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Nastav slozku pro data uzivatelu Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Nastav nazev a umisteni pidfile Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Nastav nazev a umisteni zaznamu Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Nastav upovidanost zaznamu Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Nastav vzhled aplikace."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Nastav jazyk Vidalia."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Informace o pouzivani Vidalia"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "Nemohu otevrit soubor zaznamu '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr "%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 ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/da/qt_da.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/da/qt_da.po
new file mode 100644
index 0000000..1ff0ca0
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/da/qt_da.po
@@ -0,0 +1,526 @@
+msgid ""
+msgstr ""
+"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: 2009-10-01 09:38+0000\n"
+"Last-Translator: Manuel Ojeda <ojeda at ojeda.dk>\n"
+"Language-Team: Danish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "Aktiver"
+
+# Should check this.
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "Programfil '%1' kræver Qt %2, fundet Qt %3."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "Ukompatibel Qt biblioteks Fejl"
+
+# Shouldn't be translated?
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "QT_LAYOUT_DIRECTION"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "Aktiverer programmets hoved vindue"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "OK"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "Gem"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "Åben"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "Annuller"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "Luk"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "Anvend"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "Nulstil"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "Hjælp"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "Gem ikke"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "Kassér"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "&Ja"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "Ja til &Alt"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "&Nej"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "N&ej til Alt"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "Gem alt"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "Afbryd"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "Forsøg igen"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "Ignorer"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "Gendan standarder"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "Luk uden at Gemme"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "&OK"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "Navn"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "Størrelse"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "Slags"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "Type"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "Dato Modificeret"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "Alle Filer (*)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "Mapper"
+
+# You should check this.
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "&Åben"
+
+# You should check this.
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "&Gem"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "Åben"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"%1 findes allerede.\n"
+"Vil du overskrive den?"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+"%1\n"
+"Filen blev ikke fundet.\n"
+"Bekræft venligst, at det korrekte filnavn blev givet."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "Min Computer"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "&Omdøb"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "&Slet"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "Vis &skjulte filer"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "Tilbage"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "Forrige mappe"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "Liste visning"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "Detalje visning"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "Filer af type:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "Mappe:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+"%1\n"
+"Mappen blev ikke fundet.\n"
+"Bekræft venligst, at det rigtige mappe navn blev givet."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+"'%1' er skrivebeskyttet.\n"
+"Vil du slette den alligevel?"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "Er du sikker på, at du vil slette '%1'?"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "Kunne ikke slette mappen."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "Alle filer (*.*)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "Gem som"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "Drev"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "Fil"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "Ukendt"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "Find mappe"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "Vis"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "Frem"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "Ny Mappe"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "&Ny Mappe"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "&Vælg"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "Fjern"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "Fil &navn:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "Se i:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "Opret Ny Mappe"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "Invalid filename"
+msgstr "Forkert filnavn"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: 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>Navnet \"%1\" kunne ikke bruges.</b><p>Prøv at bruge et andet navn, med "
+"færre karakterer og ingen grammatiske tegn."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr "Navn"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "Størrelse"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "Slags"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "Type"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "Dato ændret"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "Min Computer"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "Computer"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr "%1 TB"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr "%1 GB"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr "%1 MB"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr "%1 KB"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr "%1 byte"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/da/vidalia_da.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/da/vidalia_da.po
new file mode 100644
index 0000000..543400c
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/da/vidalia_da.po
@@ -0,0 +1,3252 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: 2009-10-01 12:33+0000\n"
+"Last-Translator: Manuel Ojeda <ojeda at ojeda.dk>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Om Vidalia"
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "Qt"
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Tor"
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr "Indisponible"
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr "Kører ikke"
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr "0.2.0"
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr "0.2.0.31-alpha-dev (r123456)"
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr "4.4.2"
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "Licens"
+
+#: aboutdialog.ui:163
+msgctxt "AboutDialog"
+msgid "version"
+msgstr "version"
+
+#: advancedpage.cpp:109
+msgctxt "AdvancedPage"
+msgid "'%1' is not a valid IP address."
+msgstr "'%1' er ikke en gyldig IP-adresse."
+
+# Faulty translation
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+"Du har valgt 'Password' autentificering, men har ikke angive en adgangskode."
+
+# Faulty translation
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Vælg Tor konfigurations fil"
+
+# Faulty translation
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Filen blev ikke fundet"
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 findes ikke. Vil du oprette den?"
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Kunne ikke oprette fil"
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "Kunne ikke oprette %1 [%2]"
+
+# Faulty translation.
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Vælg en mappe som skal bruges til Tor Data"
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Kan ikke fjerne Tor Service"
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+"Vidalia var ikke i stand til at fjerne Tor service.Det kan være nødvendigt "
+"at fjerne det manuelt."
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "Ude af stand til at installere Tor Service"
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "Vidalia ikke var i stand til at installere Tor service."
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Kontrol Port"
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "Autentificering:"
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Adresse:"
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "Ingen"
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Cookie"
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Adgangskode"
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "Tilfældigt Generet"
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Tor konfigurationsfil"
+
+# Faulty translation.
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "Start Tor med den angivne opsætningsfil (torrc)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "Valg stien til din konfigurationsfil"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Gennemse"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr "Data Mappe"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr "Gem Tors data i den følgende mappe"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr "Vælg hvilken mappe der skal bruges til at gemme data fra Tor"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Sprog"
+
+# Choose the language used in Vidalia
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Vælg sproget brugt i Vidalia"
+
+# Choose the language used in Vidalia
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Stil"
+
+#
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Vælg Vidalia's grænseflade stil"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr "Vidalia kunne ikke hente det valgte sprog"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr "Siden:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Skjul Indstillinger"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Vis Indstillinger"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Tors Båndbreddeforbrug"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "Nulstil"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Modtagelses hastighed"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Sende hastighed"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Altid øverst"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Stil"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Ændre gennemsigtigheden af Båndbreds Grafen"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% Uigennemsigtig"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Gem"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Annuller"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr "Ny"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Åben"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr "Bygger"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Mislykkedes"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Lukket"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Ukendt"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Tom Sti>"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Forbindelse"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "Status"
+
+# Not 100% sure @translation "Circuit".
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Zoom til Kredsløb"
+
+# Not 100% sure @translation "Circuit".
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "Luk Kredsløb (Del)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Luk Strøm (Del)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "Generelt"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Netværk"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr "Deling"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "Tjenester"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Udseende"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Avanceret"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Hjælp"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Fejl ved Gemning af Indstillinger"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr "Vidalia kunne ikke gemme dine %1 indstillinger."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Fejl ved anvendelse af Indstillinger"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia kunne ikke anvende dine %1 indstillinger til Tor."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Indstillinger"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Vidalia kunne ikke forbinde til Tor. (%1)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "Kontrol socket er ikke tilsluttet."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "Kodeord påkrævet"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+msgstr ""
+"Vidalia har forbundet til en kørende Tor process der kræver kodeord.Angiv "
+"venligst dit kontrol kodeord:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: controlpasswordinputdialog.ui:99
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
+msgstr "Husk mit kodeord"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: controlsocket.cpp:70
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "Kontrol socket er ikke forbundet."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: controlsocket.cpp:80
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Fejl ved sending af kontrol kommando. [%1]"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: controlsocket.cpp:117
+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."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: controlsocket.cpp:156
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Ugyldigt kontrol svar. [%1]"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Program filer (*.exe)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Vælg Stien til Tor"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: generalpage.cpp:85
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "Vælg Proxy Programfil"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: generalpage.cpp:98
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr "Du skal angive navnet på din Tor programfil."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: generalpage.cpp:106
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr "Proxy angivne argumenter er ikke korrekt formaterede."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: generalpage.ui:28
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr "Start Vidalia når mit system starter"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: generalpage.ui:121
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr "Gennemse"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Start Tor når Vidalia starter"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "Tor"
+msgstr "Tor"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: generalpage.ui:93
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr "Proxy Program (valgfri)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: generalpage.ui:99
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "Start et proxy program når Tor starter"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: generalpage.ui:135
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Proxy Program Argumenter:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr "Recv:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+msgid "Sent: "
+msgstr "Sendt:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: graphframe.cpp:259
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr "%1 KB"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: graphframe.cpp:262
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr "%1 MB"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: graphframe.cpp:265
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr "%1 GB"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.cpp:135
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents: "
+msgstr "Fejl ved indlæsning Hjælp Indholdet:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.cpp:147
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr "Angivne XML fil er ikke et gyldigt Indholds dokument"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.cpp:396
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "Søgning har nået slutning af dokument"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.cpp:398
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "Søgning har nået start af dokument"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.cpp:400
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "Tekst ikke fundet i dokument"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.cpp:445
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "Fundet %1 resultat(er)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:33
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Vidalia Hjælp"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:484
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Tilbage"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:487
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Gå til sidste side (Slet)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:490
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Slet"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:498
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Frem"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:501
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Gå til næste side (Shift+Slet)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:504
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Slet"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:512
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Hjem"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:515
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Gå til Hjem siden (Ctrl+H)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:518
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:535
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Find"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:538
+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)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:541
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:549
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Luk"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:552
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Luk Vidalia Hjælp"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:555
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:152
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Find:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:174
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Find Sidste"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:187
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Find Næste"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:221
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "Versalfølsomt"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:231
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Kun hele ord"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:305
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Hjælpe Emner"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:260
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Indhold"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:350
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Søg"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:362
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Søger efter:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helpbrowser.ui:405
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Fundet Dokumenter"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helptextbrowser.cpp:54
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file: "
+msgstr "Fejl ved åbning af hjælpfil: "
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helptextbrowser.cpp:72
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr "Åbner Eksternt Link"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: 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 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. "
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr "Skal Vidalia åbne linket i din Internet Browser?"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr "Kan ikke Åbne Linket"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: 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 ""
+"Vidalia kunne ikke åben det valgte link i din Internet Browser. Du kan "
+"stadig kopiere URLen og paste den ind i din browser."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr "Licens Information"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "Licens"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr "Tak til"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "Debug"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Info"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Meddelelse"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Advarsel"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Fejl"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Ukendt"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:233
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "Start Tor"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:443
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Afslut"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:304
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Båndbredde graf"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:317
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Meddelelses Log"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:348
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Netværks Kort"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:354
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr "Kontrolpanel"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:380
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Indstillinger"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:430
+msgctxt "MainWindow"
+msgid "About"
+msgstr "Om"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:367
+msgctxt "MainWindow"
+msgid "Help"
+msgstr "Hjælp"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1391
+msgctxt "MainWindow"
+msgid "New Identity"
+msgstr "Ny Identitet"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:437
+msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:438
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:439
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:440
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:441
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:442
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:443
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:463
+msgctxt "MainWindow"
+msgid "Tor"
+msgstr "Tor"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:468
+msgctxt "MainWindow"
+msgid "View"
+msgstr "Se"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:476
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Vidalia Hjælp"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:527
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "Fejl ved start af Internetbrowser"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:528
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia kunne ikke starte den konfigurerede internetbrowser"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:540
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "Fejl ved start af IM klient"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:541
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "Vidalia kunne ikke starte den konfigurerede IM klient"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:562
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Fejl ved start af proxy server"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:563
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia kunne ikke starte den konfigurerede proxy server"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:579
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Tilslutter til relæ mappe"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:583
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "Opretter en krypteret mappe forbindelse"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:586
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "Henter netværk status"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:589
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "Henter netværk status"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:592
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "Henter nøglecentercertifikater"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:595
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "Beder om relæ information"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:598
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "Henter relæ information"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1132
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "Forbinder til Tor netværk"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:605
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "Opretter et Tor kredsløb"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1297
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr "Forbinder til Tor netværket!"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:612
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Ukendt startop status"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:619
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr "diverse"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:622
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "identitet matcher ikke"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:625
+msgctxt "MainWindow"
+msgid "done"
+msgstr "færdig"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:628
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "forbindelse afvist"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:631
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "forbindelse timeout"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:634
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "læs/skriv fejl"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:637
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "ingen rute til vært"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:640
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "utilstrækkelige ressourcer"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:643
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "ukendt"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:645
+msgctxt "MainWindow"
+msgid " failed (%1)"
+msgstr "mislykkedes (%1)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:168
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor kører ikke"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:686
+msgctxt "MainWindow"
+msgid "Your relay is shutting down."
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+"Dit relæ er ved at lukke ned. Klik 'Stop' igen for at stoppe dit relæ nu."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:688
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "Tor er ved at lukke ned"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:693
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Stop Tor Nu"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:695
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr "Stop Tor"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:711
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Starter Tor"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:75
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "Starter Tor"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:859
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Mislykket Tor Start"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: 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 kunne ikke starte Tor. Kontroller dine indstillinger for at sikre, "
+"at din Tor programfil er korrekt angivet med navn og placering."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:896
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "Forbinder til Tor"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:906
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "Forbindelse mislykkedes"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:938
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "Genudlægning er aktiveret"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: 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 ""
+"Du kører i øjeblikket et relæ. Slukning af dit relæ af afbryde alle åbne "
+"forbindelse fra klienter. Vil du lukke gradvist ned og give klienterne tid "
+"til at finde et nyt relæ?"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:965
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "Fejl ved Nedlukning"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:966
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "Vidalia kunne ikke stoppe Tor."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:997
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "Uforventet fejl"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: 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 ""
+"Vidalia har opdaget at Tor blev afsluttet uventet. Undersøg venligst dine "
+"log-beskeder for nylige fejl og beskeder. "
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1055
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Godkender til Tor"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1075
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "Cookie Godkendelse Påkrævet"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: 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 kræver at Vidalia sender indholdet af en godkendelses-cookie, men "
+"Vidalia var i stand til at finde en."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1080
+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?"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1087
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Data Mappe"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1089
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Kontrol Cookie (control_auth_cookie)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1141
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "Fejl Registrering af Begivenheder"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1143
+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."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1222
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Godkendelsesfejl"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1224
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia kunne ikke godkende Tor. (%1)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1226
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Tjek venligst din kontrolports godkendelses indstillinger."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1330
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "Tor Opdatering Tilgængelig"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: 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 ""
+"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."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1333
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Tor hjemmeside: %1"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1394
+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."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "Mislykkedes af Oprette Ny Identitet"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "Port Viderestilling Mislykkedes"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "Vidalia kunne ikke opsætte automatisk port viderestilling."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Vidalia Kontrolpanel"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "Status"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Vidalia Genveje"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Indstil Relæ"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Opsæt et relæ and hjælp netværket gro"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Se Netværket"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Se et kort over Tor netværket"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Brug en Ny Identitet"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Få efterfølgende forbindelse til at se nye ud"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Vis seneste båndbredde"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Se log-besked historie"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Se hjælpe dokumentation"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Indstil Vidalia"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Se version og licens information"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Afslut Vidalia"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Vis vinduet ved opstart"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Skjul"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Skjul dette vindue"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr "Nulstil Kodeord Mislykkedes"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+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."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+"Besked der kommer når noget er gået helt galt og Tor ikke kan komme videre."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr "Besked der kun kommer når der er gået noget galt med Tor."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: 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 ""
+"Beskeder, der vises sjældent under normal Tor drift og anses ikke for fejl, "
+"men du kan interesserer dig for."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr "Besked der ofte kommer under normal Tor drift."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:136
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of "
+"interest to Tor developers."
+msgstr " Hyper-verbose beskeder primært af interesse for Tor udviklere."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:189
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Fejl ved Indstilling af Filter"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:190
+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."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:205
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "Fejl ved Åbning af Logfil"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:206
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia kunne ikke åbne den angivne logfil."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:227
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Log Filnavn Påkrævet"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:229
+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."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:280
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Vælg Log Fil"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:297
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Gem Log Besked"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:300
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Tekst Filer (*.txt)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:309
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:310
+msgctxt "MessageLog"
+msgid "Cannot write file %1"
+""
+"%2."
+msgstr "Kan ikke skrive fil %1%2."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:360
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Find i Besked Log"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:361
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Find:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:367
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Ikke Fundet"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.cpp:368
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "Søgning fandt 0 resultater."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:19
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Besked Log"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:452
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Besked Filtre..."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:455
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Indstil besked filtre"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:463
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Historie Størrelse..."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:466
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Angiv hvor mange beskeder der skal vises"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:477
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Ryd"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:480
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Ryd alle beskeder fra Besked Loggen (Ctrl+E)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:483
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:497
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Kopier"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:500
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Kopier den valgte besked til udklipholderen (Ctrl+C)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:503
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:514
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Vælg alle"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:517
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Vælg alle beskeder (Ctrl+A)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:520
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:528
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Gem Alle"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:531
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Gem alle beskeder til en fil"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:539
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Gem Valgte"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:542
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Gem valgte beskeder til en fil"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:553
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Indstillinger"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:556
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Juster Logbesked Instillingerne"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:559
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:567
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Hjælp"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:570
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Vis hjælp browseren"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:573
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:581
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Luk"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:584
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Luk Besked Loggen"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:587
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:598
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Find"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:601
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Find alle beskeder indeholdende søge teksten (Ctrl+F)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:604
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:66
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Tid"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:71
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Type"
+
+#: messagelog.ui:76
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Besked"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:160
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Gemmer de nuværende Logbesked instillinger"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:163
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Gem Indstillinger"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:179
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Annullerer ændringer foretaget i indstillingerne"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:182
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Annuller"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:196
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Besked Filter"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:217
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Fejl"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:233
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Advarsel"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:249
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Meddelelse"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:265
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Info"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:281
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Debug"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:297
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "Logbesked Historie"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:318
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Antal beskeder der skal vises i logbesked vinduet"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:337
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "beskeder"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Gem Altid Nye Log Beskeder"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "Gennemse"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:394
+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"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "Gem automatisk nye log-meddelelser til en fil"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor Netværks Kort"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Genopfrisk"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "Genopfrisk listen med Tor relæer og forbindelser"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Hjælp"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Vis netværk kort hjælpen"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Vis netværk kort hjælp"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Luk"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Luk netværks kortet"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Zoom Ind"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Zoom ind på netværks kortet"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Zoom Ud"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Zoom ud på netværks kortet"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Zoom til at Passe"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Zoomer til at passe for alle pt. viste relæ"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "Ugyldig Bro"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "Den angivne bro identifikator er ikke gyldigt."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr "Kopier (Ctrl+C)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: 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 ""
+"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."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.cpp:278
+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."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' er ikke et accepteret port nummer."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:25
+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"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "Jeg bruger en proxy for at forbinde til Internettet"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr "Proxy Indstillinger"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "HTTP Proxy:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr "Brugernavn:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "Brug også denne proxy til HTTPS"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr "Kodeord:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "Port:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:176
+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"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "Min firewall lader mig kun forbinde til specifikke porte"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "Firewall Indstillinger"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "Tilladte Porte:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr "80, 443"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:235
+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"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "Min udbyder (ISP) blokerer forbindelse til Tor netværket"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr "Bro Indstillinger"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+"Tor programmet som du kører i øjeblikket understøtter ikke "
+"broer.<br>Mappeforbindelser vil stadig være krypterede."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:295
+msgctxt "NetworkPage"
+msgid "Add a Bridge:"
+msgstr "Tilføj en Bro:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Hvordan finder Jeg en bro?</a>"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr "Fjern den valgte bro fra listen"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr "Kopier den valgte bro til udklipsholderen"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: policy.cpp:167
+msgctxt "Policy"
+msgid "accept"
+msgstr "godkend"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: policy.cpp:167
+msgctxt "Policy"
+msgid "reject"
+msgstr "afvis"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerdescriptor.cpp:76
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Online"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerdescriptor.cpp:78
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Dvale"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerdescriptor.cpp:80
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Offline"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerdescriptorview.cpp:139
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Lokation:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerdescriptorview.cpp:143
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "IP Adresse:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerdescriptorview.cpp:144
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Platform:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerdescriptorview.cpp:148
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Båndbrede:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerdescriptorview.cpp:150
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Oppe tid:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerdescriptorview.cpp:156
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Sidst Opdateret:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerdescriptorview.cpp:100
+msgctxt "RouterDescriptorView"
+msgid "%1 days "
+msgstr "%1 dage"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr "%1 timer"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr "%1 min."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr "%1 sek."
+
+#: routerdescriptorview.cpp:48
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Kopier"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerlistitem.cpp:67
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Offline"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerlistitem.cpp:71
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "I Dvale"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerlistitem.cpp:83
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerlistwidget.cpp:49
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Relæ"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerlistwidget.cpp:74
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "Zoom til Relæ"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerlistwidget.cpp:220
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 relæer online"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerlistwidget.cpp:67
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Kopier"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerlistwidget.cpp:68
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "Kaldenavn"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: routerlistwidget.cpp:71
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "Fingeraftryk"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.cpp:140
+msgctxt "ServerPage"
+msgid "Bridge Support Unavailable"
+msgstr "Bro Support er Ikke Tilgælgelig"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: 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 ""
+"Du har konfigureret Tor til at fungere som en relæ-bro for censureret "
+"brugere, men din version af Tor understøtter ikke broer."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.cpp:145
+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æ."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.cpp:199
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "Din relæ-bro kører ikke"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.cpp:263
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "Du skal angive mindst et kaldenavn og port."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:25
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "Kør kun som en klient"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:32
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Relæ trafik til Tor netværket"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:39
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
+msgstr ""
+"Hjælp censurerede brugere nå Tor netværket (Tor 0.2.0.8-alpha eller nyere)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:91
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "Relæ Port:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:110
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "Tænd for at afbillede relæ mappe"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:113
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory "
+msgstr "Afbillede Relæ Mappen"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:139
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "Forsøg at indstille automatisk port viderestilling"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:154
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "Test"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:164
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "Vis hjælp emner om viderestilling af porte"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: 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 ""
+"E-mail-adresse, hvor du kan nås, hvis der er aproblem med dit relæ. Du kan "
+"også inkludere din PGP eller GPG fingeraftryk."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:234
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Mappe Port:"
+
+#: serverpage.ui:267
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Mappe Port Nummer:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:279
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Kontakt Info:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:337
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "Navnet på dit relæ"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:370
+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æ"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:380
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Kaldenavn:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:76
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Grundlæggende indstillinger"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:435
+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."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "Kabel/DSL 256 Kbps"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "Kabel/DSL 512 Kbps"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "Kabel/DSL 768 Kbps"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/Kabel/DSL 1.5 Mbps"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 1.5 Mbps"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "Tilpasset"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Vælg den adgang, der mest ligner din internetforbindelse"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Vis hjælp emner om båndbrede grænser"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Gennemsnitlig"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Langsigtede gennemsnit båndbredde grænse"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Maksimal Hastighed"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "Peak båndbrede grænse"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: 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 ""
+"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."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Båndbrede Grænser"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Porte 6660 - 6669 og 6697"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relæ Chat (IRC)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Porte 110, 143, 993 og 995"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Modtag Mail (POP, IMAP)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Porte uspecificerede af andre afkrydsningsfelter"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Diverse Andre Tjenester"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Porte 706, 1863, 5050, 5190, 5222, 5223, 8300 og 8888"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "Instant Messaging (IM)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "Port 443"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "Sikker Hjemmeside (SSL)"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Port 80"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Hjemmeside"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "Vis hjælpe emne om afslutningspolitikker"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:969
+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æ?"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: 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 vil stadig blokere nogle udgående post og fildeling applikationer som "
+"standard for at reducere spam og anden misbrug."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Afslutningspolitikker"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:1015
+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:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:1039
+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"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr "Kopier dit bro relæs identitet til udklipsholderen"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.cpp:116
+msgctxt "ServicePage"
+msgid "Error while trying to unpublish all services"
+msgstr "Fejl under forsøg på at annullere udgivelsen af alle tjenester"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: 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 ""
+"Opsæt mindst en tjeneste mappe og en virtuel port for hver tjeneste du vil "
+"gemme. Fjern de andre."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Fejl"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "Vælg venligst en Tjeneste."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "Vælg en Service Mappe"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "Virtuel Port må kun indeholde godkendte port numre [1...65535]."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "Målet kan kun indeholde adresse: port, adresse, eller port."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr "Mappen er allerede i brug af en anden tjeneste."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "Form"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr "Angivne Skjulte Tjenester"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "Onion Adresse"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "Virtuel Port"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "Mål"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "Mappe Sti"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "Aktiveret"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "Tilføj en ny tjeneste til listen"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "Fjern den valgte tjeneste fra listen"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr "Kopier onion adresse fra den valgte tjeneste til udklipsholderen"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.ui:123
+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"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "Lavet af Tor"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr "Ny"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Finder"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Forbinder"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr "Åben"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Mislykkedes"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Lukket"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Prøver igen"
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "Genmapped"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Ukendt"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "Tjeneste %1 mislykkedes at stoppe. [%2]"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "Tor tjenesten er ikke installeret."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "Kan ikke starte Tor tjenesten."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "Kunne ikke finde hash-værdi af kodeordet."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "Succes"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "Ingen UPnP-aktiverede enheder fundet"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "Ingen gyldige UPnP-aktiverede Internet gateway enheder fundet"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "WSAStartop mislykkedes"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "Det lykkedes ikke at tilføje en port angivning"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "Det lykkedes ikke at hente en port angivning"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "Det lykkedes ikke at fjerne en port angivning"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "Ukendt fejl"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "Søger efter UPnP-aktiverede enheder"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "Opdaterer mappe port angivninger"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "Opdaterer relæ port angivninger"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "Test gennemført succesfuldt!"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "Tester UPnP Understøttelse"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr "Tester Universal Plug & Plug Understøttelse"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "OK"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Annuller"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Ja"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Nej"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Hjælp"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Forsøg igen"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Vis Log"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Vis Indstillinger"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Fortsæt"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Afslut"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Gennemse"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Argumentet er ugyldigt"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia kører allerede"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: 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 ""
+"Der kører muligvis en anden Vidalia proces allerede. Hvis der virkelig ikke "
+"kører en anden Vidalia proces, kan du vælge at fortsætte alligevel. Vil du "
+"fortsætte med at starte Vidalia?"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Viser denne brugs beskeder og afslutter."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "Nulstiller ALLE gemte Vidalia indstillinger."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Indstiller mappen som Vidalia bruger til data filer."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Indstiller navn og placering af Vidalias profil."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Indstiller navn og placering af Vidalias logfil."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Indstiller mængden af data Vidalia logger."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Indstiller Vidalias græseflade stil."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Indstiller Vidalias sprog."
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Vidalia Forbrugs Information"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr "Ugyldig sprog kode angivet:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr "Ugyldig GUI stil angivet:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr "Ugyldig log niveau angivet:"
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "Kunne ikke åbne log fil '%1': %2"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/de/qt_de.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/de/qt_de.po
new file mode 100644
index 0000000..beb80df
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/de/qt_de.po
@@ -0,0 +1,442 @@
+msgid ""
+msgstr ""
+"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-03-13 16:58-0700\n"
+"Last-Translator: CS <cs at carlostrub.ch>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "Aktivieren"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "Die Anwendung '%1' benötigt Qt %2; es wurde aber Qt %3 gefunden."
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "Qt Bibliothek ist inkompatibel"
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "LTR"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "Aktiviert das Programmhauptfenster"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "OK"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "Speichern"
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "Öffnen"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "Schliessen"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "Anwenden"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "Zurücksetzen"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "Hilfe"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "Nicht speichern"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "Verwerfen"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "&Ja"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "Ja zu &allem"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "&Nein"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "N&ein zu allem"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "Alles speichern"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "Abbrechen"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "Wiederholen"
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "Ignorieren"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "Voreinstellungen wiederherstellen"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "Schliessen ohne Speichern"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "&OK"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "Name"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "Grösse"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "Art"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "Typ"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "Änderungsdatum"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "Alle Dateien (*)"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "Verzeichnisse"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "&Öffnen"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "S&peichern"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "Öffnen"
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"Die Datei %1 existiert bereits.\n"
+"Soll sie überschrieben werden?"
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+"%1\n"
+"Die Datei konnte nicht gefunden werden.\n"
+"Stellen Sie sicher, dass der Dateiname richtig ist."
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "Mein Computer"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "&Umbenennen"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "&Löschen"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "&Versteckte Dateien anzeigen"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "Zurück"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "Übergeordnetes Verzeichnis"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "Liste"
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "Details"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "Dateien des Typs:"
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "Verzeichnis:"
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+"%1\n"
+"Das Verzeichnis konnte nicht gefunden werden.\n"
+"Stellen Sie sicher, dass der Verzeichnisname richtig ist."
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+"'%1' ist schreibgeschützt.\n"
+"Möchten Sie die Datei trotzdem löschen?"
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "Sind Sie sicher, dass Sie '%1' löschen möchten?"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "Konnte Verzeichnis nicht löschen."
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "Alle Dateien (*.*)"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "Speichern unter"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "Laufwerk"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "Datei"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "Verzeichnis suchen"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "Anzeigen "
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "Vorwärts"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "Neues Verzeichnis"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "&Neues Verzeichnis"
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "&Auswählen"
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "Löschen"
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "Datei&name:"
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "Suche in:"
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "Neuen Ordner erstellen"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "Invalid filename"
+msgstr "Ungültiger Dateiname"
+
+#: 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>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"
+msgid "Name"
+msgstr "Name"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "Grösse"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "Art"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "Typ"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "Änderungsdatum"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "Mein Computer"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "Computer"
+
+#: 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 byte"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/de/vidalia_de.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/de/vidalia_de.po
new file mode 100644
index 0000000..b089be4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/de/vidalia_de.po
@@ -0,0 +1,3367 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2010-04-02 06:17-0600\n"
+"Last-Translator: CS <cs at carlostrub.ch>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Über Vidalia"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "Lizenz"
+
+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 "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' ist keine gültige IP-Adresse."
+
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "Sie haben 'Passwort'-Authentifizierung ausgewählt, aber kein Passwort angegeben."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Wählen Sie die Tor-Konfigurationsdatei aus."
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Datei nicht gefunden"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 existiert nicht. Möchten Sie es erstellen?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Datei konnte nicht erstellt werden"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "Konnte %1 nicht erstellen [2%]"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Wählen Sie ein Verzeichnis zum Speichern der Daten für Tor aus"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Tor-Dienst konnte nicht entfernt werden"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "Tor-Dienst konnte nicht installiert werden"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "Vidalia konnte Tor nicht als Dienst einrichten."
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Kontroll-Port"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "Authentifikation:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Adresse:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "Keine"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Cookie"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Passwort"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "zufällig erzeugen"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Tor-Konfigurationsdatei"
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "Starte die Tor-Software mit der angegebenen Konfigurationsdatei (torrc)"
+
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "Wählen Sie den Pfad zu Ihrer Konfigurationsdatei"
+
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Öffnen"
+
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr "Datenverzeichnis"
+
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr "Speichere Daten für die Tor-Software im folgenden Verzeichnis"
+
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+"Wählen Sie das Verzeichnis, das verwendet wird, um Daten für die Tor-"
+"Software zu speichern"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+"Vidalia konnte den Tor-Dienst nicht entfernen\n"
+"\n"
+"Sie müssen diesen manuell entfernen."
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Sprache"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Wählen Sie die Sprache für Vidalia aus"
+
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Aussehen"
+
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Wählen Sie Vidalias Aussehen"
+
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr "Vidalia konnte die gewählte Sprache nicht laden."
+
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr "Seit:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Verstecke Einstellungen"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Zeige Einstellungen"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Bandbreitennutzung von Tor"
+
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "Zurücksetzen"
+
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Empfangsrate"
+
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Senderate"
+
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Immer im Vordergrund"
+
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Aussehen"
+
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Ändert die Transparenz des Bandbreitengraphs"
+
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% undurchsichtig"
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Anwenden"
+
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Abbrechen"
+
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr "Starte HTTPS-Anfrage..."
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr "Verbinde zu %1:%2..."
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr "Schicke eine HTTPS-Anfrage für Brückenserver..."
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr "Liste eine Liste von Brückenservern herunter..."
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr "Lade Brückenserver herunter..."
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr "Brückenserver konnten nicht heruntergeladen werden: %1"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr "Versuche noch eine Anfrage nach Brückenservern..."
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr "Land"
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr "Anzahl der Clients"
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr ""
+"Rechner aus den folgenden Ländern haben deinen Tor-Server seit %1 benutzt"
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr "Zusammenfassung der Nutzung des Brückenservers"
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr "Zusammenfassung der Clientrechner"
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "Neu"
+
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Verbunden"
+
+msgctxt "Circuit"
+msgid "Building"
+msgstr "Aufbauen"
+
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Fehlgeschlagen"
+
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Geschlossen"
+
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Unbekannt"
+
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Leerer Pfad>"
+
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Verbindung"
+
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "Status"
+
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Kanal heranzoomen"
+
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "Kanal schließen (Entf)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Datenstrom schließen (Entf)"
+
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "Allgemein"
+
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Netzwerk"
+
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr "Beteiligung"
+
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "Dienste"
+
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Aussehen"
+
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Fortgeschritten"
+
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Hilfe"
+
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Fehler beim Speichern der Einstellungen"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr "Vidalia konnte Ihre %1 Einstellungen nicht speichern."
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Fehler beim Anwender der Einstellungen"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia konnte ihre %1 Einstellungen nicht auf Tor anwenden."
+
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Einstellungen"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Vidalia konnte sich nicht mit Tor verbinden. (%1)"
+
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "Kontrollsocket ist nicht verbunden."
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "Password wird benötigt"
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
+msgstr "Mein Passwort speichern"
+
+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:"
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "Kontrollsocket ist nicht verbunden."
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Fehler beim Senden eines Steuerkommandos. [%1]"
+
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr "Beim Lesen von Daten wurde der Socket unterbrochen."
+
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Unbekannte Kontrollantwort. [%1]"
+
+msgctxt "CountryInfo"
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+msgctxt "CountryInfo"
+msgid "Andorra"
+msgstr "Andorra"
+
+msgctxt "CountryInfo"
+msgid "Angola"
+msgstr "Angola"
+
+msgctxt "CountryInfo"
+msgid "Antigua & Barbuda"
+msgstr "Antigua & Barbuda"
+
+msgctxt "CountryInfo"
+msgid "Argentina"
+msgstr "Argentinien"
+
+msgctxt "CountryInfo"
+msgid "Armenia"
+msgstr "Armenien"
+
+msgctxt "CountryInfo"
+msgid "Australia"
+msgstr "Australien"
+
+msgctxt "CountryInfo"
+msgid "Azerbaijan"
+msgstr "Aserbaidschan"
+
+msgctxt "CountryInfo"
+msgid "Bahamas"
+msgstr "Bahamas"
+
+msgctxt "CountryInfo"
+msgid "Bangladesh"
+msgstr "Bangladesch"
+
+msgctxt "CountryInfo"
+msgid "Barbados"
+msgstr "Barbados"
+
+msgctxt "CountryInfo"
+msgid "Belarus"
+msgstr "Weißrussland"
+
+msgctxt "CountryInfo"
+msgid "Belgium"
+msgstr "Belgien"
+
+msgctxt "CountryInfo"
+msgid "Belize"
+msgstr "Belize"
+
+msgctxt "CountryInfo"
+msgid "Bhutan"
+msgstr "Bhutan"
+
+msgctxt "CountryInfo"
+msgid "Bolivia"
+msgstr "Bolivien"
+
+msgctxt "CountryInfo"
+msgid "Bosnia & Herzegovina"
+msgstr "Bosnien & Herzegowina"
+
+msgctxt "CountryInfo"
+msgid "Botswana"
+msgstr "Botsuana"
+
+msgctxt "CountryInfo"
+msgid "Brazil"
+msgstr "Brasilien"
+
+msgctxt "CountryInfo"
+msgid "Brunei Darussalam"
+msgstr "Brunei"
+
+msgctxt "CountryInfo"
+msgid "Bulgaria"
+msgstr "Bulgarien"
+
+msgctxt "CountryInfo"
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+msgctxt "CountryInfo"
+msgid "Burundi"
+msgstr "Burundi"
+
+msgctxt "CountryInfo"
+msgid "Cambodia"
+msgstr "Kambodscha"
+
+msgctxt "CountryInfo"
+msgid "Cameroon"
+msgstr "Kamerun"
+
+msgctxt "CountryInfo"
+msgid "Canada"
+msgstr "Kanada"
+
+msgctxt "CountryInfo"
+msgid "Cape Verde"
+msgstr "Kap Verde"
+
+msgctxt "CountryInfo"
+msgid "Central African Republic"
+msgstr "Zentralafrikanische Republik"
+
+msgctxt "CountryInfo"
+msgid "Chad"
+msgstr "Tschad"
+
+msgctxt "CountryInfo"
+msgid "Chile"
+msgstr "Chile"
+
+msgctxt "CountryInfo"
+msgid "China"
+msgstr "China"
+
+msgctxt "CountryInfo"
+msgid "Colombia"
+msgstr "Kolumbien"
+
+msgctxt "CountryInfo"
+msgid "Comoros"
+msgstr "Komoren"
+
+msgctxt "CountryInfo"
+msgid "Congo, The Democratic Republic of the"
+msgstr "Demokratische Republik Kongo"
+
+msgctxt "CountryInfo"
+msgid "Congo"
+msgstr "Kongo"
+
+msgctxt "CountryInfo"
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+msgctxt "CountryInfo"
+msgid "Cote d’Ivoire"
+msgstr "Elfenbeinküste"
+
+msgctxt "CountryInfo"
+msgid "Croatia"
+msgstr "Kroatien"
+
+msgctxt "CountryInfo"
+msgid "Cuba"
+msgstr "Kuba"
+
+msgctxt "CountryInfo"
+msgid "Cyprus"
+msgstr "Zypern"
+
+msgctxt "CountryInfo"
+msgid "Czech Republic"
+msgstr "Tschechische Republik"
+
+msgctxt "CountryInfo"
+msgid "Denmark"
+msgstr "Dänemark"
+
+msgctxt "CountryInfo"
+msgid "Djibouti"
+msgstr "Dschibuti"
+
+msgctxt "CountryInfo"
+msgid "Dominica"
+msgstr "Dominica"
+
+msgctxt "CountryInfo"
+msgid "Dominican Republic"
+msgstr "Dominikanische Republik"
+
+msgctxt "CountryInfo"
+msgid "Ecuador"
+msgstr "Ecuador"
+
+msgctxt "CountryInfo"
+msgid "Egypt"
+msgstr "Ägypten"
+
+msgctxt "CountryInfo"
+msgid "El Salvador"
+msgstr "El Salvador"
+
+msgctxt "CountryInfo"
+msgid "Equatorial Guinea"
+msgstr "Äquatorialguinea"
+
+msgctxt "CountryInfo"
+msgid "Eritrea"
+msgstr "Eritrea"
+
+msgctxt "CountryInfo"
+msgid "Estonia"
+msgstr "Estland"
+
+msgctxt "CountryInfo"
+msgid "France"
+msgstr "Frankreich"
+
+msgctxt "CountryInfo"
+msgid "Gabon"
+msgstr "Gabun"
+
+msgctxt "CountryInfo"
+msgid "Gambia"
+msgstr "Gambia"
+
+msgctxt "CountryInfo"
+msgid "Georgia"
+msgstr "Georgien"
+
+msgctxt "CountryInfo"
+msgid "Germany"
+msgstr "Deutschland"
+
+msgctxt "CountryInfo"
+msgid "Ghana"
+msgstr "Ghana"
+
+msgctxt "CountryInfo"
+msgid "Grenada"
+msgstr "Grenada"
+
+msgctxt "CountryInfo"
+msgid "Guatemala"
+msgstr "Guatemala"
+
+msgctxt "CountryInfo"
+msgid "Guinea"
+msgstr "Guinea"
+
+msgctxt "CountryInfo"
+msgid "Guinea-Bissau"
+msgstr "Guinea-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 "Israel"
+
+msgctxt "CountryInfo"
+msgid "Italy"
+msgstr "Italien"
+
+msgctxt "CountryInfo"
+msgid "Jamaica"
+msgstr "Jamaika"
+
+msgctxt "CountryInfo"
+msgid "Japan"
+msgstr "Japan"
+
+msgctxt "CountryInfo"
+msgid "Jordan"
+msgstr "Jordanien"
+
+msgctxt "CountryInfo"
+msgid "Kazakhstan"
+msgstr "Kasachstan"
+
+msgctxt "CountryInfo"
+msgid "Kenya"
+msgstr "Kenia"
+
+msgctxt "CountryInfo"
+msgid "Kiribati"
+msgstr "Kiribati"
+
+msgctxt "CountryInfo"
+msgid "Kuwait"
+msgstr "Kuwait"
+
+msgctxt "CountryInfo"
+msgid "Kyrgyzstan"
+msgstr "Kirgisistan"
+
+msgctxt "CountryInfo"
+msgid "Laos"
+msgstr "Laos"
+
+msgctxt "CountryInfo"
+msgid "Latvia"
+msgstr "Lettland"
+
+msgctxt "CountryInfo"
+msgid "Lebanon"
+msgstr "Libanon"
+
+msgctxt "CountryInfo"
+msgid "Lesotho"
+msgstr "Lesotho"
+
+msgctxt "CountryInfo"
+msgid "Liberia"
+msgstr "Liberia"
+
+msgctxt "CountryInfo"
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+msgctxt "CountryInfo"
+msgid "Lithuania"
+msgstr "Litauen"
+
+msgctxt "CountryInfo"
+msgid "Luxembourg"
+msgstr "Luxemburg"
+
+msgctxt "CountryInfo"
+msgid "Macedonia"
+msgstr "Mazedonien"
+
+msgctxt "CountryInfo"
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+msgctxt "CountryInfo"
+msgid "Malawi"
+msgstr "Malawi"
+
+msgctxt "CountryInfo"
+msgid "Malaysia"
+msgstr "Malaysia"
+
+msgctxt "CountryInfo"
+msgid "Mali"
+msgstr "Mali"
+
+msgctxt "CountryInfo"
+msgid "Malta"
+msgstr "Malta"
+
+msgctxt "CountryInfo"
+msgid "Marshall Islands"
+msgstr "Marshallinseln"
+
+msgctxt "CountryInfo"
+msgid "Mauritania"
+msgstr "Mauretanien"
+
+msgctxt "CountryInfo"
+msgid "Mauritius"
+msgstr "Mauritius"
+
+msgctxt "CountryInfo"
+msgid "Micronesia"
+msgstr "Mikronesien"
+
+msgctxt "CountryInfo"
+msgid "Moldova"
+msgstr "Moldawien"
+
+msgctxt "CountryInfo"
+msgid "Monaco"
+msgstr "Monaco"
+
+msgctxt "CountryInfo"
+msgid "Mongolia"
+msgstr "Mongolei"
+
+msgctxt "CountryInfo"
+msgid "Montenegro"
+msgstr "Montenegro"
+
+msgctxt "CountryInfo"
+msgid "Morocco"
+msgstr "Marokko"
+
+msgctxt "CountryInfo"
+msgid "Mozambique"
+msgstr "Mosambik"
+
+msgctxt "CountryInfo"
+msgid "Namibia"
+msgstr "Namibia"
+
+msgctxt "CountryInfo"
+msgid "Nauru"
+msgstr "Nauru"
+
+msgctxt "CountryInfo"
+msgid "Nepal"
+msgstr "Nepal"
+
+msgctxt "CountryInfo"
+msgid "Netherlands"
+msgstr "Niederlande"
+
+msgctxt "CountryInfo"
+msgid "New Zealand"
+msgstr "Neuseeland"
+
+msgctxt "CountryInfo"
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+msgctxt "CountryInfo"
+msgid "Niger"
+msgstr "Niger"
+
+msgctxt "CountryInfo"
+msgid "Nigeria"
+msgstr "Nigeria"
+
+msgctxt "CountryInfo"
+msgid "Norway"
+msgstr "Norwegen"
+
+msgctxt "CountryInfo"
+msgid "Oman"
+msgstr "Oman"
+
+msgctxt "CountryInfo"
+msgid "Pakistan"
+msgstr "Pakistan"
+
+msgctxt "CountryInfo"
+msgid "Palau"
+msgstr "Palau"
+
+msgctxt "CountryInfo"
+msgid "Palestine"
+msgstr "Palästina"
+
+msgctxt "CountryInfo"
+msgid "Panama"
+msgstr "Panama"
+
+msgctxt "CountryInfo"
+msgid "Papua New Guinea"
+msgstr "Papua-Neuguinea"
+
+msgctxt "CountryInfo"
+msgid "Paraguay"
+msgstr "Paraguay"
+
+msgctxt "CountryInfo"
+msgid "Peru"
+msgstr "Peru"
+
+msgctxt "CountryInfo"
+msgid "Philippines"
+msgstr "Philippinen"
+
+msgctxt "CountryInfo"
+msgid "Poland"
+msgstr "Polen"
+
+msgctxt "CountryInfo"
+msgid "Portugal"
+msgstr "Portugal"
+
+msgctxt "CountryInfo"
+msgid "Qatar"
+msgstr "Katar"
+
+msgctxt "CountryInfo"
+msgid "Romania"
+msgstr "Rumänien"
+
+msgctxt "CountryInfo"
+msgid "Russia"
+msgstr "Russland"
+
+msgctxt "CountryInfo"
+msgid "Rwanda"
+msgstr "Ruanda"
+
+msgctxt "CountryInfo"
+msgid "Saint Kitts & Nevis"
+msgstr "Saint Kitts und Nevis"
+
+msgctxt "CountryInfo"
+msgid "Saint Lucia"
+msgstr "Saint Lucia"
+
+msgctxt "CountryInfo"
+msgid "Saint Vincent & the Grenadines"
+msgstr "St. Vincent und die Grenadinen"
+
+msgctxt "CountryInfo"
+msgid "Samoa"
+msgstr "Samoa"
+
+msgctxt "CountryInfo"
+msgid "San Marino"
+msgstr "San Marino"
+
+msgctxt "CountryInfo"
+msgid "Sao Tome & Principe"
+msgstr "São Tomé und Príncipe"
+
+msgctxt "CountryInfo"
+msgid "Saudi Arabia"
+msgstr "Saudi-Arabien"
+
+msgctxt "CountryInfo"
+msgid "Senegal"
+msgstr "Senegal"
+
+msgctxt "CountryInfo"
+msgid "Serbia"
+msgstr "Serbien"
+
+msgctxt "CountryInfo"
+msgid "Seychelles"
+msgstr "Seychellen"
+
+msgctxt "CountryInfo"
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+msgctxt "CountryInfo"
+msgid "Singapore"
+msgstr "Singapur"
+
+msgctxt "CountryInfo"
+msgid "Slovakia"
+msgstr "Slowakei"
+
+msgctxt "CountryInfo"
+msgid "Slovenia"
+msgstr "Slowenien"
+
+msgctxt "CountryInfo"
+msgid "Solomon Islands"
+msgstr "Salomonen"
+
+msgctxt "CountryInfo"
+msgid "Somalia"
+msgstr "Somalia"
+
+msgctxt "CountryInfo"
+msgid "South Africa"
+msgstr "Südafrika"
+
+msgctxt "CountryInfo"
+msgid "Spain"
+msgstr "Spanien"
+
+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 "Swasiland"
+
+msgctxt "CountryInfo"
+msgid "Sweden"
+msgstr "Schweden"
+
+msgctxt "CountryInfo"
+msgid "Switzerland"
+msgstr "Schweiz"
+
+msgctxt "CountryInfo"
+msgid "Syria"
+msgstr "Syrien"
+
+msgctxt "CountryInfo"
+msgid "Tajikistan"
+msgstr "Tadschikistan"
+
+msgctxt "CountryInfo"
+msgid "Tanzania"
+msgstr "Tansania"
+
+msgctxt "CountryInfo"
+msgid "Thailand"
+msgstr "Thailand"
+
+msgctxt "CountryInfo"
+msgid "Timor-Leste (East Timor)"
+msgstr "Osttimor"
+
+msgctxt "CountryInfo"
+msgid "Togo"
+msgstr "Togo"
+
+msgctxt "CountryInfo"
+msgid "Tonga"
+msgstr "Tonga"
+
+msgctxt "CountryInfo"
+msgid "Trinidad & Tobago"
+msgstr "Trinidad und Tobago"
+
+msgctxt "CountryInfo"
+msgid "Tunisia"
+msgstr "Tunesien"
+
+msgctxt "CountryInfo"
+msgid "Turkey"
+msgstr "Türkei"
+
+msgctxt "CountryInfo"
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+msgctxt "CountryInfo"
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+msgctxt "CountryInfo"
+msgid "Uganda"
+msgstr "Uganda"
+
+msgctxt "CountryInfo"
+msgid "Ukraine"
+msgstr "Ukraine"
+
+msgctxt "CountryInfo"
+msgid "United Arab Emirates"
+msgstr "Vereinigte Arabische Emirate"
+
+msgctxt "CountryInfo"
+msgid "United Kingdom"
+msgstr "Vereinigtes Königreich"
+
+msgctxt "CountryInfo"
+msgid "United States"
+msgstr "Vereinigten Staaten von Amerika"
+
+msgctxt "CountryInfo"
+msgid "Uruguay"
+msgstr "Uruguay"
+
+msgctxt "CountryInfo"
+msgid "Uzbekistan"
+msgstr "Usbekistan"
+
+msgctxt "CountryInfo"
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+msgctxt "CountryInfo"
+msgid "Vatican"
+msgstr "Vatikanstadt"
+
+msgctxt "CountryInfo"
+msgid "Venezuela"
+msgstr "Venezuela"
+
+msgctxt "CountryInfo"
+msgid "Vietnam"
+msgstr "Vietnam"
+
+msgctxt "CountryInfo"
+msgid "Western Sahara"
+msgstr "Westsahara"
+
+msgctxt "CountryInfo"
+msgid "Yemen"
+msgstr "Jemen"
+
+msgctxt "CountryInfo"
+msgid "Zambia"
+msgstr "Sambia"
+
+msgctxt "CountryInfo"
+msgid "Zimbabwe"
+msgstr "Simbabwe"
+
+msgctxt "CountryInfo"
+msgid "Albania"
+msgstr "Albanien"
+
+msgctxt "CountryInfo"
+msgid "Algeria"
+msgstr "Algerien"
+
+msgctxt "CountryInfo"
+msgid "Austria"
+msgstr "Österreich"
+
+msgctxt "CountryInfo"
+msgid "Bahrain"
+msgstr "Bahrain"
+
+msgctxt "CountryInfo"
+msgid "Benin"
+msgstr "Benin"
+
+msgctxt "CountryInfo"
+msgid "Ethiopia"
+msgstr "Äthiopien"
+
+msgctxt "CountryInfo"
+msgid "Fiji"
+msgstr "Fidschi"
+
+msgctxt "CountryInfo"
+msgid "Finland"
+msgstr "Finnland"
+
+msgctxt "CountryInfo"
+msgid "Greece"
+msgstr "Griechenland"
+
+msgctxt "CountryInfo"
+msgid "Guam"
+msgstr "Guam"
+
+msgctxt "CountryInfo"
+msgid "Hungary"
+msgstr "Ungarn"
+
+msgctxt "CountryInfo"
+msgid "Iceland"
+msgstr "Island"
+
+msgctxt "CountryInfo"
+msgid "India"
+msgstr "Indien"
+
+msgctxt "CountryInfo"
+msgid "Indonesia"
+msgstr "Indonesien"
+
+msgctxt "CountryInfo"
+msgid "Iran"
+msgstr "Iran"
+
+msgctxt "CountryInfo"
+msgid "Iraq"
+msgstr "Irak"
+
+msgctxt "CountryInfo"
+msgid "Ireland"
+msgstr "Irland"
+
+msgctxt "CountryInfo"
+msgid "Korea, North"
+msgstr "Nordkorea"
+
+msgctxt "CountryInfo"
+msgid "Korea, South"
+msgstr "Südkorea"
+
+msgctxt "CountryInfo"
+msgid "Libya"
+msgstr "Libyen"
+
+msgctxt "CountryInfo"
+msgid "Maldives"
+msgstr "Malediven"
+
+msgctxt "CountryInfo"
+msgid "Mexico"
+msgstr "Mexiko"
+
+msgctxt "CountryInfo"
+msgid "Myanmar"
+msgstr "Myanmar"
+
+msgctxt "CountryInfo"
+msgid "Taiwan"
+msgstr "Taiwan"
+
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Ausführbare Dateien (*.exe)"
+
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Wählen Sie den Pfad zum Tor-Verzeichnis aus"
+
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "Wähle Proxy-Anwendungsdatei"
+
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr "Sie müssen den Namen von Tors ausführbarer Datei angeben."
+
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr "Die Proxy-Argumente sind nicht passend formatiert."
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr "Starte Vidalia, wenn mein System hochfährt"
+
+msgctxt "GeneralPage"
+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"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr "Proxy (optional)"
+
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "Proxy starten, wenn Tor startet"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Argumente für die Proxy-Anwendung"
+
+msgctxt "GeneralPage"
+msgid "Software Updates"
+msgstr "Aktualisierungen der Software"
+
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
+msgstr "Prüfe automatisch auf neue Versionen"
+
+msgctxt "GeneralPage"
+msgid "Check Now"
+msgstr "Prüfe jetzt"
+
+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 "Empfangen:"
+
+msgctxt "GraphFrame"
+msgid "Sent:"
+msgstr "Gesendet:"
+
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr "Angegebene XML-Datei enthält kein gültiges Inhaltsverzeichnis."
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "Suche hat das Ende des Dokuments erreicht"
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "Suche hat den Anfang des Dokuments erreicht"
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "Text nicht gefunden"
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "%1 Ergebnisse gefunden"
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Vidalia-Hilfe"
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Zurück"
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Eine Seite zurück (Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Vorwärts"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Eine Seite vor (Shift+Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Startseite"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Zur Startseite (Strg+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Strg+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Suchen"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "Suche nach einem Wort oder Satz in der aktuellen Seite (Strg+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Strg+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Schließen"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Vidalia-Hilfe schließen"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Finde:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Finde Vorherige"
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Finde Nächste"
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "Groß-/Kleinschreibung beachten"
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Nur ganze Wörter"
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Hilfe-Themen"
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Inhalt"
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Suche"
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Suche nach:"
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Gefundene Dokumente"
+
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
+msgstr "Fehler beim Laden der Hilfe:"
+
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr "Öffne externen 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 kann den gewählten Link in Ihrem Standard-Webbrowser öffnen. Wenn der Browser jedoch nicht für die Nutzung von Tor konfiguriert ist, wird die Anfrage nicht anonym sein."
+
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr "Soll Vidalia den Link im Webbrowser öffnen?"
+
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr "Fehler beim Öffnen des Links"
+
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr "Vidalia konnte den gewählten Link nicht im Webbrowser öffnen. Sie können aber die URL kopieren und sie in Ihrem Browser einfügen."
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr "Fehler beim Öffnen der Hilfedatei:"
+
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr "Lizenzinformation"
+
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "Lizenz"
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr "Mitwirkende"
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "Debug"
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Info"
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Hinweis"
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Warnung"
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Fehler"
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Unbekannt"
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "Tor Starten"
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Beenden"
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Bandbreitengraph"
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Logbuch"
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Netzwerk-Landkarte"
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr "Kontrollpanel"
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Einstellungen"
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr "Über"
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr "Hilfe"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia konnte den angegebenen Webbrowser nicht starten"
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "Fehler beim Starten des IM-Clients"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "Vidalia konnte den konfigurierten IM-Client nicht starten"
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Fehler beim Start des Proxyservers"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia konnte den angegebenen Proxyserver nicht starten"
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Verbinde zu einem Verzeichnis"
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "Stelle eine verschlüsselte Verbindung zu einem Verzeichnis her"
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "Erfrage Netzwerkstatusdatei"
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "Lade Netzwerkstatusdatei"
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "Lade Zertifikate der zentralen Verzeichnisse"
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "Fordere Verteiler-Informationen an"
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "Lade Verteiler-Informationen"
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "Verbinde zum Tor-Netzwerk"
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "Erstelle einen Tor-Circuit"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "Nichtübereinstimmung der Identitäten"
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr "abgeschlossen"
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "Verbindung verweigert"
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "Verbindungszeitüberschreitung"
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "Lese-/Schreibfehler"
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "Kein Pfad zum Rechner"
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "Unzureichende Ressourcen"
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "unbekannt"
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor läuft nicht"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Starte die Tor-Software"
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "Tor Starten"
+
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Fehler beim Starten von 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 konnte Tor nicht starten. Überprüfen Sie Ihre Einstellungen, um sicherzustellen, dass der Pfad zur Tor-Anwendung korrekt angegeben ist."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "Verbinde zu Tor"
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "Verbindungsfehler"
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "Verteilung ist aktiviert"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "Fehler beim Herunterfahren"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "Vidalia konnte die Tor-Software nicht stoppen."
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "Unerwarteter Fehler"
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Authentifiziere bei Tor"
+
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "Cookie-Authentifikation erforderlich"
+
+msgctxt "MainWindow"
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgstr "Die Tor-Software fordert Vidalia dazu auf den Inhalt eines Authentifizierungskennworts zu schicken, aber Vidalia konnte kein solches finden."
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "Wollen Sie selbst nach der Datei 'control_auth_cookie' suchen?"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Datenverzeichnis"
+
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Authentifizierungskennwort (control_auth_cookie)"
+
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "Fehler bei der Registrierung für Ereignisse"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr "Vidalia konnte sich für einige Ereignisse nicht registrieren. Einige von Vidalias Funktionen könnten nicht verfügbar sein."
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Authentifizierungsfehler"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia konnte keine Authentifizierung gegenüber der Tor-Software durchführen. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Bitte überprüfen Sie die Authentifikationseinstellungen des Kontroll-Ports."
+
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "Tor-Update verfügbar"
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr "Die installierte Tor-Version ist veraltet und wird nicht länger empfohlen. Bitte besuchen Sie die Tor-Webseite, um die aktuelle Version herunter zu laden."
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Tor-Webseite: %1"
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "Alle folgenden Verbindungen werden anders als alte Verbindungen erscheinen."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "Konnte keine neue Identität erstellen"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "Port-Weiterleitung fehlgeschlagen"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "Vidalia konnte die automatische Port-Weiterleitung nicht einrichten."
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Vidalia Kontroll-Panel"
+
+msgctxt "MainWindow"
+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"
+
+# Not very good translated / Nicht wirklich gut uebersetzt.
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, 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."
+
+msgctxt "MainWindow"
+msgid "Would you like to check if a newer package is available for installation?"
+msgstr ""
+"Wollen Sie überpüfen, ob eine neuere Version zur Installation verfügbar ist?"
+
+msgctxt "MainWindow"
+msgid "Potentially Unsafe Connection"
+msgstr "Möglicherweise unsichere Verbindung"
+
+# It's Okay but not Perfect / Soweit in Ordnung aber noch verbesserungs wuerdig..
+msgctxt "MainWindow"
+msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
+msgstr ""
+"Eine Ihrer Anwendungen%1scheint potenziell unverschlüsselte und unsichere "
+"Verbindungen zu Port %2 aufzubauen. Alles, was über diese Verbindung "
+"gesendet wird, könnte überwacht werden. Bitte überprüfen Sie die "
+"Konfiguration Ihrer Anwendungen und verwenden Sie, wenn möglich, nur "
+"verschlüsselte Protokolle wie zum Beispiel SSL."
+
+msgctxt "MainWindow"
+msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgstr ""
+"Tor hat Ihre Verbindung automatisch geschlossen, um Ihre Anonymität zu "
+"schützen."
+
+msgctxt "MainWindow"
+msgid "Update Failed"
+msgstr "Update Fehlgeschlagen"
+
+msgctxt "MainWindow"
+msgid "Your software is up to date"
+msgstr "Deine Software ist aktuell"
+
+msgctxt "MainWindow"
+msgid "There are no new Tor software packages available for your computer at this time."
+msgstr "Zur Zeit sind keine neueren Tor Pakete für dein System verfügbar."
+
+msgctxt "MainWindow"
+msgid "Installation Failed"
+msgstr "Installation fehlgeschlagen"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to install your software updates."
+msgstr "Vidalia konnte die Updates nicht installieren."
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr "Der folgende Fehler ist aufgetreten:"
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "fehlgeschlagen (%1)"
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+"Ihr Relais wird beendet.\n"
+"Klicken Sie erneut auf \"Stop\" um das Relais sofort zu beenden."
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
+"Momentan läuft bei Ihnen eine Tor-Brücke. Wenn Sie diese beenden, werden "
+"alle darüber aktiven Verbindungen unterbrochen.\n"
+"\n"
+"Wollen Sie durch ein angekündigtes Beenden den verbundenen Rechnern die "
+"Möglichkeit geben eine andere Tor-Brücke zu finden? (das kann etwas dauern)"
+
+# not really good.
+msgctxt "MainWindow"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr ""
+"Vidalia entdeckte dass Tor unerwartet beendet wurde.\n"
+"\n"
+"Bitte überprüfen Sie das Nachrichtenprotoll auf Fehler und Warnungen."
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", wahrscheinlich Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", wahrscheinlich ein E-Mail-Programm,"
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr "Datei"
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "Über Vidalia"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Startseite"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr "Auf Updates prüfen"
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Fehler beim Setzen des Filters"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia konnte keine Logging-Nachrichten von Tor empfangen."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "Fehler beim Öffnen der Logdatei"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia konnte die angegebene Logdatei nicht öffnen."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Name der Logdatei wird benötigt"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "Sie müssen einen Dateinamen angeben, um die Logdaten speichern zu können."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Logdatei auswählen"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Speichere Logdatei"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Text Dateien (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Im Logbuch suchen"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Finde:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Nicht gefunden"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "Die Suche hat 0 passende Einträge gefunden."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Logbuch"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Nachrichtenfilter..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Setze Nachrichtenfilter"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Größe des Verlaufs..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Maximale Anzahl der angezeigten Nachrichten"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Löschen"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Alle Einträge aus dem Logbuch löschen (Strg+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Strg+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Kopieren"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Kopiere die ausgewählte Nachricht in die Zwischenablage (Strg+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Strg+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Alles markieren"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Alle Nachrichten markieren (Strg+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Strg+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Alles Speichern"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Speichere alle Nachrichten in eine Datei"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Markiertes speichern"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Markierte Einträge in einer Datei speichern"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Einstellungen"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Logbuch-Einstellungen ändern"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Strg+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Hilfe"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Hilfe anzeigen"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Schliessen"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Logbuch schliessen"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Suchen"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Finde alle Nachrichten, die den Suchtext enthalten (Strg+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Strg+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Zeit"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Typ"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Nachricht"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Speichert die aktuellen Logbuch-Einstellungen"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Speichere Einstellungen"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Verwirft die Änderung der Einstellungen"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Abbrechen"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Nachrichtenfilter"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Fehler"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Warnung"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Hinweis"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Info"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Debug"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "Verlauf des Logbuchs"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Anzahl der Nachrichten, die im Logbuch angezeigt werden"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "Nachrichten"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Nachrichten immer speichern"
+
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "Öffnen"
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr "Das automatische Speichern aller neuen Nachrichten in eine Datei aktivieren"
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "Alle neuen Nachrichten automatisch in einer Datei speichern"
+
+# quiet bad. but better then english.
+msgctxt "MessageLog"
+msgid "Messages that appear when something has \n"
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+"Meldung, welche erscheint, wenn etwas mit Tor schief \n"
+"gegangen ist, und es nicht mehr weiter laufen kann."
+
+msgctxt "MessageLog"
+msgid "Messages that only appear when \n"
+"something has gone wrong with Tor."
+msgstr ""
+"Meldung, welche nur erscheint, wenn \n"
+"etwas mit Tor schief gegangen ist."
+
+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 ""
+"Meldungen, die in unregelmässigen Abständen erscheinen\n"
+"und nicht offensichtlich als Fehler erkennbar sind\n"
+"sollten 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 im laufenden\\Betrieb erscheinen."
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+"Extrem aussagekräftige Meldungen die hauptsächlich\n"
+"für Tor Entwickler interessant sind."
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+"Kann Datei %1 nicht speichern\n"
+"\n"
+"%2"
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor-Netzwerk-Karte"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Aktualisieren"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "Aktualisiere die Liste der Tor-Verteiler und Verbindungen"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Strg+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Hilfe"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Zeige Hilfe zur Netzwerk-Karte"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Zeige Hilfe zur Netzwerk-Karte"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Schließen"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Schließe Netzwerk-Karte"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Vergrößern"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Vergrößere Netzwerk-Karte"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Verkleinern"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Verkleinere Netzwerk-Karte"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Größe anpassen"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Passt die Größe an die angezeigten Verbindungen an"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Strg+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "Datei nicht gefunden"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr "Für den gewählten Verteiler sind keine Details verfügbar."
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "Unbekannt"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr "Vollbild"
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr "Die Netzwerkkarte als Vollbild anzeigen"
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Strg+F"
+
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "Ungültige Brücke"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "Die angegebene Brücke ist nicht gültig."
+
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr "Kopieren (Strg+C)"
+
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr "Sie müssen eine IP-Adresse oder einen Hostnamen und eine Portnummer abgeben, damit Tor einen Proxy für die Internetverbindung benutzt."
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "Sie müssen einen oder mehrere Ports angeben, zu der Ihre Firewall Verbindungen erlaubt."
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' ist keine gültige Port-Nummer."
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+"Anklicken, wenn Ihr lokales Netzwerk einen Proxy für den Internetzugriff "
+"benötigt"
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "Ich benutze einen Proxy, um ins Internet zu gelangen"
+
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr "Proxy-Einstellungen"
+
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "HTTP-Proxy:"
+
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr "Nutzername:"
+
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "Diesen Proxy auch für HTTPS benutzen"
+
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr "Passwort:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "Port:"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+"Anklicken, wenn Ihre Firewall nur bestimmte Ports zur Verbindung mit Relays "
+"zulässt"
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "Meine Firewall lässt nur Verbindungen zu bestimmten Ports zu"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "Firewall-Einstellungen"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "Erlaubte Ports:"
+
+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 ""
+"Anklicken, damit Anfragen an das Verzeichnis verschlüsselt und Tor-Brücken "
+"zum Zugriff auf das Tor-Netzwerk verwendet werden"
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "Mein Provider blockiert Verbindungen zum Tor-Netzwerk"
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr "Tor-Brücken-Einstellungen"
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+"Die Tor-Software, die du gerade benutzt, unterstützt keine Tor-Brücken.<br "
+"/>Verzeichnisverbindungen werden trotzdem verschlüsselt."
+
+msgctxt "NetworkPage"
+msgid "Add a Bridge:"
+msgstr "Eine Brücke hinzufügen:"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Wie finde ich eine Tor-Brücke?</a>"
+
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr "Entferne die gewählte Brücke von der Liste"
+
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr "Kopiere die gewählten Brücken in die Zwischenablage"
+
+msgctxt "NetworkPage"
+msgid "Find Bridges Now"
+msgstr "Jetzt eine Brücke finden"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
+msgstr "<a href=\"bridges.finding\">Wie kann ich noch Brücken finden?</a>"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
+msgstr "<a href=\"bridges.finding\">Wie kann ich Brücken finden?</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 ""
+"Aktuell sind keine neuen Bridges verfügbar. Sie können entweder warten und "
+"es später erneut versuchen oder andere Methoden versuchen um neue Bridges zu "
+"finden."
+
+msgctxt "NetworkPage"
+msgid "Click Help to see other methods of finding new bridges."
+msgstr "Klicken Sie auf Hilfe, um mit anderen Methoden neue Brücken zu finden."
+
+msgctxt "Policy"
+msgid "accept"
+msgstr "annehmen"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "ablehnen"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Online"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Ruhezustand"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Offline"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Ort:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "IP-Adresse:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Plattform:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Bandbreite:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Läuft seit:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Zuletzt aktualisiert:"
+
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Kopieren"
+
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
+msgstr "Ruhezustand"
+
+msgctxt "RouterInfoDialog"
+msgid "Online"
+msgstr "Online"
+
+msgctxt "RouterInfoDialog"
+msgid "Offline"
+msgstr "Offline"
+
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr "Unbekannt"
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr "Verteiler Informationen:"
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr "Name:"
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr "Status:"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "Ort:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "IP-Adresse:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "Plattform:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "Bandbreite:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "Läuft seit:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "Kontaktinformation:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "Zuletzt aktualisiert:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr "Stichwort"
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Offline"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Ruhezustand"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Verteiler"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "Verteiler heran zoomen"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 Relays online"
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Kopieren"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "Spitzname"
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "Fingerabdruck"
+
+msgctxt "ServerPage"
+msgid "Bridge Support Unavailable"
+msgstr "Brücken-Unterstützung nicht verfügbar"
+
+msgctxt "ServerPage"
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgstr "Sie haben Tor so konfiguriert, dass es als Brückenverteiler für zensierte Nutzer dient, aber Ihre Tor-Version unterstützt Brücken nicht."
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "Bitte aktualisieren Sie Ihre Tor-Version oder konfigurieren Sie Tor so, dass es als normaler Verteiler arbeitet."
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "Deine Tor-Brücke läuft nicht."
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "Sie müssen mindestens einen Verteiler-Namen und Port angeben."
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "Benutze Tor nur als Client"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Verkehr für das Tor-Netzwerk weiterleiten"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "Verteiler-Port:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "Aktiviere das Spiegeln des Relay-Verzeichnisses"
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "Versuche automatisch die Port-Weiterleitung zu konfigurieren"
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "Test"
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "Zeige Hilfe zu Port-Weiterleitung"
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Verzeichnis-Port:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Verzeichnis-Port-Nummer:"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Kontaktinformation:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "Name deines Relays"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "Port, auf dem andere Benutzer und Relays deinen Relay kontaktieren können"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Spitzname:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Allgemeine Einstellungen"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Bei Internetverbindungen mit hoher Downloadgeschwindigkeit aber niedriger Uploadgeschwindigkeitgeben Sie Ihre Uploadgeschwindigkeit bitte hier an."
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "Kabel/DSL 256 kbit/s"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "Kabel/DSL 512 kbit/s"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "Kabel/DSL 768 kbit/s"
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/Kabel/DSL 1,5 Mbit/s"
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 1,5 Mbit/s"
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "Benutzerdefiniert"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Wählen Sie den Eintrag der Ihrer Internetverbindung am ehesten entspricht"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Zeige Hilfe zur Bandbreitenbegrenzung"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Durchschnittliche Rate"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Dauerhafte durchschnittliche Bandbreitenbegrenzung"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Maximale Rate"
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "Hochlast Bandbreitenbegrenzung"
+
+msgctxt "ServerPage"
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr "Ihre maximale Bandbreite muss größer oder gleich groß wie die durchschnittliche Bandbreite sein. Beide Werte müssen mindestens 20 KB/s betragen."
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Bandbreitenbegrenzung"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Ports 6660 - 6669 und 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Ports 110, 143, 993 und 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "E-Mails abrufen (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Ports, die durch andere Checkboxen nicht belegt wurden"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+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 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
+
+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 "Sichere Webseiten (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Port 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Webseiten"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "Zeige Hilfe zu Exit-Regeln"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr "Welche Internetressourcen sollen Benutzer von deinem Relay aus zugreifen dürfen?"
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr "Tor blockiert standardmäßig weiterhin einige Mailversand- und Filesharing-Programme, um Spam und anderen Mißbrauch zu vermindern."
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Exit-Regeln"
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr "Lasse andere Benutzer auf deine Tor-Brücke zugreifen, indem du ihnen diese Zeile gibst:"
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "Dies ist die Identität deiner Tor-Brücke, die du anderen Leute geben kannst"
+
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr "Kopiere die Identität deiner Tor-Brücke in die Zwischenablage"
+
+msgctxt "ServerPage"
+msgid "No Recent Usage"
+msgstr "aktuell unbenutzt"
+
+msgctxt "ServerPage"
+msgid "No clients have used your relay recently."
+msgstr "Kein Tor Klient hat bisland ihre Tor-Brücke genutzt."
+
+msgctxt "ServerPage"
+msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgstr ""
+"Lassen sie bitte ihre Tor-Brücke aktiv damit andere Nutzer eine größere "
+"Chance haben diese zu finden und zu nutzen."
+
+msgctxt "ServerPage"
+msgid "Bridge History"
+msgstr "Tor-Brücken-Einstellungen"
+
+msgctxt "ServerPage"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgstr "Vidalia konnte Ihre %1 Einstellungen nicht speichern."
+
+msgctxt "ServerPage"
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgstr ""
+"Tor erhielt einen Rückgabewert mit falscher Formatierung als Ergebnis einer "
+"Vidalia Anfrage zu ihrer Tor-Brücke."
+
+msgctxt "ServerPage"
+msgid "The returned response was: %1"
+msgstr "Die zurückgelieferte Antwort war: %1"
+
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network"
+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>"
+msgstr "<a href=\"bridges.finding\">Wie finde ich eine Tor-Brücke?</a>"
+
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory"
+msgstr "Spiegele das Relay Verzeichnis"
+
+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 Problemes informiert "
+"werden kannst. Du kannst auch deinen PGP oder GPG Fingerabdruck mit angeben."
+
+msgctxt "ServicePage"
+msgid "Error while trying to unpublish all services"
+msgstr "Fehler beim Versuch alle Dienste zu stoppen"
+
+msgctxt "ServicePage"
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
+msgstr "Bitte konfiguriere wenigstens ein Verzeichnis und einen virtuellen Port für jeden Dienst, den du speichern möchtest. Entferne die übrigen."
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Fehler"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "Bitte wähle einen Dienst aus."
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "Verzeichnis auswählen"
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "Der virtuelle Port darf nur gültige Port-Nummern enthalten [1..65535]."
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "Das Ziel darf nur Einträge der Form Adresse:Port, Adresse oder Port enthalten."
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr "Das Verzeichnis wird bereits von einem anderen Dienst benutzt."
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "Formular"
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr "Versteckte Dienste"
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "Onion-Adresse"
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "Virtueller Port"
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "Ziel"
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "Verzeichnispfad"
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "Gestartet"
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "Füge einen neuen Service hinzu"
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "Entferne den gewählten Service"
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr "Kopiere die Onion-Adresse in die Zwischenablage"
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr "Durchsuchen Sie ihr lokales Dateisystem um ein Verzeichnis auszuwählen"
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "Erstellt von Tor"
+
+msgctxt "Stream"
+msgid "New"
+msgstr "Neu"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Auflösen"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Verbinde"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "Öffne"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Fehlgeschlagen"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Geschlossen"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Versuche erneut"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "Umgelenkt"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Unbekannt"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "Prozess %1 wurde nicht gestoppt. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "Der Tor-Dienst ist nicht installiert."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "Der Tor-Dienst konnte nicht gestartet werden."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "Berechnung des Kontrollpasswortes fehlgeschlagen."
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "Erfolgreich"
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "Keine aktiven UPnP-Geräte gefunden"
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "Keine gültigen UPnP-Internet-Gateway-Geräte gefunden"
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "WSAStartup fehlgeschlagen"
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "Hinzufügen der Port-Zuordnung fehlgeschlagen"
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "Konnte keine Port-Zuordnung empfangen"
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "Entfernen der Port-Zuordnung fehlgeschlagen"
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "Unbekannter Fehler"
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "Entdecke UPnP-aktivierte Dienste"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "Aktualisiere die Verzeichnis-Port-Zuordnung"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "Aktualisiere die Relay-Port-Zuordnung"
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "Test erfolgreich abgeschlossen!"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "Test UPnP-Unterstützung"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr "Universal Plug & Play Support wird getestet"
+
+msgctxt "UpdateProcess"
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgstr ""
+"Vidalia konnte nicht nach verfügbaren Updates suchen, da '%1' nicht gefunden "
+"werden konnte."
+
+msgctxt "UpdateProcess"
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgstr ""
+"Vidalia konnte nicht nach verfügbaren Updates suchen, da der Updateprozess "
+"unerwartet unterbrochen wurde."
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for available updates..."
+msgstr "Suche nach verfügbaren Updates..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Hide"
+msgstr "Verstecken"
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr "Updates werden heruntergeladen..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr "Starte die Tor-Software"
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr "Fertig! Ihre Software ist nun aktuell."
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr "Aktualisierungen der Software"
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr "Suche nach Updates..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr "Abbrechen"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr "Tor-Update verfügbar"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr "Erinnere mich später"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr "Installieren"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr ""
+"Folgend Softwarepakete wurden aktualisiert und stehen zur Installation "
+"bereit:"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr "Backspace"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr "Version"
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Abbrechen"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Ja"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Nein"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Hilfe"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Versuche erneut"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Zeige Logdatei"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Zeige Einstellungen"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Fortfahren"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Schließen"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Öffnen"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Ungültiges Argument"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia wurde bereits gestartet"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Zeigt diese Nachricht an."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "Setzt ALLE gespeicherten Vidalia-Einstellungen zurück."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Legt das Vidaliaverzeichnis für die Daten fest."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Legt den Namen und Speicherort für Vidalias pidfile fest."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Legt den Namen und Speicherort für Vidalias Nachrichtendatei fest."
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Legt fest, wie ausführlich Vidalias Logbuch geführt werden soll."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Legt Vidalias Oberflächenstyle fest."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Legt Vidalias Sprache fest."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Vidalia Anwendungsinformation"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "Konnte Nachrichtendatei nicht öffnen '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr "Ungültiger Sprachcode festgestellt:"
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr "Ungültige Benutzeroberfläche festgestellt:"
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr "Ungültiges Loglevel festgestellt:"
+
+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 ""
+"Evtl. läuft schon ein anderer Vidalia-Prozess. Sollte wirklich kein anderer "
+"Prozess laufen, kannst du fortfahren.\n"
+"\n"
+"Möchtest du Vidalia starten?"
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr "%1 Sekunden"
+
+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 Tage"
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr "%1 Stunden"
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr "%1 Minuten"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/de_AT/vidalia_de_AT.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/de_AT/vidalia_de_AT.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/de_AT/vidalia_de_AT.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/de_CH/vidalia_de_CH.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/de_CH/vidalia_de_CH.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/de_CH/vidalia_de_CH.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/de_DE/vidalia_de_DE.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/de_DE/vidalia_de_DE.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/de_DE/vidalia_de_DE.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/el/qt_el.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/el/qt_el.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/el/qt_el.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/el/vidalia_el.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/el/vidalia_el.po
new file mode 100755
index 0000000..143d194
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/el/vidalia_el.po
@@ -0,0 +1,2717 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: 2010-03-25 13:38-0600\n"
+"Last-Translator: George Fragos <fragos.george 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"
+"X-Generator: Pootle 1.1.0\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Περι Βινταλια"
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr "Βινταλια"
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "Qt"
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Tor"
+
+#: 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 "0.2.0.31-alpha-dev (r123456)"
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr "4.4.2"
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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' δεν είναι έγκυρη."
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "Επιλέξατε πιστοποίηση με κωδικό, αλλα δεν ορίσατε κωδικό."
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Επιλέξτε αρχείο ρυθμίσεων Tor"
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Το αρχείο δεν βρέθηκε"
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "Το %1 δεν υπάρχει. Δημιουργία τώρα;"
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Αποτυχία δημιουργίας αρχείου"
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "Δεν δημιουργήθηκε το %1 [%2]"
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Επιλογή φακέλου για αποθήκευση δεδομένων Tor "
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Αποτυχία διαγραφης της Υπηρεσίας Tor"
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+"Αδυναμία αφαίρεσης διεργασίας 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 "To Βιντάλια δεν μπόρεσε να εγκαταστήσει την διεργασία 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 "Κανένας"
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Cookie"
+
+#: 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 "Αρχείο Ρυθμίσεων Tor"
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "Εκκίνηση Tor με χρήση καυορισμένου αρχείου ρυθμίσεων (torrc)"
+
+#: 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 "Αποθήκευση δεδομένων Tor στον παρακάτω φάκελο"
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr "Επιλέξτε τον φάκελο για την αποθήκευση δεδομένων Tor"
+
+#: 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 "Χρήση ευρους ζώνης Tor"
+
+#: 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 "100"
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% Αδιαφανές"
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Αποθήκευση"
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Άκυρο"
+
+#: circuit.cpp:112
+msgctxt "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 "Κλείσιμο Κυκλώματος (Del)"
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Κλείσιμο Ροής (Del)"
+
+#: 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 "Το Βινταλια δεν μπόρεσε να αποθηκεύσει τις ρυθμίσεις %1."
+
+#: 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 "Το Βινταλια δεν μπόρεσε να εφαρμόσει τις ρυθμίσεις %1 στο Tor."
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Ρυθμίσεις"
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Το Βινταλια δεν μπόρεσε να συνδεθεί στο Tor. (%1)"
+
+#: controlconnection.cpp:331
+#, fuzzy
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "Η υποδοχή (socket) ελέγχου δεν είναι συνδεδεμένη."
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "Απαιτείται κωδικός"
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+msgstr ""
+"Το Βινταλια συνδέθηκε με το Tor, αλλα θέλει κωδικό. Παρακαλώ εισάγετε τον "
+"κωδικό: "
+
+#: controlpasswordinputdialog.ui:99
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
+msgstr "Απομνημόνευση Κωδικού"
+
+#: controlsocket.cpp:70
+#, fuzzy
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "Η υποδοχή (socket) ελέγχου δεν είναι συνδεδεμένη."
+
+#: controlsocket.cpp:80
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Αποτυχία αποστολής εντολής ελεγχου. [%1]"
+
+#: controlsocket.cpp:117
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr ""
+"Κατά την προσπάθεια ανάγνωσης μιας γραμμής δεδομένων αποσυνδέθηκε η υποδοχή "
+"(socket)."
+
+#: controlsocket.cpp:156
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Άκυρη απάντηση ελέγχου. [%1]"
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Εκτελέσιμα (*.exe)"
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Επιλέξτε την Διαδρομή για το Tor"
+
+#: generalpage.cpp:85
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "Επιλέξτε το Εκτελέσιμο του Πληρεξούσιου (Proxy)"
+
+#: 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 ""
+"Οι επιλογές που δώσατε για τον πληρεξούσιο (proxy) δεν είναι στη σωστή "
+"μορφή."
+
+#: generalpage.ui:28
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr "Εκκίνηση του Vidalia όταν εκκινεί το σύστημά μου"
+
+#: generalpage.ui:121
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr "Περιήγηση"
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Εκκίνηση του λογισμικού Tor όταν εκκινεί το Vidalia"
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "Tor"
+msgstr "Tor"
+
+#: generalpage.ui:93
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr "Εφαρμογή Πληρεξούσιου (Proxy) (προεραιτικό)"
+
+#: generalpage.ui:99
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr ""
+"Εκκίνηση μιας εφαρμογής πληρεξούσιου διακομιστή (proxy) όταν εκκινεί το Tor"
+
+#: generalpage.ui:135
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Παράμετροι Εφαρμογής Πληρεξούσιου Διακομιστή (Proxy):"
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr "Ελήφθησαν:"
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+msgid "Sent: "
+msgstr "Απεστάλησαν:"
+
+#: graphframe.cpp:259
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr "%1 KB"
+
+#: graphframe.cpp:262
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr "%1 MB"
+
+#: graphframe.cpp:265
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr "%1 GB"
+
+#: 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 "Το προτεινόμενο αρχείο XML δεν είναι έγκυρο έγγραφο Περιεχομένων."
+
+#: 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 "Βρέθηκαν %1 αποτελέσματα"
+
+#: helpbrowser.ui:33
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Βοήθεια για το Vidalia"
+
+#: helpbrowser.ui:484
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Πίσω"
+
+#: helpbrowser.ui:487
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Μετακίνηση στην προηγούμενη σελίδα (Backspace)"
+
+#: helpbrowser.ui:490
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Backspace"
+
+#: helpbrowser.ui:498
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Εμπρός"
+
+#: helpbrowser.ui:501
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Μετακίνηση στην επόμενη σελίδα (Shift+Backspace)"
+
+#: helpbrowser.ui:504
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+#: helpbrowser.ui:512
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Αρχική"
+
+#: helpbrowser.ui:515
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Μετακίνηση στην Αρχική σελίδα (Ctrl+H)"
+
+#: helpbrowser.ui:518
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+#: 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 "Αναζήτηση μιας λέξης ή φράσης στο τρέχον έγγραφο (Ctrl+F)"
+
+#: helpbrowser.ui:541
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+#: helpbrowser.ui:549
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Κλείσιμο"
+
+#: helpbrowser.ui:552
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Κλείσιμο της Βοήθειας του Vidalia"
+
+#: helpbrowser.ui:555
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+#: helpbrowser.ui:152
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Εύρεση:"
+
+#: helpbrowser.ui:174
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Εύρεση για προηγούμενο"
+
+#: helpbrowser.ui:187
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Εύρεση για επόμενο"
+
+#: helpbrowser.ui:221
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "Με διάκριση πεζών-κεφαλαίων"
+
+#: helpbrowser.ui:231
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Μόνον ολόκληρες λέξεις"
+
+#: helpbrowser.ui:305
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Θέματα Βοήθειας"
+
+#: helpbrowser.ui:260
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Περιεχόμενα"
+
+#: helpbrowser.ui:350
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Αναζήτηση"
+
+#: helpbrowser.ui:362
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Αναζήτηση για:"
+
+#: helpbrowser.ui:405
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Βρέθηκαν Έγγραφα"
+
+#: helptextbrowser.cpp:54
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file: "
+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."
+msgstr ""
+"Το Vidalia μπορεί να ανοίξει τον σύνδεσμο που επιλέξατε στον αρχικό "
+"περιηγητή σας Ιστού. Αν ο περιηγητής δεν είναι ήδη ρυθμισμένος ώστε να "
+"χρησιμοποιεί το Tor, τότε το αίτημα δεν θα είναι ανώνυμο."
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr "Θέλετε το Vidalia να ανοίξει τοn σύνδεσμο στον περιηγητή Ιστού;"
+
+#: 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 ""
+"Το Vidalia δεν μπόρεσε να ανοίξει τον σύνδεσμο που επιλέξατε στον περιηγητή "
+"Ιστού. Μπορείτε να αντιγράψετε το URL και να το επικολήσετε στον περιηγητή "
+"σας."
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr "Πληροφορίες για την Άδεια"
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "Άδεια"
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr "Κατάλογος Συνεργατών"
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "Αποσφαλμάτωση"
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Πληροφορίες"
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Ειδοποίηση"
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Προειδοποίηση"
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Άγνωστο"
+
+#: mainwindow.ui:233
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "Εκκίνηση Tor"
+
+#: 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 "Ctrl+T"
+
+#: mainwindow.cpp:438
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+#: mainwindow.cpp:439
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+#: mainwindow.cpp:440
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+#: mainwindow.cpp:441
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+#: mainwindow.cpp:442
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+#: mainwindow.cpp:443
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: 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 "Βοήθεια για το Vidalia"
+
+#: 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 "Το Vidalia δεν μπόρεσε να εκκινήσει τον ρυθμισμένο περιηγητή ιστού."
+
+#: 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 ""
+"Το Vidalia δεν μπόρεσε να εκκινήσει το ρυθμισμένο πρόγραμμα Άμεσων Μηνυμάτων"
+
+#: mainwindow.cpp:562
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Σφάλμα κατά την εκκίνηση του πληρεξούσιου διακομιστή (proxy server)"
+
+#: mainwindow.cpp:563
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr ""
+"Το Vidalia δεν μπόρεσε να εκκινήσει τον ρυθμισμένο πληρεξούσιο διακομιστή "
+"(proxy server)"
+
+#: mainwindow.cpp:579
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Σύνδεση σε ενδιάμεσο (relay) κατάλογο"
+
+#: 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 "Γίνεται σύνδεση στο δίκτυο Tor"
+
+#: mainwindow.cpp:605
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "Σύνδεση σε ένα κύκλωμα Tor"
+
+#: mainwindow.cpp:1297
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr "Συνδέθηκε στο δίκτυο Tor!"
+
+#: 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 "απέτυχε (%1)"
+
+#: mainwindow.ui:168
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Το Tor δεν εκτελείται"
+
+#: 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 τερματίζει"
+
+#: mainwindow.cpp:693
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Διακοπή του Tor Τώρα"
+
+#: mainwindow.cpp:695
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr "Διακοπή Tor"
+
+#: mainwindow.cpp:711
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Το λογισμικό Tor ξεκινά"
+
+#: mainwindow.ui:75
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "Εκκίνηση του Tor"
+
+#: mainwindow.cpp:859
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Σφάλμα κατά την Εκκίνηση του Tor"
+
+#: 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."
+
+#: mainwindow.cpp:896
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "Γίνεται σύνδεση με το Tor"
+
+#: 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 "Το Vidalia δεν μπόρεσε να διακόψει το λογισμικό Tor"
+
+#: 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 ""
+"Το Vidalia διαπίστωσε ότι το λογισμικό Tor έκλεισε απρόσμενα. Ελέγξτε τις "
+"καταγραφές μηνυμάτων για πρόσφατες ειδοποιήσεις ή μηνύματα σφάλματος."
+
+#: mainwindow.cpp:1055
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Γίνεται εξακρίβωση στο Tor"
+
+#: mainwindow.cpp:1075
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "Απαιτείται Επαλήθευση με Cookie"
+
+#: 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 απαιτεί από το Vidalia να στείλει το περιεχόμενο ενός "
+"cookie επαλήθευσης, αλλά το Vidalia δεν μπόρεσε να το βρει."
+
+#: mainwindow.cpp:1080
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "Θέλετε να αναζητήσετε ο ίδιος/η ίδια το αρχείο 'control_auth_cookie';"
+
+#: mainwindow.cpp:1087
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Κατάλογος Δεδομένων"
+
+#: mainwindow.cpp:1089
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Cookie Ελέγχου (control_auth_cookie)"
+
+#: 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."
+msgstr ""
+"Το Vidalia δεν μπόρεσε να καταχωρήσει κάποια συμβάντα. Πολλές λειτουργίες "
+"του Vidalia ίσως δεν είναι διαθέσιμες."
+
+#: 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 "Το Vidalia δεν μπόρεσε να εξακριβώσει το λογισμικό Tor . (%1)"
+
+#: mainwindow.cpp:1226
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Ελέγξτε τις ρυθμίσεις ελέγχου της θύρα εξακρίβωσης."
+
+#: mainwindow.cpp:1330
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "Υπάρχει διαθέσιμη ενημέρωση για το Tor"
+
+#: 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 για να παραλάβετε την πιο πρόσφατη "
+"έκδοση."
+
+#: mainwindow.cpp:1333
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Ιστότοπος Tor: %1"
+
+#: mainwindow.cpp:1394
+msgctxt "MainWindow"
+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 "Το Vidalia δεν μπόρεσε να ρυθμίσει την αυτόματη προώθηση θύρας."
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Πίνακας Ελέγχου του Vidalia"
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "Κατάσταση"
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Συντομεύσεις πληκτρολογίου για το Vidalia"
+
+#: 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 "Εμφάνιση ενός χάρτη του δικτύου Tor"
+
+#: 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 "Ρύθμιση του Vidalia"
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Εμφάνιση της έκδοσης και αδειοδοτικών πληροφοριών"
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Έξοδος του Vidalia"
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Εμφάνιση αυτού του παραθύρου κατά την εκκίνηση"
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Απόκρυψη"
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Απόκρυψη αυτού του παραθύρου"
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr "Ο μηδενισμός του κωδικού απέτυχε"
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "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."
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Ρυθμίζει το στυλ του παραθύρου του Vidalia."
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Ρυθμίζει την γλώσσα του Vidalia."
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Πληροφορίες για την χρήση του Vidalia"
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/es/qt_es.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/es/qt_es.po
new file mode 100644
index 0000000..9dea573
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/es/qt_es.po
@@ -0,0 +1,438 @@
+msgid ""
+msgstr ""
+"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: 2009-11-19 08:16-0700\n"
+"Last-Translator: ariel viera <avd at resolution.de>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "Activar"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "El ejecutable «%1» requiere Qt %2, se encontró Qt %3."
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "Error: biblioteca Qt incompatible"
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "LTR"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "Activa la ventana principal del programa"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "Aceptar"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "Guardar"
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "Abrir"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "Cerrar"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "Aplicar"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "Reiniciar"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "Ayuda"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "No guardar"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "Descartar"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "&Sí"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "Sí a &todo"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "&No"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "N&o a todo"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "Guardar todo"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "Interrumpir"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "Reintentar"
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "Restaurar los valores predeterminados"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "Cerrar sin guardar"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "&Aceptar"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "Nombre"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "Tamaño"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "Clase"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "Tipo"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "Fecha de modificación"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "Todos los archivos (*)"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "Directorios"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "&Abrir"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "&Guardar"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "Abrir"
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr "%1 ya existe.¿Desea reemplazarlo?"
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+"%1\n"
+"Archivo no encontrado.\n"
+"Verifique que el nombre del archivo es correcto."
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "Mi equipo"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "Cambiar de nombre"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "&Borrar"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "Mostrar los archivos ocultos"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "Anterior"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "Directorio superior"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "Vista de lista"
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "Vista detallada"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "Archivos de tipo:"
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "Directorio:"
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+"%1\n"
+"Archivo no encontrado.\n"
+"Verifique que el nombre del directorio es correcto."
+
+#: 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?"
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "¿Seguro que desea eliminar «%1»?"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "No fue posible borrar el directorio."
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "Todos los archivos (*.*)"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "Guardar como"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "Unidad"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "Archivos"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "Buscar directorio"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "Mostrar "
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "Siguiente"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "Nueva carpeta"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "&Nueva carpeta"
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "&Seleccionar"
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "Eliminar"
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "&Nombre del archivo:"
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "Buscar en:"
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "Crear una nueva carpeta"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "Invalid filename"
+msgstr "Nombre de archivo no válido"
+
+#: 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 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"
+msgid "Name"
+msgstr "Nombre"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "Tamaño"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "Clase"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "Tipo"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "Fecha de modificación"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "Mi equipo"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "Equipo"
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr "%1 TB"
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr "%1 GiB"
+
+#: 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 bytes"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/es/vidalia_es.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/es/vidalia_es.po
new file mode 100644
index 0000000..1e51bb6
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/es/vidalia_es.po
@@ -0,0 +1,3306 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2009-11-18 18:34-0700\n"
+"Last-Translator: ariel viera <avd at resolution.de>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Acerca de Vidalia"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "Licencia"
+
+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 "AboutDialog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "AboutDialog"
+msgid "Qt."
+msgstr "Qt."
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr "versión"
+
+msgctxt "AdvancedPage"
+msgid "'%1' is not a valid IP address."
+msgstr "'%1' no es una dirección IP válida."
+
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "Ha seleccionado autenticación por 'Contraseña', pero no ha especificado ninguna."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Seleccione el Archivo de Configuración de Tor"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Archivo No Encontrado"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 no existe. ¿Desea crearlo?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Error al Crear Archivo"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "No se pudo crear %1 [%2]"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Seleccione un Directorio para Almacenar Datos de Tor"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "No se pudo eliminar el Servicio Tor"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "No se pudo instalar el Servicio Tor"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "Vidalia no pudo instalar el servicio Tor."
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Puerto de Control"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "Autentificación:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Dirección:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "Ninguna"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Cookie"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Contraseña"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "Generar aleatoriamente"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Fichero de configuración de Tor"
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "Iniciar Tor con el archivo de configuración especificado (torrc)"
+
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "Seleccione la ruta a su archivo de configuración"
+
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Examinar"
+
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr "Directorio de Datos"
+
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr "Almacenar datos de Tor en el siguiente directorio"
+
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr "Seleccione el directorio que se usará para almacenar los datos de Tor"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+"\n"
+"You may need to remove it manually."
+msgstr "Es posible que tenga que eliminarlo manualmente."
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Idioma"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Seleccione el idioma usado por Vidalia"
+
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Estilo"
+
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Escoja el estilo de la interfaz de Vidalia"
+
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr "Vidalia no pudo cargar la traducción al idioma seleccionado."
+
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr "Desde:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Ocultar Preferencias"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Mostrar Preferencias"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Uso del Ancho de Banda de Tor"
+
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "Reiniciar"
+
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Tasa de Recepción"
+
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Tasa de Envío"
+
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Siempre Arriba"
+
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Estilo"
+
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Cambia la transparencia del Gráfico de Ancho de Banda"
+
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% Opaco"
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Guardar"
+
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr "Iniciando la solicitud de puente HTTPS."
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr "Conectando a %1:%2..."
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr "Enviando una solicitud HTTPS para puentes."
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr "Descargando una lista de puentes..."
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr "Descargando puentes"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr "No pudo descargar puentes: %1"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr "Reintentando la solicitud de puentes..."
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr "País"
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr "Nº. de Clientes"
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr "Clientes de los siguientes países han usado su retransmisor desde %1"
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr "Resumen de utilización del puente"
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr "Resumen del cliente"
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "Nuevo"
+
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Abierto"
+
+msgctxt "Circuit"
+msgid "Building"
+msgstr "Construyendo"
+
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Falló"
+
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Cerrado"
+
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Desconocido"
+
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Ruta Vacía>"
+
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Conexión"
+
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "Estado"
+
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Acercamiento al circuito"
+
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "Cerrar Circuito (Del)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Cerrar flujo (Del)"
+
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "General"
+
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Red"
+
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr "Compartiendo"
+
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "Servicios"
+
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Apariencia"
+
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Avanzado"
+
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Ayuda"
+
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Error al Guardar las Preferencias"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr "Vidalia no pudo guardar sus preferencias de %1."
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Error al Aplicar Preferencias"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia no pudo aplicar sus preferencias de %1 a Tor."
+
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Preferencias"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Vidalia no pudo conectarse con Tor. (%1)"
+
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "Conector de Control no está conectado."
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "Contraseña requerida"
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
+msgstr "Recordar mi contraseña"
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgstr "Vidalia se ha conectado a un proceso Tor en funcionamiento que requiere una contraseña. Introduzca su contraseña de control:"
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "La conexión de control no esta conectada."
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Error enviando comando de control. [%1]"
+
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr "Conexión desconectada mientras se trataba de leer una línea de información."
+
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Respuesta de control no válida. [%1]"
+
+msgctxt "CountryInfo"
+msgid "Afghanistan"
+msgstr "Afganistán"
+
+msgctxt "CountryInfo"
+msgid "Andorra"
+msgstr "Andorra"
+
+msgctxt "CountryInfo"
+msgid "Angola"
+msgstr "Angola"
+
+msgctxt "CountryInfo"
+msgid "Antigua & Barbuda"
+msgstr "Antigua y Barbuda"
+
+msgctxt "CountryInfo"
+msgid "Argentina"
+msgstr "Argentina"
+
+msgctxt "CountryInfo"
+msgid "Armenia"
+msgstr "Armenia"
+
+msgctxt "CountryInfo"
+msgid "Australia"
+msgstr "Australia"
+
+msgctxt "CountryInfo"
+msgid "Azerbaijan"
+msgstr "Azerbaidzhán"
+
+msgctxt "CountryInfo"
+msgid "Bahamas"
+msgstr "Bahamas"
+
+msgctxt "CountryInfo"
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+msgctxt "CountryInfo"
+msgid "Barbados"
+msgstr "Barbados"
+
+msgctxt "CountryInfo"
+msgid "Belarus"
+msgstr "Bielorrusia"
+
+msgctxt "CountryInfo"
+msgid "Belgium"
+msgstr "Bélgica"
+
+msgctxt "CountryInfo"
+msgid "Belize"
+msgstr "Belice"
+
+msgctxt "CountryInfo"
+msgid "Bhutan"
+msgstr "Bután"
+
+msgctxt "CountryInfo"
+msgid "Bolivia"
+msgstr "Bolivia"
+
+msgctxt "CountryInfo"
+msgid "Bosnia & Herzegovina"
+msgstr "Bosnia y Herzegovina"
+
+msgctxt "CountryInfo"
+msgid "Botswana"
+msgstr "Botswana"
+
+msgctxt "CountryInfo"
+msgid "Brazil"
+msgstr "Brasil"
+
+msgctxt "CountryInfo"
+msgid "Brunei Darussalam"
+msgstr "Brunei"
+
+msgctxt "CountryInfo"
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+msgctxt "CountryInfo"
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+msgctxt "CountryInfo"
+msgid "Burundi"
+msgstr "Burundi"
+
+msgctxt "CountryInfo"
+msgid "Cambodia"
+msgstr "Cambodia"
+
+msgctxt "CountryInfo"
+msgid "Cameroon"
+msgstr "Camerún"
+
+msgctxt "CountryInfo"
+msgid "Canada"
+msgstr "Canadá"
+
+msgctxt "CountryInfo"
+msgid "Cape Verde"
+msgstr "Cabo Verde"
+
+msgctxt "CountryInfo"
+msgid "Central African Republic"
+msgstr "República Centroafricana"
+
+msgctxt "CountryInfo"
+msgid "Chad"
+msgstr "Chad"
+
+msgctxt "CountryInfo"
+msgid "Chile"
+msgstr "Chile"
+
+msgctxt "CountryInfo"
+msgid "China"
+msgstr "China"
+
+msgctxt "CountryInfo"
+msgid "Colombia"
+msgstr "Colombia"
+
+msgctxt "CountryInfo"
+msgid "Comoros"
+msgstr "Comores"
+
+msgctxt "CountryInfo"
+msgid "Congo, The Democratic Republic of the"
+msgstr "Congo, República Democrática del"
+
+msgctxt "CountryInfo"
+msgid "Congo"
+msgstr "Congo"
+
+msgctxt "CountryInfo"
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+msgctxt "CountryInfo"
+msgid "Cote dâ??Ivoire"
+msgstr "Costa de Marfil"
+
+msgctxt "CountryInfo"
+msgid "Croatia"
+msgstr "Croacia"
+
+msgctxt "CountryInfo"
+msgid "Cuba"
+msgstr "Cuba"
+
+msgctxt "CountryInfo"
+msgid "Cyprus"
+msgstr "Chipre"
+
+msgctxt "CountryInfo"
+msgid "Czech Republic"
+msgstr "República Checa"
+
+msgctxt "CountryInfo"
+msgid "Denmark"
+msgstr "Dinamarca"
+
+msgctxt "CountryInfo"
+msgid "Djibouti"
+msgstr "Djibutí"
+
+msgctxt "CountryInfo"
+msgid "Dominica"
+msgstr "Dominica"
+
+msgctxt "CountryInfo"
+msgid "Dominican Republic"
+msgstr "República Dominicana"
+
+msgctxt "CountryInfo"
+msgid "Ecuador"
+msgstr "Ecuador"
+
+msgctxt "CountryInfo"
+msgid "Egypt"
+msgstr "Egipto"
+
+msgctxt "CountryInfo"
+msgid "El Salvador"
+msgstr "El Salvador"
+
+msgctxt "CountryInfo"
+msgid "Equatorial Guinea"
+msgstr "Guinea Ecuatorial"
+
+msgctxt "CountryInfo"
+msgid "Eritrea"
+msgstr "Eritrea"
+
+msgctxt "CountryInfo"
+msgid "Estonia"
+msgstr "Estonia"
+
+msgctxt "CountryInfo"
+msgid "France"
+msgstr "Francia"
+
+msgctxt "CountryInfo"
+msgid "Gabon"
+msgstr "Gabón"
+
+msgctxt "CountryInfo"
+msgid "Gambia"
+msgstr "Gambia"
+
+msgctxt "CountryInfo"
+msgid "Georgia"
+msgstr "Georgia"
+
+msgctxt "CountryInfo"
+msgid "Germany"
+msgstr "Alemania"
+
+msgctxt "CountryInfo"
+msgid "Ghana"
+msgstr "Ghana"
+
+msgctxt "CountryInfo"
+msgid "Grenada"
+msgstr "Granada"
+
+msgctxt "CountryInfo"
+msgid "Guatemala"
+msgstr "Guatemala"
+
+msgctxt "CountryInfo"
+msgid "Guinea"
+msgstr "Guinea"
+
+msgctxt "CountryInfo"
+msgid "Guinea-Bissau"
+msgstr "Guinea-Bissau"
+
+msgctxt "CountryInfo"
+msgid "Guyana"
+msgstr "Guyana"
+
+msgctxt "CountryInfo"
+msgid "Hong Kong"
+msgstr "Hong Kong"
+
+msgctxt "CountryInfo"
+msgid "Haiti"
+msgstr "Haití"
+
+msgctxt "CountryInfo"
+msgid "Honduras"
+msgstr "Honduras"
+
+msgctxt "CountryInfo"
+msgid "Israel"
+msgstr "Israel"
+
+msgctxt "CountryInfo"
+msgid "Italy"
+msgstr "Italia"
+
+msgctxt "CountryInfo"
+msgid "Jamaica"
+msgstr "Jamaica"
+
+msgctxt "CountryInfo"
+msgid "Japan"
+msgstr "Japón"
+
+msgctxt "CountryInfo"
+msgid "Jordan"
+msgstr "Jordania"
+
+msgctxt "CountryInfo"
+msgid "Kazakhstan"
+msgstr "Kazajhstán"
+
+msgctxt "CountryInfo"
+msgid "Kenya"
+msgstr "Kenya"
+
+msgctxt "CountryInfo"
+msgid "Kiribati"
+msgstr "Kiribati"
+
+msgctxt "CountryInfo"
+msgid "Kuwait"
+msgstr "Kuwait"
+
+msgctxt "CountryInfo"
+msgid "Kyrgyzstan"
+msgstr "Kirguistán"
+
+msgctxt "CountryInfo"
+msgid "Laos"
+msgstr "Laos"
+
+msgctxt "CountryInfo"
+msgid "Latvia"
+msgstr "Letonia"
+
+msgctxt "CountryInfo"
+msgid "Lebanon"
+msgstr "Líbano"
+
+msgctxt "CountryInfo"
+msgid "Lesotho"
+msgstr "Lesotho"
+
+msgctxt "CountryInfo"
+msgid "Liberia"
+msgstr "Liberia"
+
+msgctxt "CountryInfo"
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+msgctxt "CountryInfo"
+msgid "Lithuania"
+msgstr "Lituania"
+
+msgctxt "CountryInfo"
+msgid "Luxembourg"
+msgstr "Luxemburgo"
+
+msgctxt "CountryInfo"
+msgid "Macedonia"
+msgstr "Macedonia"
+
+msgctxt "CountryInfo"
+msgid "Madagascar"
+msgstr "Madagascar"
+
+msgctxt "CountryInfo"
+msgid "Malawi"
+msgstr "Malaui"
+
+msgctxt "CountryInfo"
+msgid "Malaysia"
+msgstr "Malasia"
+
+msgctxt "CountryInfo"
+msgid "Mali"
+msgstr "Mali"
+
+msgctxt "CountryInfo"
+msgid "Malta"
+msgstr "Malta"
+
+msgctxt "CountryInfo"
+msgid "Marshall Islands"
+msgstr "Islas Marshall"
+
+msgctxt "CountryInfo"
+msgid "Mauritania"
+msgstr "Mauritania"
+
+msgctxt "CountryInfo"
+msgid "Mauritius"
+msgstr "Mauricio"
+
+msgctxt "CountryInfo"
+msgid "Micronesia"
+msgstr "Micronesia"
+
+msgctxt "CountryInfo"
+msgid "Moldova"
+msgstr "Moldavia"
+
+msgctxt "CountryInfo"
+msgid "Monaco"
+msgstr "Mónaco"
+
+msgctxt "CountryInfo"
+msgid "Mongolia"
+msgstr "Mongolia"
+
+msgctxt "CountryInfo"
+msgid "Montenegro"
+msgstr "Montenegro"
+
+msgctxt "CountryInfo"
+msgid "Morocco"
+msgstr "Marruecos"
+
+msgctxt "CountryInfo"
+msgid "Mozambique"
+msgstr "Mozambique"
+
+msgctxt "CountryInfo"
+msgid "Namibia"
+msgstr "Namibia"
+
+msgctxt "CountryInfo"
+msgid "Nauru"
+msgstr "Nauru"
+
+msgctxt "CountryInfo"
+msgid "Nepal"
+msgstr "Nepal"
+
+msgctxt "CountryInfo"
+msgid "Netherlands"
+msgstr "Holanda"
+
+msgctxt "CountryInfo"
+msgid "New Zealand"
+msgstr "Nueva Zelanda"
+
+msgctxt "CountryInfo"
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+msgctxt "CountryInfo"
+msgid "Niger"
+msgstr "Níger"
+
+msgctxt "CountryInfo"
+msgid "Nigeria"
+msgstr "Níger"
+
+msgctxt "CountryInfo"
+msgid "Norway"
+msgstr "Noruega"
+
+msgctxt "CountryInfo"
+msgid "Oman"
+msgstr "Omán"
+
+msgctxt "CountryInfo"
+msgid "Pakistan"
+msgstr "Pakistán"
+
+msgctxt "CountryInfo"
+msgid "Palau"
+msgstr "Palau"
+
+msgctxt "CountryInfo"
+msgid "Palestine"
+msgstr "Palestina"
+
+msgctxt "CountryInfo"
+msgid "Panama"
+msgstr "Panamá"
+
+msgctxt "CountryInfo"
+msgid "Papua New Guinea"
+msgstr "Papúa y Nueva Guinea"
+
+msgctxt "CountryInfo"
+msgid "Paraguay"
+msgstr "Paraguay"
+
+msgctxt "CountryInfo"
+msgid "Peru"
+msgstr "Perú"
+
+msgctxt "CountryInfo"
+msgid "Philippines"
+msgstr "Filipinas"
+
+msgctxt "CountryInfo"
+msgid "Poland"
+msgstr "Polonia"
+
+msgctxt "CountryInfo"
+msgid "Portugal"
+msgstr "Portugal"
+
+msgctxt "CountryInfo"
+msgid "Qatar"
+msgstr "Qatar"
+
+msgctxt "CountryInfo"
+msgid "Romania"
+msgstr "Rumanía"
+
+msgctxt "CountryInfo"
+msgid "Russia"
+msgstr "Rusia"
+
+msgctxt "CountryInfo"
+msgid "Rwanda"
+msgstr "Ruanda"
+
+msgctxt "CountryInfo"
+msgid "Saint Kitts & Nevis"
+msgstr "Saint Kitts y Nevis"
+
+msgctxt "CountryInfo"
+msgid "Saint Lucia"
+msgstr "Santa Lucía"
+
+msgctxt "CountryInfo"
+msgid "Saint Vincent & the Grenadines"
+msgstr "San Vicente y las Granadinas"
+
+msgctxt "CountryInfo"
+msgid "Samoa"
+msgstr "Samoa"
+
+msgctxt "CountryInfo"
+msgid "San Marino"
+msgstr "San Marino"
+
+msgctxt "CountryInfo"
+msgid "Sao Tome & Principe"
+msgstr "Sao Tomé y Príncipe"
+
+msgctxt "CountryInfo"
+msgid "Saudi Arabia"
+msgstr "Arabia Saudita"
+
+msgctxt "CountryInfo"
+msgid "Senegal"
+msgstr "Senegal"
+
+msgctxt "CountryInfo"
+msgid "Serbia"
+msgstr "Serbia"
+
+msgctxt "CountryInfo"
+msgid "Seychelles"
+msgstr "Seycheles"
+
+msgctxt "CountryInfo"
+msgid "Sierra Leone"
+msgstr "Sierra Leona"
+
+msgctxt "CountryInfo"
+msgid "Singapore"
+msgstr "Singapur"
+
+msgctxt "CountryInfo"
+msgid "Slovakia"
+msgstr "Eslovaquia"
+
+msgctxt "CountryInfo"
+msgid "Slovenia"
+msgstr "Eslovenia"
+
+msgctxt "CountryInfo"
+msgid "Solomon Islands"
+msgstr "Islas Salomón"
+
+msgctxt "CountryInfo"
+msgid "Somalia"
+msgstr "Somalia"
+
+msgctxt "CountryInfo"
+msgid "South Africa"
+msgstr "Sudáfrica"
+
+msgctxt "CountryInfo"
+msgid "Spain"
+msgstr "España"
+
+msgctxt "CountryInfo"
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+msgctxt "CountryInfo"
+msgid "Sudan"
+msgstr "Sudán"
+
+msgctxt "CountryInfo"
+msgid "Suriname"
+msgstr "Surinam"
+
+msgctxt "CountryInfo"
+msgid "Swaziland"
+msgstr "Suazilandia"
+
+msgctxt "CountryInfo"
+msgid "Sweden"
+msgstr "Suecia"
+
+msgctxt "CountryInfo"
+msgid "Switzerland"
+msgstr "Suiza"
+
+msgctxt "CountryInfo"
+msgid "Syria"
+msgstr "Siria"
+
+msgctxt "CountryInfo"
+msgid "Tajikistan"
+msgstr "Tazhdikistán"
+
+msgctxt "CountryInfo"
+msgid "Tanzania"
+msgstr "Tanzania"
+
+msgctxt "CountryInfo"
+msgid "Thailand"
+msgstr "Tailandia"
+
+msgctxt "CountryInfo"
+msgid "Timor-Leste (East Timor)"
+msgstr "Timor Leste"
+
+msgctxt "CountryInfo"
+msgid "Togo"
+msgstr "Togo"
+
+msgctxt "CountryInfo"
+msgid "Tonga"
+msgstr "Tonga"
+
+msgctxt "CountryInfo"
+msgid "Trinidad & Tobago"
+msgstr "Trinidad y Tobago"
+
+msgctxt "CountryInfo"
+msgid "Tunisia"
+msgstr "Túnez"
+
+msgctxt "CountryInfo"
+msgid "Turkey"
+msgstr "Turquía"
+
+msgctxt "CountryInfo"
+msgid "Turkmenistan"
+msgstr "Turkmenistán"
+
+msgctxt "CountryInfo"
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+msgctxt "CountryInfo"
+msgid "Uganda"
+msgstr "Uganda"
+
+msgctxt "CountryInfo"
+msgid "Ukraine"
+msgstr "Ucrania"
+
+msgctxt "CountryInfo"
+msgid "United Arab Emirates"
+msgstr "Emiratos Árabes Unidos"
+
+msgctxt "CountryInfo"
+msgid "United Kingdom"
+msgstr "Reino Unido"
+
+msgctxt "CountryInfo"
+msgid "United States"
+msgstr "Estados Unidos"
+
+msgctxt "CountryInfo"
+msgid "Uruguay"
+msgstr "Uruguay"
+
+msgctxt "CountryInfo"
+msgid "Uzbekistan"
+msgstr "Uzbekistán"
+
+msgctxt "CountryInfo"
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+msgctxt "CountryInfo"
+msgid "Vatican"
+msgstr "Vaticano"
+
+msgctxt "CountryInfo"
+msgid "Venezuela"
+msgstr "Venezuela"
+
+msgctxt "CountryInfo"
+msgid "Vietnam"
+msgstr "Vietnam"
+
+msgctxt "CountryInfo"
+msgid "Western Sahara"
+msgstr "Sahara Occidental"
+
+msgctxt "CountryInfo"
+msgid "Yemen"
+msgstr "Yemén"
+
+msgctxt "CountryInfo"
+msgid "Zambia"
+msgstr "Zambia"
+
+msgctxt "CountryInfo"
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+msgctxt "CountryInfo"
+msgid "Albania"
+msgstr "Albania"
+
+msgctxt "CountryInfo"
+msgid "Algeria"
+msgstr "Argelia"
+
+msgctxt "CountryInfo"
+msgid "Austria"
+msgstr "Austria"
+
+msgctxt "CountryInfo"
+msgid "Bahrain"
+msgstr "Bahrein"
+
+msgctxt "CountryInfo"
+msgid "Benin"
+msgstr "Benin"
+
+msgctxt "CountryInfo"
+msgid "Ethiopia"
+msgstr "Etiopía"
+
+msgctxt "CountryInfo"
+msgid "Fiji"
+msgstr "Fiji"
+
+msgctxt "CountryInfo"
+msgid "Finland"
+msgstr "Finlandia"
+
+msgctxt "CountryInfo"
+msgid "Greece"
+msgstr "Grecia"
+
+msgctxt "CountryInfo"
+msgid "Guam"
+msgstr "Guam"
+
+msgctxt "CountryInfo"
+msgid "Hungary"
+msgstr "Hungría"
+
+msgctxt "CountryInfo"
+msgid "Iceland"
+msgstr "Islandia"
+
+msgctxt "CountryInfo"
+msgid "India"
+msgstr "India"
+
+msgctxt "CountryInfo"
+msgid "Indonesia"
+msgstr "Indonesia"
+
+msgctxt "CountryInfo"
+msgid "Iran"
+msgstr "Irán"
+
+msgctxt "CountryInfo"
+msgid "Iraq"
+msgstr "Irak"
+
+msgctxt "CountryInfo"
+msgid "Ireland"
+msgstr "Irlanda"
+
+msgctxt "CountryInfo"
+msgid "Korea, North"
+msgstr "Corea del Norte"
+
+msgctxt "CountryInfo"
+msgid "Korea, South"
+msgstr "Corea del Sur"
+
+msgctxt "CountryInfo"
+msgid "Libya"
+msgstr "Libia"
+
+msgctxt "CountryInfo"
+msgid "Maldives"
+msgstr "Maldivas"
+
+msgctxt "CountryInfo"
+msgid "Mexico"
+msgstr "Méjico"
+
+msgctxt "CountryInfo"
+msgid "Myanmar"
+msgstr "Birmania"
+
+msgctxt "CountryInfo"
+msgid "Taiwan"
+msgstr "Taiwán"
+
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Ejecutables (*.exe)"
+
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Seleccione la ruta de Tor"
+
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "Seleccionar el Ejecutable del Proxy"
+
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr "Debe especificar el nombre del ejecutable de Tor."
+
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr "Los argumentos especificados del proxy no están correctamente formateados."
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr "Iniciar Vidalia cuando inicie mi sistema"
+
+msgctxt "GeneralPage"
+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)"
+
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "Iniciar una aplicación proxy cuando Tor se inicie"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Argumentos de la aplicación Proxy:"
+
+msgctxt "GeneralPage"
+msgid "Software Updates"
+msgstr "Actualizaciones de software"
+
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
+msgstr "Revisar automáticamente si hay actualizaciones de software"
+
+msgctxt "GeneralPage"
+msgid "Check Now"
+msgstr "Revisar ahora"
+
+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 "Recib."
+
+msgctxt "GraphFrame"
+msgid "Sent:"
+msgstr "Enviados:"
+
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr "Archivo XML suministrado no es un documento de Contenidos valido."
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "La búsqueda alcanzó el final del documento"
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "La búsqueda alcanzó el principio del documento"
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "Texto no encontrado en el documento"
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "Se encontraron %1 resultados"
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Ayuda de Vidalia"
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Atrás"
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Ir a la página anterior (Retroceso)"
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Retroceso"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Adelante"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Ir a la página siguiente (Mayúsculas+Retroceso)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Retroceso"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Inicio"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Ir a la Página de Inicio (Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+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)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Cerrar"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Cerrar Ayuda de Vidalia"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Buscar:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Buscar Anterior"
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Encontrar Siguiente"
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "Coincidir mayúsculas y minúsculas"
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Palabras completas solamente"
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Temas de Ayuda"
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Contenido"
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Búsqueda"
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Buscando:"
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Documentos encontrados"
+
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
+msgstr "No se pudo cargar el contenido de la Ayuda:"
+
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr "Abriendo enlace externo"
+
+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 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?"
+
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr "No se pudo abrir el enlace"
+
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr "Vidalia no pudo abrir el enlace seleccionado en su navegador de Internet. Puede intentarlo copiando el URL y pegándolo en su navegador."
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr "No se pudo abrir el archivo de ayuda:"
+
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr "Información de Licencia"
+
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "Licencia"
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr "Créditos"
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "Depurar"
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Información"
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Notificación"
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Advertencia"
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Error"
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Desconocido"
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "Iniciar Tor"
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Salir"
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Gráfica de Ancho de Banda"
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Registro de Mensajes"
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Mapa de Red"
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr "Panel de Control"
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Preferencias"
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr "Acerca de"
+
+msgctxt "MainWindow"
+msgid "Help"
+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"
+
+msgctxt "MainWindow"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "MainWindow"
+msgid "View"
+msgstr "Ver"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Ayuda de Vidalia"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "Error al iniciar navegador web"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia no pudo iniciar el navegador web configurado"
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "Error al inicial el cliente IM"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "Vidalia no pudo iniciar el cliente IM configurado"
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Error al iniciar el servidor proxy"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia no pudo iniciar el servidor proxy configurado"
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Conectando a un directorio repetidor"
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "Estableciendo una conexión con un directorio encriptado"
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "Recuperando el estado de la red"
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "Cargando el estado de la red"
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "Cargando los certificados de autoridad"
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "Cargando los certificados de autoridad"
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "Cargando la información del repetidor"
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "Conectando a la red Tor"
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "Estableciendo un circuito Tor"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "no hay coincidencia de identidad"
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr "terminado"
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "conexión rechazada"
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "tiempo de espera de conexión agotado"
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "error en escritura/lectura"
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "no hay ruta hacia el host"
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "recursos insuficientes"
+
+msgctxt "MainWindow"
+msgid "Unknown"
+msgstr "Desconocido"
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor no está ejecutándose"
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "Tor se esta apagando"
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Detener Tor ahora"
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr "Detener Tor"
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Iniciando el software Tor"
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "Iniciando Tor"
+
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Error al Iniciar Tor"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgstr "Vidalia no pudo iniciar Tor. Verifique sus preferencias para asegurar que estén especificados el nombre correcto y la localización del ejecutable Tor."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "Conectando con Tor"
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "Error de Conexión"
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "Retransmisión Activada"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "Error al Cerrarse"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "Vidalia no pudo detener el software de Tor."
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "Error Inesperado"
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Autentificándose con Tor"
+
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+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 autenticación, pero Vidalia no pudo encontrar ninguna."
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "¿Le gustaría examinar usted mismo para encontrar el archivo 'control_auth_cookie'?"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Directorio de Datos"
+
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Cookie de Control (control_auth_cookie)"
+
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "Error en el registro de Eventos"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr "Vidalia no pudo registrar algunos eventos. Muchas de las características de Vidalia pueden no estar disponibles."
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Error de Autentificación"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia no pudo autentificarse ante Tor. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Por favor, verifique la configuración de autentificación de su puerto de control."
+
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "Actualización de Tor Disponible"
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr "La versión actualmente instalada de Tor está desactualizada o no se recomiendo su uso. Por favor, visite el sitio web de Tor y descargue la versión más reciente."
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Sitio web de Tor: %1"
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "Todas las conexiones subsecuentes parecerán diferentes que sus conexiones antiguas."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "No se pudo crear una nueva Identidad"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "No se pudieron reenviar los puertos"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "Vidalia no pudo configurar automáticamente el reenvío de puertos."
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Panel de Control de Vidalia"
+
+msgctxt "MainWindow"
+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 recomiendo su uso."
+
+msgctxt "MainWindow"
+msgid "Would you like to check if a newer package is available for installation?"
+msgstr "¿Le gustaría verificar si hay un nuevo paquete disponible para su instalación?"
+
+msgctxt "MainWindow"
+msgid "Potentially Unsafe Connection"
+msgstr "Conexión potencialmente insegura"
+
+msgctxt "MainWindow"
+msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
+msgstr "Una de sus aplicaciones%1 parece estar haciendo una conexión no encriptada y potencialmente insegura con el puerto%2. Cualquier cosa que se envíe por esta conexión podría ser monitoreada. Revise la configuración de su aplicación y use solamente protocolos encriptados, tales como el SSL, si es posible."
+
+msgctxt "MainWindow"
+msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgstr "Tor ha cerrado automáticamente su conexión para proteger su anonimato."
+
+msgctxt "MainWindow"
+msgid "Update Failed"
+msgstr "No se pudo actualizar"
+
+msgctxt "MainWindow"
+msgid "Your software is up to date"
+msgstr "Su software está actualizado"
+
+msgctxt "MainWindow"
+msgid "There are no new Tor software packages available for your computer at this time."
+msgstr "En este momento no hay paquetes de software Tor disponibles para su computadora."
+
+msgctxt "MainWindow"
+msgid "Installation Failed"
+msgstr "No se pudo realizar la instalación"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to install your software updates."
+msgstr "Vidalia no pudo instalar las actualizaciones de su software."
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr "Ocurrió el siguiente error:"
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "falló (%1)"
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Su repetidor se está deteniendo.\n"
+"Haga clic de nuevo en “Detener” para detener ahora su repetidor."
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr "Actualmente está ejecutando un repetidor. La detención del mismo interrumpiría cualesquiera conexiones que tengan abiertas los clientes.\n"
+"\n"
+"¿Podría darle tiempo a los clientes de encontrar un nuevo repetidor?"
+
+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 detectó que el software de Tor terminó de manera inesperada."
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr "probablemente Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", probablemente un cliente de correo electrónico,"
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr "Documento"
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "Acerca de Vidalia"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Inicio"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr "Verifique si hay actualizaciones"
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Error configurando filtro"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia no pudo introducirse en el registro de eventos de Tor."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "Error abriendo Archivo de Registro"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia no pudo abrir el archivo de registro especificado."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Nombre de Archivo de Registro requerido"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "Debe escribir un nombre de archivo para poder guardar en él los mensajes de registro."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Seleccione Archivo de Registro"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Guardar Mensajes de Registro"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Archivos de texto (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Buscar en el Registro de Mensajes"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Buscar:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "No se encontró"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "La búsqueda obtuvo 0 resultados."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Registro de Mensajes"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Filtros de Mensajes..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Configure los filtros de mensajes"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Tamaño del Historial..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Establecer el numero máximo de mensajes a mostrar"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Borrar"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Borrar todos los mensajes del Registro de Mensajes "
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Copiar"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Copiar los mensajes seleccionados al portapapeles (Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Seleccionar Todos"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Seleccione todos los mensajes (Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Guardar Todo"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Guardar todos los mensajes en un archivo"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Guardar la selección"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Guardar en un archivo los mensajes seleccionados"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Preferencias"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Ajustar las preferencias del Registro de Mensajes"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Ayuda"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Mostrar el navegador de la ayuda"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Cerrar"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Cerrar el Registro de Mensajes"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Buscar"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Buscar todos los menajes que contengan el texto seleccionado (Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Hora"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Tipo"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Mensaje"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Guarda las preferencias actuales del Registro de Mensajes"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Guardar preferencias"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Cancela los cambios hechos a las Preferencias"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Filtro de Mensajes"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Error"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Advertencia"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Notificación"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Información"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Depurar"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "Historial del Registro de Mensajes"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Cantidad de mensajes que aparecerán en la ventana del registro de mensajes"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "mensajes"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Guardar siempre nuevos mensajes del registro"
+
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "Examinar"
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr "Habilitar el guardado automático en un archivo de todos los mensajes nuevos"
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "Guardar automáticamente a un archivo los nuevos mensajes del registro"
+
+msgctxt "MessageLog"
+msgid "Messages that appear when something has \n"
+"gone very wrong and Tor cannot proceed."
+msgstr "Mensajes que aparecen cuando algo ha \n"
+"ido muy mal y Tor no puede continuar."
+
+msgctxt "MessageLog"
+msgid "Messages that only appear when \n"
+"something has gone wrong with Tor."
+msgstr "Mensajes que aparecen solamente cuando \n"
+"algo ha ido mal con Tor."
+
+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 "Mensajes que aparecen raramente \n"
+"durante la operación normal de Tor y no \n"
+"se consideran errores, pero de los que es posible que"
+
+msgctxt "MessageLog"
+msgid "Messages that appear frequently \n"
+"during normal Tor operation."
+msgstr "Mensajes que aparecen frecuentemente \n"
+"durante la operación normal de Tor."
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr "Mensajes muy especializados principalmente para \n"
+"uso de los desarrolladores de Tor."
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr "No se puede escribir el archivo %1\n"
+"\n"
+"%2."
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Mapa de Red de Tor"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Actualizar"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "Actualizar la lista de repetidores y conexiones de Tor"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Ayuda"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Mostrar la ayuda del mapa de red"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Mostrar la ayuda del mapa de red"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Cerrar"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Cerrar el mapa de red"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Acercar"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Acercamiento al mapa de red"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Alejar"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Alejar en el mapa de red"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Ampliar para ajustar"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Amplía para ajustarse a todos los circuitos mostrados"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "Repetidor no encontrado"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr "No hay detalles disponibles del repetidor seleccionado."
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "Desconocido"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr "Pantalla completa"
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr "Ver el mapa de red como una ventana de pantalla completa"
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "Puente no válido"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "El identificador de puente especificado no es válido."
+
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr "Copiar (Ctrl+C)"
+
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr "Debe especificar una dirección IP o nombre del equipo y un número de puerto para configurar Tor para usar un proxy para acceder a Internet."
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "Debe especificar uno o más puertos a los que su cortafuegos le permita conectarse."
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' no es un número de puerto válido."
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr "Marque si su red local requiere de un proxy para acceder a Internet"
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "Uso un proxy para acceder a Internet"
+
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr "Configuración de Proxy"
+
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "Proxy HTTP:"
+
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr "Nombre de Usuario:"
+
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "También usar este proxy para HTTPS"
+
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr "Contraseña:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "Puerto:"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr "Active para conectarse solamente con repetidores que usen puertos permitidos por la configuración de su cortafuegos"
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "Mi cortafuegos sólo me permite conectarme a ciertos puertos"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "Configuración del Cortafuegos"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "Puertos Permitidos:"
+
+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 "Active para peticiones de directorios encriptadas y opcionalmente, usar puentes repetidores para acceder a la red Tor"
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "Mi ISP bloquea conexiones a la red Tor"
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr "Configuración de Puentes"
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr "El software de Tor que se está ejecutando actualmente no soporta puentes. "
+
+msgctxt "NetworkPage"
+msgid "Add a Bridge:"
+msgstr "Agregar un puente:"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "<a href=\"bridges.finding\">¿Cómo encuentro un puente?</a>"
+
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr "Quitar de la lista los puentes seleccionados"
+
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr "Copiar al portapapeles los puentes seleccionados"
+
+msgctxt "NetworkPage"
+msgid "Find Bridges Now"
+msgstr "Buscar puentes ahora"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
+msgstr "<a href=\"bridges.finding\">¿De qué otra forma puedo buscar puentes?</a>"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
+msgstr "<a href=\"bridges.finding\">¿Cómo puedo buscar puentes?</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 "Actualmente no hay nuevos puentes disponibles. Puede esperar un rato e intentar de nuevo o probar con otro método para encontrar nuevos puentes."
+
+msgctxt "NetworkPage"
+msgid "Click Help to see other methods of finding new bridges."
+msgstr "Haga clic en Ayuda para ver otros métodos de búsqueda de nuevos puentes"
+
+msgctxt "Policy"
+msgid "accept"
+msgstr "aceptar"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "rechazar"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "En Línea"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Hibernando"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Fuera de Línea"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Ubicación:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "Dirección IP:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Plataforma:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Ancho de Banda:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Tiempo de disponibilidad:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Última Actualización:"
+
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Copiar"
+
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
+msgstr "Hibernando"
+
+msgctxt "RouterInfoDialog"
+msgid "Online"
+msgstr "En Línea"
+
+msgctxt "RouterInfoDialog"
+msgid "Offline"
+msgstr "Fuera de Línea"
+
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr "Desconocido"
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr "Detalles del repetidor"
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr "Resumen"
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr "Nombre:"
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr "Estado"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "Ubicación:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "Dirección IP:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "Plataforma:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "Ancho de Banda:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "Tiempo de disponibilidad:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "Contacto:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "Última Actualización:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr "Descriptor"
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Fuera de Línea"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Hibernando"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Repetidor"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "Acercar al Repetidor"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 repetidores en línea"
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Copiar"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "Sobrenombre"
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "Huella"
+
+msgctxt "ServerPage"
+msgid "Bridge Support Unavailable"
+msgstr "Soporte de Puentes no disponible"
+
+msgctxt "ServerPage"
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgstr "Ha configurado Tor para actuar como repetidor de puente para usuarios censurados, pero su versión de Tor no soporta puentes."
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "Por favor, mejore su versión de Tor o configúrelo para actuar como un repetidor regular."
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "Su puente repetidor no está ejecutándose."
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "Debe especificar al menos el sobrenombre de un repetidor y puerto."
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "Ejecutar como sólo cliente"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Repetidor de tráfico para la red Tor"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "Puerto repetidor:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "Habilitar la réplica del directorio de repetición"
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "Intentar configurar automáticamente el reenvío de puertos"
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "Prueba"
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "Mostrar el tópico de ayuda del reenvío de puertos"
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Puerto del Directorio:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Número del Puerto del Directorio"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Información de Contacto:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "Nombre de su repetidor"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "Puerto por el que los usuarios y otros repetidores pueden comunicarse con su repetidor"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Sobrenombre:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Preferencias Básicas"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Para conexiones de internet con velocidades de descarga rápida pero subida lenta, por favor escriba su velocidad de subida aquí."
+
+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 "Especificado"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Seleccione la entrada que más se parezca a su conexión de Internet"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Mostrar ayuda acerca de los limites de tasas del ancho de banda"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Tasa Promedio"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Tasa de ancho de banda promedio a largo plazo"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Tasa Máxima"
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "Limite pico de la tasa del ancho de banda"
+
+msgctxt "ServerPage"
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr "La tasa máxima de su ancho de banda debe ser mayor o igual que su tasa de ancho de banda promedio. Ambos valores deben ser al menos 20KB/s."
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Limites del Ancho de Banda"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Puertos 6660 - 6669 y 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Conversación de Repetidor de Internet (IRC)"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Puertos 110, 143, 993 y 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Recibir Correo (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Puertos no especificados por otras casillas de verificación"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Otros servicios misceláneos"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Puertos 706, 1863, 5050, 5190, 5222, 5223, 8300 y 8888"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "Mensajería Instantánea (IM)"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "Puerto 443"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "Sitios Web Seguros (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Puerto 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Sitios Web"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "Mostrar ayuda acerca de las políticas de salida"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr "¿A cuáles recursos de Internet podrán acceder los usuarios conectados a su repetidor?"
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr "Tor seguirá bloqueando algún correo saliente y aplicaciones de compartir archivos de manera predeterminada para reducir el correo basura y otros abusos."
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Políticas de Salida"
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr "Permitir a otros acceder a su puente dándoles esta línea:"
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "Este es el identificador de su puente repetidor que puede ofrecer a otras personas"
+
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr "Copiar el identificador de su puente retransmisor al portapapeles"
+
+msgctxt "ServerPage"
+msgid "No Recent Usage"
+msgstr "Sin uso reciente"
+
+msgctxt "ServerPage"
+msgid "No clients have used your relay recently."
+msgstr "Ningún cliente ha usado recientemente su repetidor"
+
+msgctxt "ServerPage"
+msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgstr "Permita que su repetidor siga ejecutándose para que los clientes tengan más oportunidades de encontrarlo y usarlo"
+
+msgctxt "ServerPage"
+msgid "Bridge History"
+msgstr "Historial de puentes"
+
+msgctxt "ServerPage"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgstr "Vidalia no pudo recuperar el historial de utilización de sus puentes."
+
+msgctxt "ServerPage"
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgstr "Tor devolvió una respuesta con formato incorrecto cuando Vidalia solicitó el historial de utilización de sus puentes."
+
+msgctxt "ServerPage"
+msgid "The returned response was: %1"
+msgstr "La respuesta devuelta fue: %1"
+
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network"
+msgstr "Ayude a usuarios censurados a acceder a la red Tor"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr "<a href=\"bridges.finding\">¿Quién ha utilizado mi puente?</a>"
+
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory"
+msgstr "Replicar el Directorio repetidor"
+
+msgctxt "ServerPage"
+msgid "Email address at which you may be reached if there is a\n"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr "Dirección de correo electrónico en la cual podría localizársele si hubiera un\n"
+"problema con su repetidor. Pudiera incluir también su huella PGP o GPG."
+
+msgctxt "ServicePage"
+msgid "Error while trying to unpublish all services"
+msgstr "Error al tratar de quitar la publicación de todos los servicios"
+
+msgctxt "ServicePage"
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
+msgstr "Por favor, configure al menos un servidor de directorios y un puerto virtual por cada servicio que quiera guardar. Elimine los otros."
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Error"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "Por favor, seleccione un Servicio."
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "Seleccione Servicio de Directorio"
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "El Puerto Virtual sólo puede contener puertos válidos [1..65535]."
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "El destino sólo puede contener dirección:puerto, dirección, o puerto."
+
+msgctxt "ServicePage"
+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"
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "Dirección Onion"
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "Puerto Virtual"
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "Destino"
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "Ruta del Directorio"
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "Habilitado"
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "Agregar nuevo servicio a la lista"
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "Quitar servicio seleccionado de la lista"
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr "Copiar dirección onion del servicio seleccionado al portapapeles"
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr "Explorar sus archivos y elegir un directorio para servicios seleccionados"
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "Creado por Tor"
+
+msgctxt "Stream"
+msgid "New"
+msgstr "Nuevo"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Resolviendo"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Conectando"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "Abrir"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Falló"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Cerrado"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Intentando de nuevo"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "Remapeado"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Desconocido"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "Proceso %1 no pudo detener [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "El servicio Tor no esta instalado."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "No se puede comenzar el servicio Tor."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "Falló al obtener hash de la contraseña de control."
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "Éxito"
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "No se encontraron dispositivos UpnP habilitados"
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "No se encontraron dispositivos UPnP de puertas de enlace de Internet válidos"
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "WSAStartup falló"
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "Falló al agregar un mapeo de puertos"
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "Falló el reintento de mapeo de puertos"
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "Falló al eliminar el mapeo de puertos"
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "Error desconocido"
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "Buscando dispositivos UpnP habilitados"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "Actualizando el directorio de mapeo de puertos"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "Actualizando el mapeo de puertos del repetidor"
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "¡La prueba concluyó de manera exitosa!"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "Probando el Soporte UPnP"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr "Probando el Soporte Universal Plug & Play"
+
+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'. "
+
+msgctxt "UpdateProcess"
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgstr "Vidalia no pudo verificar si hay actualizaciones de software disponibles porque el proceso de actualización de Tor terminó inesperadamente."
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for available updates..."
+msgstr "Verificando si hay actualizaciones disponibles..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Hide"
+msgstr "Ocultar"
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr "Descargando actualizaciones..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr "Instalando el software actualizado..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr "¡Terminado! Su software ya está actualizado."
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr "Aceptar"
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr "Actualizaciones de Software"
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr "Verificando si hay actualizaciones..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr "Actualizaciones de software disponible"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr "Recordármelo más tarde"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr "Instalar"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr "Los siguientes paquetes de software actualizados están listos para su instalación:"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr "Paquete"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr "Versión"
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "Aceptar"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Si"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "No"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Ayuda"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Intentar de nuevo"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Mostrar Registro"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Mostrar Preferencias"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Continuar"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Salir"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Examinar"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Argumento no válido"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia ya está ejecutándose"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Muestra este mensaje y sale."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "Restablece TODAS las preferencias almacenadas de Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Establece el directorio de Vidalia para archivos de información."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Establece el nombre y la ubicación del archivo de procesos de Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Establece el nombre y la ubicación del archivo de registro de Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Establece el nivel de registro de Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Establece el estilo de la interfaz de Vidalia"
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Establece el idioma de Vidalia."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Información de Uso de Vidalia"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "No se puede abrir el archivo de registro '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr "Código de idioma especificado no válido:"
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr "Estilo de Interfaz Gráfica de Usuario especificado no válido:"
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr "Nivel de registro especificado no vá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 "Posiblemente ya se esté ejecutando otro proceso de Vidalia. Si realmente no hay otro proceso de Vidalia ejecutándose, puede optar por continuar de todos modos.\n"
+"\n"
+"Quiere continuar con el inicio de Vidalia?"
+
+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 días"
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr "%1 horas"
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr "%1 min."
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/et/qt_et.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/et/qt_et.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/et/qt_et.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/et/vidalia_et.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/et/vidalia_et.po
new file mode 100644
index 0000000..490ed67
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/et/vidalia_et.po
@@ -0,0 +1,3292 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Vidalia 0.2.0"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor 0.2.0.32"
+msgstr ""
+
+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."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+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 ""
+
+msgctxt "AdvancedPage"
+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"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+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 ""
+
+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 ""
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+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 ""
+
+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 ""
+
+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 ""
+
+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 ""
+
+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"
+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 "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 "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 "The proxy arguments specified are not properly formatted."
+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 "MainWindow"
+msgid "Start Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Identity"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Control 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."
+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 ""
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+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 ""
+
+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 "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 ""
+
+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 "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+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 ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Always Save New Log 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 "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."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+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 ""
+
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+msgctxt "NetworkPage"
+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."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+msgctxt "NetworkPage"
+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 ""
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+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 ""
+
+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 "Policy"
+msgid "accept"
+msgstr ""
+
+msgctxt "Policy"
+msgid "reject"
+msgstr ""
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr ""
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr ""
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr ""
+
+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:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr ""
+
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+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 ""
+
+msgctxt "ServerPage"
+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 ""
+
+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 "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 ""
+
+msgctxt "ServicePage"
+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."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+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 ""
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/eu/qt_eu.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/eu/qt_eu.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/eu/qt_eu.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/eu/vidalia_eu.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/eu/vidalia_eu.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/eu/vidalia_eu.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fa/qt_fa.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fa/qt_fa.po
new file mode 100644
index 0000000..c093a61
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fa/qt_fa.po
@@ -0,0 +1,430 @@
+msgid ""
+msgstr ""
+"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: 2008-08-20 06:18+0000\n"
+"Last-Translator: Matt <edmanm at vidalia-project.net>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "RTL"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fa/vidalia_fa.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fa/vidalia_fa.po
new file mode 100644
index 0000000..dae9600
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fa/vidalia_fa.po
@@ -0,0 +1,3295 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2009-06-23 04:57+0000\n"
+"Last-Translator: Nami B <pesarefahmideh at gmail.com>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "دربارهی ویدالیا"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "مجوز"
+
+msgctxt "AboutDialog"
+msgid "Vidalia 0.2.0"
+msgstr "ویدالیا"
+
+msgctxt "AboutDialog"
+msgid "Tor 0.2.0.32"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Qt 4.4.2"
+msgstr "۱۰۰ {4.4.2?}"
+
+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 "آدرس آی پی '%1' معتبر نمیباشد."
+
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "شما احراز هویت بر اساس اسم رمز را برگزیدید, اما اسم رمز را مشخص نکردید."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "انتخاب فایل پیکربندی"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "فایل مورد نظر پیدا نشد"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "فایل %1 وجود ندارد. آیا میخواهید آن را بسازید؟"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "ایجاد فایل ناموفق بود"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "[%2] نمیتوانم %1 را ایجاد کنم"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "برگزیدن یک فهرست برای داده های تُر"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "حذف سرویس ممکن نبود"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "نصب سرویس ممکن نبود"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "ویدالیا نتوانست سرویس تُر را نصب کند"
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "درگاه کنترل"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "احراز هویت:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "آدرس:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "هيچكدام"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "کوکی"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "اسم رمز"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "تولید کردن به گونه تصادفی"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "فایل پیکربندی تُر"
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "راه اندازی نرم افزار تُر با فایل پیکربندی مشخص شده (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 "ذخیره کردن داده ها برای نرم افزار تُر در فهرست ذیل"
+
+msgctxt "AdvancedPage"
+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"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+"ویدالیا نتوانست سرویس تُر را حذف کند. \n"
+"\n"
+"لازم است آن را بهطور دستی حذف کنید."
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "زبان"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "زبان ویدالیا را انتخاب کن"
+
+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 "ویدالیا قادر نبود زبان انتخاب شده را بارگذاری نماید."
+
+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 "۱۰۰"
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "مات %"
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "ذخیره"
+
+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 ""
+
+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 "بستن مدار (Del)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "بستن جریان (Del)"
+
+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 "ویدالیا نتوانست تنظیمات %1 را ذخیره کند."
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "خطا در هنگام بکار بردن تنظیمات"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "ویدالیا نتوانست تنظیمات %1 را به تُر اعمال کند."
+
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "تنظیمات"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "ویدالیا نتوانست به تُر وصل شود. (%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 ""
+
+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"
+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 "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 "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "فایل اجرایی (.exe)"
+
+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 "The proxy arguments specified are not properly formatted."
+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 "%1 کیلوبایت در ثانیه"
+
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr "%1 کیلو بایت"
+
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr "%1 مگابایت"
+
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr "%1 گیگابایت"
+
+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 "%1 نتیجه پیدا شد"
+
+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 "به خانه برو (کنترل+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "کنترل + H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "بیاب"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "جستجو برای کلمه یا عبارتی در صفحهی فعلی (کنترل + F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "کنترل + F"
+
+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 "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 "کنترل + T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "کنترل + B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "کنترل + L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "کنترل + N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "کنترل + ?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "کنترل + I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+msgctxt "MainWindow"
+msgid "Tor"
+msgstr "تُر"
+
+msgctxt "MainWindow"
+msgid "View"
+msgstr "نمایش"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "راهنمای ویدالیا"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "خطا در هنگام راه اندازی مرورگر وب"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "ویدالیا قادر به راه اندازی مرورگر وب پیکربتدی شده نبود"
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "خطای راه اندازی کاربر IM"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "ویدالیا نتوانست کاربر IM پیکربندی شده را راه اندازی کند"
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "خطا در هنگام راه اندازی پیشکار"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "ویدالیا قادر به راه اندازی پیشکار پیکربندی شده نبود"
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "اتصال به یک فهرست بازپخش"
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "برپایی یک اتصال فهرست رمزبندی شده"
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "دریافت وضعیت شبکه"
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "بارگذاری وضعیت شبکه"
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "بارگذاری مجوزها"
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "درخواست اطلاعات بازپخش"
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "بارگذاری اطلاعات بازپخش"
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "اتصال به شبکه تُر"
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "برپایی یک جریان تُر"
+
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr "وصل شده به شبکه تُر"
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "وضعیت آغاز نامشخص"
+
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr "گوناگون"
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "خطای هویت"
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr "انجام شده"
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "اتصال ردشد"
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "اتمام وقت اتصال"
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "خطای خواندن/نوشتن"
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "نبود مسیر به میزبان"
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "منابع ناکافی"
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "ناشناخته"
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "تُر درحال اجرا نمی باشد"
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "تُر درحال بسته شدن میباشد"
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "متوقف کردن تُر حالا"
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr "متوقف کردن تُر"
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "راه اندازی نرم افزار تُر"
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "راه اندازی تُر"
+
+msgctxt "MainWindow"
+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."
+msgstr "ویدالیا نتوانست تُر را راهاندازی کند. تنظیمات خود را دوباره بررسی کنید تا مطمئن شوید مسیر فایل اجرایی تر را درست مشخص کردهاید."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "اتصال به تُر"
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "خطای اتصال"
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "بازپخش فعال میباشد"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "خطا بسته شدن"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "ویدالیا نتوانست نرم افزار تُر را متوقف کند."
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "خطای غیرمنتظره"
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "احرازهویت در تُر"
+
+msgctxt "MainWindow"
+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."
+msgstr "نرم افزار تُر نیاز به ارسال محتویات یک کوکی احراز هویت بوسیله ویدالیا دارد اما ویدالیا نتوانست آن را پیدا کند."
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "آیا می خواهید خودتان انتخاب فایل 'control_auth_cookie' را انجام دهید؟"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "فهرست داده ها"
+
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "کوکی کنترل (control_auth_cookie)"
+
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "خطا در هنگام ثبت رویدادها"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+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 "به روز رسانی تُر موجود می باشد"
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr "نسخه نصب شده تُر قدیمی است و دیگر توصیه نمیشود. خواهشمند است به سایت تُر رفته و نهایی ترین نسخه آن را بارگذاری کنید."
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "وب سایت تُر: %1"
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "تمام اتصالات بعدی به صورت متفاوت از اتصالات قبلی نمایش داده خواهند شد."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "ایجاد هویت جدید به شکست انجامید"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "ارسال درگاه شکست خورد"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "ویدالیا نتوانست ارسال درگاه خودکار را پیکربندی کند."
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+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 "پنهان کردن این پنجره"
+
+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 "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 "به روز رسانی تُر موجود می باشد"
+
+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 "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+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 ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "ویدالیا"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "دربارهی ویدالیا"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "خانه"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "خطا در تنظیم فیلتر"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "ویدالیا نتوانست برای دریافت گزارشات تُر ثبتنام کند"
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "خطا در بازکردن فایل گزارش"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "ویدالیا نتوانست فایل مشخص شده را باز کند"
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "نام فایل گزارش الزامی است"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "برای دخیرهی گزارش پیامها باید نام یک فایل را مشخص کنید"
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "فایل گزارش را انتخاب کن"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "پیامهای گزارش را ذخیره کن"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "فایلهای متنی"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "ویدالیا"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "جستجو در گزارش پیامها"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "پیدا کن"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "پیدا نشد"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "جستجو نتیجهای دربر نداشت"
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "گزارش پیامها"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "فیلترهای پیام ..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "تنظیم فیلترهای پیام"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "اندازهی تاریخچه ..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "تعیین حداکثر تعداد پیامهای قابل نمایش"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "پاک کن"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "تمام پیامهای گزارش را پاک کن (کنترل + E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "کنترل + E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "کپی کن"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "پیامهای انتخاب شده را به دفترچه یادداشت رایانه کپی کن"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "کنترل + E"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "همه را انتخاب کن"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "تمام پیامها را انتخاب کن (کنترل + E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "کنترل + A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "همه را ذخیره کن"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "تمام پیامها را در یک فایل ذخیره کن"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "انتخاب شدهها را ذخیره کن"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "پیامهای انتخاب شده را در یک فایل ذخیره کن"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "تنظیمات"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "تنظیمات گزارش پیامها را تنظیم کن"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "کنترل + T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "راهنما"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "مرورگر راهنما را نمایش بده"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "ببند"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "گزارش پیام را ببند"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "انصراف"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "پیدا کن"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "تمام پیامهای حاوی متن جستجو را پیدا کن (کنترل + F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "کنترل + F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "زمان"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "نوع"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "پیام"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "تنظیمات فعلی گزارش پیام را ذخیره میکند"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "ذخیرهی تنظیمات"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "تغییرات تنظیمات را لغو میکند"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "لغو کن"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "فیلتر پیامها"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "خطا"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "هشدار"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "توجه"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "اطلاع"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "اشکالیابی"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "تاریخچهی گزارش پیامها"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "تعداد پیامهایی که در پنچرهی گزارش پیام نمایش داده میشوند."
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "پیامها"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log 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 "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."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "نقشه شبکه تُر"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "بازنمایی"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "بازآوری لیست بازپخش ها و اتصالات تُر"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "کنترل + R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "راهنما"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "راهنمای نقشهی شبکه را نشان بده"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "راهنمای نقشهی شبکه را نشان بده"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "ببند"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "نقشهی شبکه را ببند"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "انصراف"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "بزرگتر کن"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "نقشهی شبکه را بزرگ کن"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "کوچکتر کن"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "نقشهی شبکه را کوچک کن"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "به اندازهی صفحهی نمایش بزرگکن"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "بزرگنمایی کافی برای نمایش تمام مدارها نمایشدادهشده فعلی"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "کنترل + Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "فایل مورد نظر پیدا نشد"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "ناشناخته"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "کنترل + 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."
+msgstr "شما میبایست یک آدرس آی پی یا یک نام میزبان و یک شماره درگاه برای پیکربندی تُر مشخص کنید جهت استفاده ار یک پیشکار برای دسترسی به اینترنت."
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "شما میبایست یک یا چند درگاه که بارو اجازه دسترسی به آنها را میدهد مشخص کنید."
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "شماره درگاه '%1' معتبر نمیباشد."
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr "نشان بگذارید اگر شبکه محلی شما نیاز به یک پیشکار برای دسترسی به اینترنت دارد"
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "برای دسترسی به اینترنت از یک پیشکار استفاده می کنم"
+
+msgctxt "NetworkPage"
+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 "اسم رمز:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "درگاه:"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr "نشان بگذارید جهت متصل شدن به بازپخش هایی که تنها درگاه های مجاز بدست بارو را استفاده میکنند"
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "بارو به من تنها اجازه دسترسی به برخی از درگاه ها را میدهد"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "تنظیمات بارو"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "درگاه های مجاز:"
+
+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 "نشان بگذارید برای رمزبندی درخواست های فهرست و, اختیاری, از پلهای بازپخش برای دسترسی به شبکه تُر استفاده کنید"
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "ارایه کننده خدمات دسترسی به اینترنت اتصالات به شبکه تُر را مسدود می کند"
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr "تنظیمات پل"
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr "نرم افزار تُر که شما هم اکنون در حال اجرای آن هستید پل ها را پشتیبانی نمی کند. <br> رمزبندی اتصال های فهرست ادامه خواهد یافت."
+
+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 "حذف کردن پل های منتخب از لیست"
+
+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 "Policy"
+msgid "accept"
+msgstr "قبول"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "رد"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "آنلاین"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "به خواب رفتن"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "آفلاین"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "موقعیت:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "آدرس آیپی"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "پلتفرم"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "پهنای باند"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "رمان فعالیت بدونوقفه"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "آخرین بهروزرسانی:"
+
+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:"
+msgstr "وضعیت"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "موقعیت:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "آدرس آیپی"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "پلتفرم"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "پهنای باند"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "رمان فعالیت بدونوقفه"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "مشخصات تماس:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "آخرین بهروزرسانی:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "آفلاین"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "بهخواب رفتن"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 کلیوبایت"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "بازپخش"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "بزرگ نمایی بازپخش"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 بازپخش های آنلاین"
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "کپی کن"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr ""
+
+msgctxt "ServerPage"
+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."
+msgstr "شما تُر را به گونه ای پیکربندی کردید که مانند یک پل بازپخش برای کاربران سانسورشده کارکند, اما نسخه تُر شما پل ها را پشتیبانی نمی کند."
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "خواهشمند است نرم افزار تُر را بروزرسانی کنید یا تُر را به گونه ای پیکربندی کنید که مانند یک بازپخش تُر نرمال کارکند."
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "پل بازپخش شما در حال اجرا نمی باشد."
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "شما میبایست دست کم یک لقب بازپخش و درگاه را مشخص کنید."
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "اجراکردن تنها مانند یک کاربر"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "ترافیک بازپخش شده برای شبکهی تُر"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "درگاه بازپخش:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "آینه ای کردن فهرست بازپخش"
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "تلاش برای پیکربندی خودکار ارسال درگاه"
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "تست"
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "نمایش سرفصل کمک برای ارسال درگاه"
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "درگاه دارکتوری"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "شمارهی درگاه دایرکتوری"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "مشخصات تماس:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "نام بازپخش شما"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "درگاهی که کاربران و بازپخش های دیگر می توانند بوسیله آن با بازپخش شما ارتباط برقرار کنند"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "لقب:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "تنظیمات اولیه"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "برای ارتباطات اینترنتی با نرخ بارگیری (دانلود) سریع ولی نرخ بارگذاری (آپلود) کند، لطفا سرعت بارگذاری خود را اینجا مشخص کنید."
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "کابل یا DSL ۲۵۶ کیلوبیت بر ثانیه"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "کابل یا DSL ۵۱۲ کیلوبیت بر ثانیه"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "کابل یا DSL ۷۶۸ کیلوبیت بر ثانیه"
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1 یا کابل یا DSL ۱.۵ مگابیت بر ثانیه"
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "بیش از ۱.۵ مگابیت بر ثانیه"
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "خودت تغیین کن"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "گزینهای را که از همه بیشتر به نوع ارتباط اینترنت شما شبیه است انتخاب کنید"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "نمایش موضوعات راهنما در مورد محدودیتهای پهنای باند"
+
+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 "بیشترین میزان پهنای باند شما می بایست بزرگتر یا مساوی با میزان پهنای باند متوسط شما باشد. کوچکترین مقدار هردو میبایست 20 کیلوبایت در ثانیه باشد."
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "محدودیتهای پهنای باند"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "درگاههای ۶۶۶۰ تا ۶۶۶۹ و ۶۶۹۷"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "چت بازپخش اینترنتی (IRC)"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "درگاههای ۱۱۰، ۱۴۳، ۹۹۳ و ۹۹۵"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "دریافت ایمیل (POP , IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "درگاههایی که توسط دیگر گزینهها انتخاب نشدهاند"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "سروریسهای دیگر"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "درگاههای ۷۰۶، ۱۸۶۳، ۵۰۵۰، ۵۲۲۲، ۸۳۰۰ و ۸۸۸۸ {706, 1863, 5050, 5190, 5222, 5223, 8300 ?} {8888?}"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "پیام کوتاه (IM)"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "درگاه ۴۴۳"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "وبسایتهای امن (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "درگاه ۸۰"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "وبسایتها"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "موضوع راهنما در مورد سیاستهای خروج را نمایش بده"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr "به چه منابع اینترنتی کاربران قادر به دسترسی خواهند بود از بازپخش شما؟"
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "سیاستهای خروج"
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr "بگذارید دیگران به پل شما دسترسی پیدا کنند با بیان کردن این خط به آنها:"
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "این هویت پل بازپخش شما می باشد که میتوانید آن را به افراد دیگر بدهید"
+
+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 "ویدالیا نتوانست تنظیمات %1 را ذخیره کند."
+
+msgctxt "ServerPage"
+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 ""
+
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network"
+msgstr "کمک به کاربران سانسورشده برای دستیابی به شبکه تُر (تُر 0.2.0.8-alpha یا جدیدتر)"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr "<a href=\"bridges.finding\">چطور می توانم یک پل را پیدا کنم؟</a>"
+
+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 ""
+
+msgctxt "ServicePage"
+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."
+msgstr "خواهشمند است حداقل یک سرویس فهرست و یک درگاه مجازی برای هریک از سرویس هایی که مایل به ذخیره آن هستید پیکربندی کنید. بقیه ها را خذف کن."
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "خطا"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "خواهشمند است یک سرویس انتخاب کنید."
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "انتخاب فهرست سرویس"
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "درگاه های مجازی تنها می توانند شامل شماره درگاه های معتبر باشند [1..65535]."
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "هدف تنها می تواند شامل آدرس:درگاه, آدرس, یا درگاه باشد."
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr "فهرست در استفاده یک سرویس دیگر است."
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "فرم"
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr "سرویس های پنهان فراهم شده"
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "آدرس پیاز"
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "درگاه مجازی"
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "هدف"
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "مسیر فهرست"
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "فعال"
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "افزودن سرویس جدید به لیست"
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "برداشتن سرویس انتخاب شده از لیست"
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr "کپی کردن آدرس پیاز سرویس انتخاب شده در تخته یادداشت"
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr "مرور در سیستم فایل و برگزیدن فهرست برای سرویس انتخاب شده"
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+msgctxt "Stream"
+msgid "New"
+msgstr "جدید"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "ترجمه"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "اتصال"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "باز"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "ناموفق"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "بسته"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "تلاش مجدد"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "بازنگاشته"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "نامعلوم"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "فرایند شماره %1 نتوانست متوقف شود. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "سرویس تُر نصب نشده است"
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "ناتوان در راه اندازی سرویس تُر."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "شکست در درهم درآوردن اسم رمز کنترل."
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "موفقیت"
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "هیچ دستگاه UPnP پیدا نشد"
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "هیچ دستگاه دروازه اینترنت معتبر UPnP پیدا نشد"
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "WSAStartup موفق نشد"
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "ناموفق در افزودن یک نگاشت درگاه"
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "ناموفق در بازیافتن یک نگاشت درگاه"
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "ناموفق در برداشتن یک نگاشت درگاه"
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "خطای ناشناخته"
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "پیداکردن دستگاه های UPnP"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "بروز رسانی نگاشت درگاه فهرست"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "بروزرسانی نگاشت درگاه بازپخش"
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "تست با موفقیت تمام شد!"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "تست پشتیبانی UPnP"
+
+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 ""
+
+msgctxt "UpdateProcess"
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for available updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Hide"
+msgstr "پنهان کردن"
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr "راه اندازی نرم افزار تُر"
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr "بسیارخوب"
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr "لغو"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr "به روز رسانی تُر موجود می باشد"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr "بکسپیس"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr "نسخه"
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "بسیارخوب"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "لغو"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "بله"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "خیر"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "راهنما"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "تلاش مجدد"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "نمایش گزارش"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "نمایش تنظیمات"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "ادامه"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "خروج"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "انتخاب فایل"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "نشانوند نامعتبر"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "ویدالیا در حال اجرا است"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "این پیام کاربردی را نمایش می دهد و بیرون میرود."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "بازنشانی کردن همه تنظیمات ذخیره شده ویدالیا."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "گذاردن فهرست مورد استفاده توسط ویدالیا برای فایل های داده."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "گذاردن نام و محل فایل شناسه فرآیند ویدالیا."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "گذاردن نام و محل فایل تاریخچه ثبت ویدالیا."
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "گذاردن درجه پرحرفی ثبت ویدالیا."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "گذاردن سبک واسط ویدالیا."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "گذاردن زبان ویدالیا."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "اطلاعات درمورد استفاده ویدالیا"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "ناتوان در بازکردن فایل تاریخچه ثبت '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr "%1 ثانيه"
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr "%1 کیلوبایت در ثانیه"
+
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr "%1 کیلوبایت در ثانیه"
+
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr "%1 کیلوبایت در ثانیه"
+
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
+msgstr "%1 کیلوبایت در ثانیه"
+
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fi/qt_fi.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fi/qt_fi.po
new file mode 100644
index 0000000..7a191b3
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fi/qt_fi.po
@@ -0,0 +1,442 @@
+msgid ""
+msgstr ""
+"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: 2009-12-19 13:35-0700\n"
+"Last-Translator: Harri Vähätalo <harri at svahatalo.fi>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "Aktivoi"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "Sovellus '%1' vaatii Qt %3, löytyi Qt %3."
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "Yhteensopimaton Qt-kirjasto virhe"
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "QT_LAYOUT_DIRECTION"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "Aktivoi ohjelman pääikkunan"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "OK"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "Tallenna"
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "Avaa"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "Peruuta"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "Sulje"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "Käytä"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "Palauta"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "Ohje"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "Älä tallenna"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "Hylkää"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "&Kyllä"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "Kyllä k&aikkiin"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "&Ei"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "E&i kaikkiin"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "Tallenna kaikki"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "Keskeytä"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "Yritä uudelleen"
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "Hylkää"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "Palauta oletuksiin"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "Sulje tallentamatta"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "&OK"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "Nimi"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "Koko"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "Tyyppi"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "Tyyppi"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "Muokattu"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "Kaikki tiedostot (*)"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "Kansiot"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "&Avaa"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "&Tallenna"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "Avaa"
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"%1 on jo olemassa.\n"
+"Haluatko korvata sen?"
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+"%1\n"
+"Tiedostoa ei löytynyt.\n"
+"Ole hyvä ja tarkista tiedoston nimi."
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "Oma tietokone"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "&Nimeä uudelleen"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "&Poista"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "Näytä &piilotetut tiedostot"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "Edellinen"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "Yläkansio"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "Luottelo-näkymä"
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "Tiedot-näkymä"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "Tiedostojen tyypit:"
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "Kansio:"
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+"%1\n"
+"Kansiota ei löytynyt.\n"
+"Ole hyvä ja tarkista kansion nimi."
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+"'%1' on kirjoitussuojattu.\n"
+"Oletko varma, että haluat poistaa sen?"
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "Oletko varma, että haluat poistaa '%1'?"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "Kansion poisto ei onnistunut."
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "Kaikki tiedostot (*.*)"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "Tallenna nimellä"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "Asema"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "Tiedosto"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "Etsi kansio"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "Näytä"
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "Seuraava"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "Uusi kansio"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "&Uusi kansio"
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "&Valitse"
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "Poista"
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "Tiedoston &nimi:"
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "Etsi täältä:"
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "Luo uusi kansio"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "Invalid filename"
+msgstr "Virheellinen tiedostonnimi"
+
+#: 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>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"
+msgid "Name"
+msgstr "Nimi"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "Koko"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "Tyyppi"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "Tyyppi"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "Muokattu"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "Oma tietokone"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "Tietokone"
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr "%1 TB"
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr "%1 gt"
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr "%1 mt"
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr "%1 kt"
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr "%1 tavua"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fi/vidalia_fi.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fi/vidalia_fi.po
new file mode 100644
index 0000000..12066a3
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fi/vidalia_fi.po
@@ -0,0 +1,3355 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2010-04-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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Tietoja Vidaliasta"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "Lisenssi"
+
+msgctxt "AboutDialog"
+msgid "Vidalia 0.2.0"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "Tor 0.2.0.32"
+msgstr "Tor 0.2.0.32"
+
+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."
+msgstr "Valitsit 'Salasana'-kirjautumisen, mutta et määrittänyt salasanaa."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Valitse Tor-asetustiedosto"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Tiedostoa ei löydy"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 tiedostoa ei ole olemassa. Haluatko luoda sen?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Tiedoston luominen epäonnistui"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "Tiedoston %1 luominen epäonnistui [%2]"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Valitse hakemisto Tor-ohjelman tiedoille"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Tor-palvelun poisto epäonnistui"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "Tor-palvelun asennus epäonnistui"
+
+msgctxt "AdvancedPage"
+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:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Osoite:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "Ei lainkaan"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Eväste"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Salasana"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "Luo satunnaisesti"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Tor-asetustiedosto"
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "Käynnistä Tor-ohjelma määritellyllä asetustiedostolla (torcc)"
+
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "Valitse sijainti asetustiedostolle"
+
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Selaa"
+
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr "Tietokansio"
+
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr "Tallenna Tor-ohjelman tiedot seuraavaan kansioon"
+
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr "Valitse kansio, johon Tor-ohjelman tiedot tallennetaan"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+"Vidalia ei onnistunut poistamaan Tor-palvelua. Joudut ehkä poistamaan sen "
+"manuaalisesti."
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Kieli"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Valitse kieli, jolla Vidalia käytetään"
+
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Teema"
+
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Valitse teema Vidalian käyttöliittymälle"
+
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr "Vidalia ei onnistunut lataamaan valittua kielikäännöstä."
+
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr "Alkaen:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Piilota asetukset"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Näytä asetukset"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Torrin käyttämä kaistanleveyden määrä"
+
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "Tyhjennä"
+
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Vastaanottonopeus"
+
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Lähetysnopeus"
+
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Aina päällimmäisenä"
+
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Teema"
+
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Muuttaa yhteydenkäytön kuvaajan läpinäkyvyyttä"
+
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% läpinäkyvä"
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Tallenna"
+
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Peruuta"
+
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr "Aloitetaan HTTPS välityspalvelinpyyntö...."
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr "Yhdistetään osoitteeseen %1:%2..."
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr "Lähetetään HTTPS pyyntö välityspalvelimille...."
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr "Ladataan lista silloista..."
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr "Ladataan siltoja"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr "Siltojen lataus epäonnistui: %1"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr "Yritetään uudestaan siltapyyntöä..."
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr "Maa"
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+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"
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr "Sillan Käytön Yhteenveto"
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr "Asiakas Yhteenveto"
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "Uusi"
+
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Auki"
+
+msgctxt "Circuit"
+msgid "Building"
+msgstr "Muodostetaan"
+
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Epäonnistui"
+
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Suljettu"
+
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Tuntematon"
+
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Tyhjä reitti>"
+
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Yhteys"
+
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "Tila"
+
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Sovita näyttämään yhteys"
+
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "Sulje yhteys (Del)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Sulje datavirta (Del)"
+
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "Yleiset"
+
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Verkko"
+
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr "Jakaminen"
+
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "Palvelut"
+
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Ulkoasu"
+
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Edistyneet asetukset"
+
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Ohje"
+
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Virhe asetuksia tallennettaessa"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr "Vidalia ei onnistunut tallentamaan %1 asetuksia."
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Virhe otettaessa käyttöön asetuksia"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia ei onnistunut ottamaan käyttöön %1 asetuksia Tor-ohjelman kanssa."
+
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Asetukset"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Vidalia ei onnistunut muodostamaan Tor-yhteyttä. (%1)"
+
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "Ohjausyhteyttä ei ole muodostettu."
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "Salasana vaaditaan"
+
+msgctxt "ControlPasswordInputDialog"
+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:"
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "Ohjausyhteyttä ei ole muodostettu."
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Virhe lähetettäessä ohjauskomentoa. [%1]"
+
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr "Yhteys katkesi keskenkaiken."
+
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Virheellinen ohjausvastaus. [%1]"
+
+msgctxt "CountryInfo"
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+msgctxt "CountryInfo"
+msgid "Andorra"
+msgstr "Andorra"
+
+msgctxt "CountryInfo"
+msgid "Angola"
+msgstr "Angola"
+
+msgctxt "CountryInfo"
+msgid "Antigua & Barbuda"
+msgstr "Antigua & Barbuda"
+
+msgctxt "CountryInfo"
+msgid "Argentina"
+msgstr "Argentiina"
+
+msgctxt "CountryInfo"
+msgid "Armenia"
+msgstr "Armenia"
+
+msgctxt "CountryInfo"
+msgid "Australia"
+msgstr "Australia"
+
+msgctxt "CountryInfo"
+msgid "Azerbaijan"
+msgstr "Azerbaidžan"
+
+msgctxt "CountryInfo"
+msgid "Bahamas"
+msgstr "Bahama"
+
+msgctxt "CountryInfo"
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+msgctxt "CountryInfo"
+msgid "Barbados"
+msgstr "Barbados"
+
+msgctxt "CountryInfo"
+msgid "Belarus"
+msgstr "Valko-Venäjä"
+
+msgctxt "CountryInfo"
+msgid "Belgium"
+msgstr "Belgia"
+
+msgctxt "CountryInfo"
+msgid "Belize"
+msgstr "Belize"
+
+msgctxt "CountryInfo"
+msgid "Bhutan"
+msgstr "Bhutan"
+
+msgctxt "CountryInfo"
+msgid "Bolivia"
+msgstr "Bolivia"
+
+msgctxt "CountryInfo"
+msgid "Bosnia & Herzegovina"
+msgstr "Bosnia & Herzegovina"
+
+msgctxt "CountryInfo"
+msgid "Botswana"
+msgstr "Botswana"
+
+msgctxt "CountryInfo"
+msgid "Brazil"
+msgstr "Brasilia"
+
+msgctxt "CountryInfo"
+msgid "Brunei Darussalam"
+msgstr "Brunei"
+
+msgctxt "CountryInfo"
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+msgctxt "CountryInfo"
+msgid "Burkina Faso"
+msgstr "Burkina (Burkina Faso, Ylä-Volta)"
+
+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 "Kap Verde"
+
+msgctxt "CountryInfo"
+msgid "Central African Republic"
+msgstr "Keski-Afrikan tasavalta"
+
+msgctxt "CountryInfo"
+msgid "Chad"
+msgstr "Tšad"
+
+msgctxt "CountryInfo"
+msgid "Chile"
+msgstr "Chile"
+
+msgctxt "CountryInfo"
+msgid "China"
+msgstr "Kiina"
+
+msgctxt "CountryInfo"
+msgid "Colombia"
+msgstr "Kolumbia"
+
+msgctxt "CountryInfo"
+msgid "Comoros"
+msgstr "Komorit"
+
+msgctxt "CountryInfo"
+msgid "Congo, The Democratic Republic of the"
+msgstr "Kongon demokraattinen tasavalta"
+
+msgctxt "CountryInfo"
+msgid "Congo"
+msgstr "Kongo"
+
+msgctxt "CountryInfo"
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+msgctxt "CountryInfo"
+msgid "Cote d’Ivoire"
+msgstr "Norsunluurannikko"
+
+msgctxt "CountryInfo"
+msgid "Croatia"
+msgstr "Kroatia"
+
+msgctxt "CountryInfo"
+msgid "Cuba"
+msgstr "Kuuba"
+
+msgctxt "CountryInfo"
+msgid "Cyprus"
+msgstr "Kypros"
+
+msgctxt "CountryInfo"
+msgid "Czech Republic"
+msgstr "Ťsekin Tasavalta"
+
+msgctxt "CountryInfo"
+msgid "Denmark"
+msgstr "Tanska"
+
+msgctxt "CountryInfo"
+msgid "Djibouti"
+msgstr "Djibouti"
+
+msgctxt "CountryInfo"
+msgid "Dominica"
+msgstr "Dominican liittovaltio"
+
+msgctxt "CountryInfo"
+msgid "Dominican Republic"
+msgstr "Dominikaaninen tasavalta"
+
+msgctxt "CountryInfo"
+msgid "Ecuador"
+msgstr "Ecuador"
+
+msgctxt "CountryInfo"
+msgid "Egypt"
+msgstr "Egypti"
+
+msgctxt "CountryInfo"
+msgid "El Salvador"
+msgstr "El Salvador"
+
+msgctxt "CountryInfo"
+msgid "Equatorial Guinea"
+msgstr "Päiväntasaajan Guinea"
+
+msgctxt "CountryInfo"
+msgid "Eritrea"
+msgstr "Eritrea"
+
+msgctxt "CountryInfo"
+msgid "Estonia"
+msgstr "Viro"
+
+msgctxt "CountryInfo"
+msgid "France"
+msgstr "Ranska"
+
+msgctxt "CountryInfo"
+msgid "Gabon"
+msgstr "Gabon"
+
+msgctxt "CountryInfo"
+msgid "Gambia"
+msgstr "Gambia"
+
+msgctxt "CountryInfo"
+msgid "Georgia"
+msgstr "Georgia"
+
+msgctxt "CountryInfo"
+msgid "Germany"
+msgstr "Saksa"
+
+msgctxt "CountryInfo"
+msgid "Ghana"
+msgstr "Ghana"
+
+msgctxt "CountryInfo"
+msgid "Grenada"
+msgstr "Grenada"
+
+msgctxt "CountryInfo"
+msgid "Guatemala"
+msgstr "Guatemala"
+
+msgctxt "CountryInfo"
+msgid "Guinea"
+msgstr "Guinea"
+
+msgctxt "CountryInfo"
+msgid "Guinea-Bissau"
+msgstr "Guinea-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 "Israel"
+
+msgctxt "CountryInfo"
+msgid "Italy"
+msgstr "Italia"
+
+msgctxt "CountryInfo"
+msgid "Jamaica"
+msgstr "Jamaika"
+
+msgctxt "CountryInfo"
+msgid "Japan"
+msgstr "Japani"
+
+msgctxt "CountryInfo"
+msgid "Jordan"
+msgstr "Jordania"
+
+msgctxt "CountryInfo"
+msgid "Kazakhstan"
+msgstr "Kazakstan"
+
+msgctxt "CountryInfo"
+msgid "Kenya"
+msgstr "Kenia"
+
+msgctxt "CountryInfo"
+msgid "Kiribati"
+msgstr "Kiribati"
+
+msgctxt "CountryInfo"
+msgid "Kuwait"
+msgstr "Kuwait"
+
+msgctxt "CountryInfo"
+msgid "Kyrgyzstan"
+msgstr "Kirgisia"
+
+msgctxt "CountryInfo"
+msgid "Laos"
+msgstr "Laos"
+
+msgctxt "CountryInfo"
+msgid "Latvia"
+msgstr "Latvia"
+
+msgctxt "CountryInfo"
+msgid "Lebanon"
+msgstr "Libanon"
+
+msgctxt "CountryInfo"
+msgid "Lesotho"
+msgstr "Lesotho"
+
+msgctxt "CountryInfo"
+msgid "Liberia"
+msgstr "Liberia"
+
+msgctxt "CountryInfo"
+msgid "Liechtenstein"
+msgstr "Liechtenstein "
+
+msgctxt "CountryInfo"
+msgid "Lithuania"
+msgstr "Liettua"
+
+msgctxt "CountryInfo"
+msgid "Luxembourg"
+msgstr "Luxemburg"
+
+msgctxt "CountryInfo"
+msgid "Macedonia"
+msgstr "Makedonia"
+
+msgctxt "CountryInfo"
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+msgctxt "CountryInfo"
+msgid "Malawi"
+msgstr "Malawi"
+
+msgctxt "CountryInfo"
+msgid "Malaysia"
+msgstr "Malesia"
+
+msgctxt "CountryInfo"
+msgid "Mali"
+msgstr "Mali"
+
+msgctxt "CountryInfo"
+msgid "Malta"
+msgstr "Malta"
+
+msgctxt "CountryInfo"
+msgid "Marshall Islands"
+msgstr "Marshallinsaaret"
+
+msgctxt "CountryInfo"
+msgid "Mauritania"
+msgstr "Mauritania"
+
+msgctxt "CountryInfo"
+msgid "Mauritius"
+msgstr "Mauritius"
+
+msgctxt "CountryInfo"
+msgid "Micronesia"
+msgstr "Mikronesia"
+
+msgctxt "CountryInfo"
+msgid "Moldova"
+msgstr "Moldova"
+
+msgctxt "CountryInfo"
+msgid "Monaco"
+msgstr "Monaco"
+
+msgctxt "CountryInfo"
+msgid "Mongolia"
+msgstr "Mongolia"
+
+msgctxt "CountryInfo"
+msgid "Montenegro"
+msgstr "Montenegro"
+
+msgctxt "CountryInfo"
+msgid "Morocco"
+msgstr "Marokko"
+
+msgctxt "CountryInfo"
+msgid "Mozambique"
+msgstr "Mosambik"
+
+msgctxt "CountryInfo"
+msgid "Namibia"
+msgstr "Namibia"
+
+msgctxt "CountryInfo"
+msgid "Nauru"
+msgstr "Nauru"
+
+msgctxt "CountryInfo"
+msgid "Nepal"
+msgstr "Nepal"
+
+msgctxt "CountryInfo"
+msgid "Netherlands"
+msgstr "Alankomaat"
+
+msgctxt "CountryInfo"
+msgid "New Zealand"
+msgstr "Uusi-Seelanti"
+
+msgctxt "CountryInfo"
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+msgctxt "CountryInfo"
+msgid "Niger"
+msgstr "Niger"
+
+msgctxt "CountryInfo"
+msgid "Nigeria"
+msgstr "Nigeria"
+
+msgctxt "CountryInfo"
+msgid "Norway"
+msgstr "Norja"
+
+msgctxt "CountryInfo"
+msgid "Oman"
+msgstr "Oman"
+
+msgctxt "CountryInfo"
+msgid "Pakistan"
+msgstr "Pakistan"
+
+msgctxt "CountryInfo"
+msgid "Palau"
+msgstr "Palau"
+
+msgctxt "CountryInfo"
+msgid "Palestine"
+msgstr "Palestiina"
+
+msgctxt "CountryInfo"
+msgid "Panama"
+msgstr "Panama"
+
+msgctxt "CountryInfo"
+msgid "Papua New Guinea"
+msgstr "Papua Uusi-Guinea"
+
+msgctxt "CountryInfo"
+msgid "Paraguay"
+msgstr "Paraguay"
+
+msgctxt "CountryInfo"
+msgid "Peru"
+msgstr "Peru"
+
+msgctxt "CountryInfo"
+msgid "Philippines"
+msgstr "Filippiinit"
+
+msgctxt "CountryInfo"
+msgid "Poland"
+msgstr "Puola"
+
+msgctxt "CountryInfo"
+msgid "Portugal"
+msgstr "Portugali"
+
+msgctxt "CountryInfo"
+msgid "Qatar"
+msgstr "Qatar"
+
+msgctxt "CountryInfo"
+msgid "Romania"
+msgstr "Romania"
+
+msgctxt "CountryInfo"
+msgid "Russia"
+msgstr "Venäjä"
+
+msgctxt "CountryInfo"
+msgid "Rwanda"
+msgstr "Ruanda"
+
+msgctxt "CountryInfo"
+msgid "Saint Kitts & Nevis"
+msgstr "Saint Kitts ja Nevis"
+
+msgctxt "CountryInfo"
+msgid "Saint Lucia"
+msgstr "Saint Lucia"
+
+msgctxt "CountryInfo"
+msgid "Saint Vincent & the Grenadines"
+msgstr "Saint Vincent ja Grenadiinit"
+
+msgctxt "CountryInfo"
+msgid "Samoa"
+msgstr "Samoa"
+
+msgctxt "CountryInfo"
+msgid "San Marino"
+msgstr "San Marino"
+
+msgctxt "CountryInfo"
+msgid "Sao Tome & Principe"
+msgstr "São Tomé ja Príncipe"
+
+msgctxt "CountryInfo"
+msgid "Saudi Arabia"
+msgstr "Saudi Arabia"
+
+msgctxt "CountryInfo"
+msgid "Senegal"
+msgstr "Senegal"
+
+msgctxt "CountryInfo"
+msgid "Serbia"
+msgstr "Serbia"
+
+msgctxt "CountryInfo"
+msgid "Seychelles"
+msgstr "Seychellit"
+
+msgctxt "CountryInfo"
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+msgctxt "CountryInfo"
+msgid "Singapore"
+msgstr "Singapore"
+
+msgctxt "CountryInfo"
+msgid "Slovakia"
+msgstr "Slovakia"
+
+msgctxt "CountryInfo"
+msgid "Slovenia"
+msgstr "Slovenia"
+
+msgctxt "CountryInfo"
+msgid "Solomon Islands"
+msgstr "Salomonsaaret"
+
+msgctxt "CountryInfo"
+msgid "Somalia"
+msgstr "Somalia"
+
+msgctxt "CountryInfo"
+msgid "South Africa"
+msgstr "Etelä-Afrikka"
+
+msgctxt "CountryInfo"
+msgid "Spain"
+msgstr "Espanja"
+
+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 "Swazimaa"
+
+msgctxt "CountryInfo"
+msgid "Sweden"
+msgstr "Ruotsi"
+
+msgctxt "CountryInfo"
+msgid "Switzerland"
+msgstr "Sveitsi"
+
+msgctxt "CountryInfo"
+msgid "Syria"
+msgstr "Syyria"
+
+msgctxt "CountryInfo"
+msgid "Tajikistan"
+msgstr "Tadžikistan"
+
+msgctxt "CountryInfo"
+msgid "Tanzania"
+msgstr "Tansania"
+
+msgctxt "CountryInfo"
+msgid "Thailand"
+msgstr "Thaimaa"
+
+msgctxt "CountryInfo"
+msgid "Timor-Leste (East Timor)"
+msgstr "Timor-Leste (Itä-Timor)"
+
+msgctxt "CountryInfo"
+msgid "Togo"
+msgstr "Togo"
+
+msgctxt "CountryInfo"
+msgid "Tonga"
+msgstr "Tonga"
+
+msgctxt "CountryInfo"
+msgid "Trinidad & Tobago"
+msgstr "Trinidad ja Tobago"
+
+msgctxt "CountryInfo"
+msgid "Tunisia"
+msgstr "Tunisia"
+
+msgctxt "CountryInfo"
+msgid "Turkey"
+msgstr "Turkki"
+
+msgctxt "CountryInfo"
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+msgctxt "CountryInfo"
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+msgctxt "CountryInfo"
+msgid "Uganda"
+msgstr "Uganda"
+
+msgctxt "CountryInfo"
+msgid "Ukraine"
+msgstr "Ukraina"
+
+msgctxt "CountryInfo"
+msgid "United Arab Emirates"
+msgstr "Yhdistyneet arabiemiirikunnat (UAE)"
+
+msgctxt "CountryInfo"
+msgid "United Kingdom"
+msgstr "Yhdistynyt kuningaskunta"
+
+msgctxt "CountryInfo"
+msgid "United States"
+msgstr "Yhdysvallat"
+
+msgctxt "CountryInfo"
+msgid "Uruguay"
+msgstr "Uruguay"
+
+msgctxt "CountryInfo"
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+msgctxt "CountryInfo"
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+msgctxt "CountryInfo"
+msgid "Vatican"
+msgstr "Vatikaani"
+
+msgctxt "CountryInfo"
+msgid "Venezuela"
+msgstr "Venezuela"
+
+msgctxt "CountryInfo"
+msgid "Vietnam"
+msgstr "Vietnam"
+
+msgctxt "CountryInfo"
+msgid "Western Sahara"
+msgstr "Länsi-Sahara"
+
+msgctxt "CountryInfo"
+msgid "Yemen"
+msgstr "Jemen"
+
+msgctxt "CountryInfo"
+msgid "Zambia"
+msgstr "Sambia"
+
+msgctxt "CountryInfo"
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+msgctxt "CountryInfo"
+msgid "Albania"
+msgstr "Albania"
+
+msgctxt "CountryInfo"
+msgid "Algeria"
+msgstr "Algeria"
+
+msgctxt "CountryInfo"
+msgid "Austria"
+msgstr "Itävalta"
+
+msgctxt "CountryInfo"
+msgid "Bahrain"
+msgstr "Bahrain"
+
+msgctxt "CountryInfo"
+msgid "Benin"
+msgstr "Benin"
+
+msgctxt "CountryInfo"
+msgid "Ethiopia"
+msgstr "Etiopia"
+
+msgctxt "CountryInfo"
+msgid "Fiji"
+msgstr "Fidži"
+
+msgctxt "CountryInfo"
+msgid "Finland"
+msgstr "Suomi"
+
+msgctxt "CountryInfo"
+msgid "Greece"
+msgstr "Kreikka"
+
+msgctxt "CountryInfo"
+msgid "Guam"
+msgstr "Guam"
+
+msgctxt "CountryInfo"
+msgid "Hungary"
+msgstr "Unkari"
+
+msgctxt "CountryInfo"
+msgid "Iceland"
+msgstr "Islanti"
+
+msgctxt "CountryInfo"
+msgid "India"
+msgstr "Intia"
+
+msgctxt "CountryInfo"
+msgid "Indonesia"
+msgstr "Indonesia"
+
+msgctxt "CountryInfo"
+msgid "Iran"
+msgstr "Iran"
+
+msgctxt "CountryInfo"
+msgid "Iraq"
+msgstr "Irak"
+
+msgctxt "CountryInfo"
+msgid "Ireland"
+msgstr "Irlanti"
+
+msgctxt "CountryInfo"
+msgid "Korea, North"
+msgstr "Pohjois-Korea"
+
+msgctxt "CountryInfo"
+msgid "Korea, South"
+msgstr "Etelä-Korea"
+
+msgctxt "CountryInfo"
+msgid "Libya"
+msgstr "Libya"
+
+msgctxt "CountryInfo"
+msgid "Maldives"
+msgstr "Malediivit"
+
+msgctxt "CountryInfo"
+msgid "Mexico"
+msgstr "Meksiko"
+
+msgctxt "CountryInfo"
+msgid "Myanmar"
+msgstr "Myanmar"
+
+msgctxt "CountryInfo"
+msgid "Taiwan"
+msgstr "Taiwan"
+
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Suoritettavat (*.exe)"
+
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Valitse Tor-ohjelman sijainti"
+
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "Valitse välityspalvelinohjelma"
+
+msgctxt "GeneralPage"
+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"
+
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr "Selaa"
+
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Käynnistä Tor-ohjelma Vidalian käynnistyessä"
+
+msgctxt "GeneralPage"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr "Välityspalvelin-ohjelma (valinnainen)"
+
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "Käynnistä välityspalvelin-ohjelma Tor-ohjelman käynnistyessä"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Välityspalvelin-ohjelman käyttöarvot:"
+
+msgctxt "GeneralPage"
+msgid "Software Updates"
+msgstr "Ohjelmiston Päivitykset"
+
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
+msgstr "Tarkista automaattisesti onko uusia ohjelmiston päivityksiä"
+
+msgctxt "GeneralPage"
+msgid "Check Now"
+msgstr "Tarkista Nyt"
+
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr "%1 Kt/s"
+
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr "%1 Kt"
+
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr "%1 Mt"
+
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr "%1 Gt"
+
+msgctxt "GraphFrame"
+msgid "Recv:"
+msgstr "Vast.:"
+
+msgctxt "GraphFrame"
+msgid "Sent:"
+msgstr "Läht.:"
+
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr "Tarjottu XML-tiedosto ei ole kelvollinen Sisällön sivu"
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "Etsintä saavutti sivun lopun"
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "Etsintä saavutti sivun alun"
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "Tekstiä ei löytynyt asiakirjasta"
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "Vastauksia löytyi: %1"
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Vidalian ohje"
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Takaisin"
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Palaa edelliselle sivulle (Askelpalautin)"
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Askelpalautin"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Eteenpäin"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Siirry seuraavalle sivulle (Shift+Askelpalautin)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Askelpalautin"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Koti"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Siirry aloitussivulle (Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Etsi"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "Etsi sana tai ilmaisu nykyiseltä sivulta (Ctrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Sulje"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Sulje Vidalia ohje"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Etsittävä:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Etsi edellinen"
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Etsi seuraava"
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "huomioi kirjainkoko"
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Koko sana"
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Ohjeen aiheet"
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Sisältö"
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Etsi"
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Etsitään:"
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Löydetyt aiheet"
+
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
+msgstr "Virhe ohjesisältöjä ladatessa:"
+
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr "Avataan ulkoista linkkiä"
+
+msgctxt "HelpTextBrowser"
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgstr "Vidalia voi avata valitun linkin oletus Internetselaimessa. Jos selainta ei ole määritelty käyttämään Tor-verkkoa, niin sivulla oleminen ei ole anonyymistä."
+
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr "Haluatko Vidalian avaavan linkin Internetselaimessasi?"
+
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr "Linkin avaaminen epäonnistui"
+
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr "Vidalia ei onnistunut avaamaan valittua linkkiä Internetselaimessa. Linkin voi kuitenkin kopioida ja liittää selaimen osoiteriville."
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr "Virhe avaessa ohjetiedostoa:"
+
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr "Lisenssitiedot"
+
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "Lisenssi"
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr "Kiitokset"
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "Debug"
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Tiedote"
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Ilmoitus"
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Varoitus"
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Virhe"
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Tuntematon"
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "Käynnistä Tor"
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Lopeta"
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Kaistanleveyden käyttö"
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Tapahtumaloki"
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Verkkokartta"
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr "Ohjauspaneeli"
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Asetukset"
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr "Tietoa Vidaliasta"
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr "Ohje"
+
+msgctxt "MainWindow"
+msgid "New Identity"
+msgstr "Uusi henkilöllisyys"
+
+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 "Näytä"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Vidalian ohje"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "Virhe internetselainta käynnistettäessä"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia ei onnistunut käynnistämään määriteltyä internetselainta"
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "Virhe käynnistäessä keskusteluohjelmaa"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "Vidalia ei onnistunut käynnistämään määriteltyä keskusteluohjelmaa"
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Virhe käynnistettäessä välityspalvelinta"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia ei onnistunut käynnistämään määriteltyä välityspalvelinta"
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Yhdistetään reititinlistaan"
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "Muodostetaan suojattu hakemistoyhteys"
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "Selvitetään verkon tilaa"
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "Ladataan verkon tilaa"
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "Ladataan sertifikaattioikeuksia"
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "Selvitetään reititintietoja"
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "Ladataan reititintietoja"
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "Yhdistetään Tor-verkkoon"
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "Muodostetaan Tor-datavirta"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "identiteetti yhteensopimattomuus"
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr "valmis"
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "yhteys hylätty"
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "yhteyden aikakatkaisu"
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "luku-/kirjoitus- virhe"
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "ei reittiä palvelimelle"
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "puutteelliset resurssit"
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "tuntematon"
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor-ohjelma ei ole käynnissä"
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "Tor-ohjelmaa sammutetaan"
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Pysäytä Tor nyt"
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr "Pysäytä Tor"
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Käynnistetään Tor-ohjelmaa"
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "Käynnistetään Tor-ohjelmaa"
+
+msgctxt "MainWindow"
+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."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "Yhdistetään Tor-ohjelmaan"
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "Yhteysvirhe"
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "Reitittäminen on käytössä"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "Virhe lopetettaessa"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "Vidalia ei onnistunut pysäyttämään Tor-ohjelmaa."
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "Odottamaton virhe"
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Kirjaudutaan Tor-ohjelmaan"
+
+msgctxt "MainWindow"
+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ä."
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "Haluatko itse etsiä 'control_auth_cookie' - tiedostoa?"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Tietokansio"
+
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Ohjauseväste (control_auth_cookie)"
+
+msgctxt "MainWindow"
+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."
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Kirjautumisvirhe"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia ei onnistunut kirjautumaan Tor-ohjelmaan. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Ole hyvä ja tarkista ohjausportin kirjautumisasetukset."
+
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "Tor-ohjelmaan on saatavilla päivitys"
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr "Asennettu versio Tor-ohjelmasta on vanhentunut tai sitä ei suositella enään. Ole hyvä ja lataa uusin versio Tor-ohjelman kotisivulta."
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Tor-ohjelman kotisivu: %1"
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr ""
+"Vaikuttaisi että kaikki seuraavat yhteydet tulevat olemaan erilaiset kuin "
+"vanhat yhteydet."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "Uuden henkilöllisyyden luominen epäonnistui"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "Porttien läpivienti epäonnistui"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "Vidalia ei onnistunut määrittelemään automaattista porttien läpivientiä."
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Vidalian ohjauspaneeli"
+
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "Tila"
+
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Vidalian pikatoiminnot"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Reitittimen asetukset"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Laita pystyyn reititin ja auta verkkoa kasvamaan"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Näytä verkko"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Näytä Tor-verkkokartta"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Käytä uutta henkilöllisyyttä"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Tee tulevista yhteyksistä uusia"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Näytä hiljattainen kaistanleveyden käyttöaste"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Selaa tapahtumalokia"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Näytä Ohjeet"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Muuta Vidalian asetuksia"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Näytä versio- ja lisenssitiedot"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Lopeta Vidalia"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Näytä tämä ikkuna käynnistettäessä"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Piilota"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Piilota tämä ikkuna"
+
+msgctxt "MainWindow"
+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)"
+
+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."
+
+msgctxt "MainWindow"
+msgid "Would you like to check if a newer package is available for installation?"
+msgstr "Haluatko tarkistaa onko uudempaa pakettia saatavana asennettavaksi?"
+
+msgctxt "MainWindow"
+msgid "Potentially Unsafe Connection"
+msgstr "Mahdollisesti Epäluotettava Yhteys"
+
+msgctxt "MainWindow"
+msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
+msgstr ""
+"Jokin sovelluksistasi%1näyttä luoda mahdollisesti epäluotettavaa ja "
+"salatonta yhteyttä porttiin %2. Kaikki tieto lähetetty tämän yhteyden kautta "
+"tulisi valvoa. Ole hyvä ja varmista sovelluksesi kokoonpano ja käytä vain "
+"salattuja protokolleja kuten SSL jos mahdollista."
+
+msgctxt "MainWindow"
+msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgstr "Tor on automaattisesti sulkenut yhteden suojatakseen anonymiteettiäsi."
+
+msgctxt "MainWindow"
+msgid "Update Failed"
+msgstr "Päivitys Epäonnistui"
+
+msgctxt "MainWindow"
+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."
+
+msgctxt "MainWindow"
+msgid "Installation Failed"
+msgstr "Asennus Epäonnistui"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to install your software updates."
+msgstr "Vidalia ei onnistunut asentamaan ohjelmiston päivityksiä."
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr "Seuraava virhe ilmaantui:"
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "epäonnistui (%1)"
+
+msgctxt "MainWindow"
+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 "You are currently running a relay. Terminating your relay will 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 "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr ""
+"Vidalia havaitsi että Tor ohjelma päättyi odottamatta.\n"
+"\n"
+"Tarkista lokitiedostosta onko siellä varoitus tai virhe viestejä."
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", varmaankin Telnet-sovellus,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", varmaankin sähköpostisovellus,"
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr "Tiedosto"
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "Tietoja Vidaliasta"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Koti"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr "Etsi Päivityksiä"
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Virhe Suodatuksen Asettamisessa"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia ei onnistunut rekisteröimään Tor-ohjelman lokitapahtumia."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "Virhe lokitiedoston avaamisessa"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia ei onnistunut avaamaan kyseistä lokitiedostoa."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Lokille täytyy määrittää nimi"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "Lokille täytyy nimi määrittää, jotta voi kirjata lokin tiedostoon."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Valitse lokitiedosto"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Tallenna lokitapahtumat"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Tekstitiedostot (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Etsi Viesti lokitiedostosta"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Etsittävä:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Ei löytynyt"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "Löytyi 0 vastausta."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Tapahtumaloki"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Tapahtumien suodatus..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Suodata tapahtumia"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Historia lokitiedoston koko..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Aseta suurin näytettävä viestien määrä"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Tyhjennä"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Tyhjennä kaikki tapahtumat tapahtumalokista (Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Kopioi"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Kopioi valitut tapahtumat leikepöydälle (Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Valitse kaikki"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Valitse kaikki viestit (Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Tallenna kaikki"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Tallenna kaikki tapahtumat tiedostoon"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Tallenna valitut"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Tallenna valitut viestit tiedostoon"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Asetukset"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Muuta tapahtumalokin asetuksia"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Ohje"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Näytä ohje"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Sulje"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Sulje tapahtumaloki"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Etsi"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Näytä kaikki tapahtumat, jotka sisältävät hakuehdon (Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Aika"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Tyyppi"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Tapahtuma"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Tallentaa tapahtumalokin asetuksiin tehdyt muutokset"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Tallenna asetukset"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Kumoaa asetuksiin tehdyt muutokset"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Peruuta"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Viesti suodatin"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Virhe"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Varoitus"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Ilmoitus"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Tiedote"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Debug"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "Tapahtumalokin historia"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Tapahtumaloki ikkunassa näytettävien tapahtumien määrä"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "tapahtumat"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Tallenna aina uudet lokitapahtumat"
+
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "Selaa"
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr "Tallenna automaattisesti uudet tapahtumat tiedostoon"
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "Tallenna automaattisesti uudet tapahtumat tiedostoon"
+
+msgctxt "MessageLog"
+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"
+"something has gone wrong with Tor."
+msgstr "Viestit jotka näytetään vain virhetilanteissa."
+
+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 ""
+"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"
+"during normal Tor operation."
+msgstr "Säännöllisesti ilmestyvät virheviestit normaalin Tor ajon aikana."
+
+msgctxt "MessageLog"
+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"
+"\n"
+"%2."
+msgstr ""
+"Tiedoston %1 kirjoitus epäonnistui \n"
+"\n"
+"%2."
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor-verkkokartta"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Päivitä"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "Päivitä Tor-reititin ja -yhteyslista"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Ohje"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Näytä verkkokartan ohje"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Näytä verkkokartan ohje"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Sulje"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Sulje verkkokartta"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Lähennä"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Lähennä verkkokarttaa"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Loitonna"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Loitonna verkkokarttaa"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Sovita"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Sovittaa näyttämään kaikki näkyvillä olevat yhteydet"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "Välitintä ei löydy"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr "Tietoja valitusta välittimestä ei ole saatavilla."
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "Tuntematon"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr "Koko Näyttö"
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr "Näytä verkkokartta koko näyttönä"
+
+msgctxt "NetViewer"
+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."
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "Portteja pitää olla määriteltynä vähintään yksi tai useampi, mihin palomuuri antaa yhdistää."
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' ei ole kelvollinen porttinumero."
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr "Tarkista, jos paikallinen verkko vaatii välityspalvelimen Internetin pääsyyn"
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "Käytän välityspalvelinta käyttääkseen Internettiä"
+
+msgctxt "NetworkPage"
+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:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "Portti:"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr "Rastita yhdistääkseen vain reitittimiin käyttäen palomuurin sallimia portteja"
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "Palomuuri sallii yhteydet vain tiettyihin portteihin"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "Palomuuriasetukset"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "Sallitut portit:"
+
+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 ""
+"Rastita suojataksesi hakemistopyynnöt, ja valinnaisesti käytä "
+"siltareitittimiä yhdistääksesi Tor-verkkoon."
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "Verkko-operaattorini estää yhteydet Tor-verkkoon"
+
+msgctxt "NetworkPage"
+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"
+
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr "Kopioi valitut sillat leikepöydälle"
+
+msgctxt "NetworkPage"
+msgid "Find Bridges Now"
+msgstr "Etsi Siltoja Heti"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
+msgstr "<a href=\"bridges.finding\">Muita tapoja löytää siltoja</a>"
+
+msgctxt "NetworkPage"
+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."
+
+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 "Policy"
+msgid "accept"
+msgstr "salli"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "hylkää"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Online"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Valmiustilassa"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Offline"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Sijainti:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "IP-osoite:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Alusta:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Yhteys:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Päällä:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Viimeksi päivitetty:"
+
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Kopioi"
+
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
+msgstr "Valmiustilassa"
+
+msgctxt "RouterInfoDialog"
+msgid "Online"
+msgstr "Päällä"
+
+msgctxt "RouterInfoDialog"
+msgid "Offline"
+msgstr "Offline"
+
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr "Tuntematon"
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr "Välitystiedot"
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr "Yhteenveto"
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr "Nimi:"
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr "Tila"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "Sijainti:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "IP-osoite:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "Alusta:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "Kaistanleveys:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "Käytettävyysaika:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "Yhteystiedot:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "Viimeksi päivitetty:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr "Kuvaustaulukko"
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Offline"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Valmiustilassa"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 Kt/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Reititin"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "Kohdenna reitittimiin"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "Reitittimiä on-line tilassa: %1"
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Kopioi"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "Kutsumanimi"
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "Sormenjälki"
+
+msgctxt "ServerPage"
+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."
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "Ole hyvä ja päivitä Tor-ohjelmasi tai säädä Tor-ohjelmasi toimimaan normaalina Tor-reitittimenä."
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "Siltareititin ei ole päällä."
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "Reitittimen nimi ja portti pitää määrittää."
+
+msgctxt "ServerPage"
+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:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "Jaa reitinkansiota"
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "Yritä automaattisesti määritellä porttien läpiviennin"
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "Kokeile"
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "Näytä ohjeenaihe porttien läpiviennistä"
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Listaportti:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Listaportin numero"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Yhteystiedot:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "Reitittimesi nimi"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "Portti, jolla käyttäjät ja muut reitittimet kommunikoivat reitittimesi kanssa"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Lempinimi:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Perusasetukset"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Yhteydet, joilla on nopea latausnopeus mutta hidas lähetys, valitkaa listasta alhaalta lähetysnopeutenne."
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "Kaapeli/DSL 256 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "Kaapeli/DSL 512 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "Kaapeli/DSL 768 Kbps"
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "E1/Kaapeli/DSL 2.0 Mbps"
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 2.0 Mbps"
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "Muu"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Valitse vaihtoehto, joka parhaiten kuvaa internetyhteyttäsi"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Avaa ohje nopeuksienrajoittamisesta"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Keskimääräinennopeus"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Keskimääräinen pitkäaikasnopeus"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "Kt/s"
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Enimmäisnopeus"
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "Suurin sallittu nopeus"
+
+msgctxt "ServerPage"
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr "Enimmäisnopeus pitää olla suurempi tai sama kuin keskimääräinen nopeus. Molempien lukujen pitäisi olla vähintään 20 kt/s."
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Nopeusrajoitukset"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Portit 6660 - 6669 ja 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Portit 110, 143, 993 ja 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Sähköpostin vastaanotto (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Rukseilla määrittämättömät portit"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Sekalaiset muut palvelut"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Portit 706, 1863, 5050, 5190, 5222, 5223, 8300 ja 8888"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "Pikaviestintä (IM)"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "Portti 443"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "Suojatut sivustot (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Portti 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Verkkosivustot"
+
+msgctxt "ServerPage"
+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?"
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr "Tor torjuu joitakin lähteviä sähköposteja sekä tiedostonjako-ohjelmia vähentääkseen roskapostitusta ja muunlaista hyväksikäyttöä."
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Poistumiskäytännöt"
+
+msgctxt "ServerPage"
+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"
+
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr "Kopioi siltareitittimesi tiedot leikepöydälle"
+
+msgctxt "ServerPage"
+msgid "No Recent Usage"
+msgstr "Ei käyttöä viimeaikoina"
+
+msgctxt "ServerPage"
+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ä."
+
+msgctxt "ServerPage"
+msgid "Bridge History"
+msgstr "Siltahistoria"
+
+msgctxt "ServerPage"
+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."
+msgstr "Torrin Vidialle palauttama käyttöhistoriatieto oli kuralla."
+
+msgctxt "ServerPage"
+msgid "The returned response was: %1"
+msgstr "Vastaanotettu vaste oli: %1"
+
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network"
+msgstr "Auta sensuroituja käyttäjiä pääsemään Tor-verkkoon"
+
+msgctxt "ServerPage"
+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 "Mirror the Relay Directory"
+msgstr "Jaa reititin hakemisto"
+
+msgctxt "ServerPage"
+msgid "Email address at which you may be reached if there is a\n"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr ""
+"Sähköpostiosoite josta sinut voidaan tavoittaa jos reitittimesi kanssa on "
+"ongelmia.\n"
+"Voit myös lisätä PGP tai GPG tunnuksesi."
+
+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."
+msgstr "Ole hyvä ja määritä vähintään palvelun kansio ja virtuaaliportti jokaiselle halumallesi palvelulle, jonka haluat tallentaa. Muut voi poistaa."
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Virhe"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "Ole hyvä ja valitse palvelu."
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "Valitse palvelun kansio"
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "Virtuaaliportti voi sisältää vain kelvollisia porttinumeroita [1..65535]."
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "Kohde voi sisältää vain osoite:portti, osoite, tai portti."
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr "Hakemisto on jo jonkin toisen palvelun käytössä."
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "Lomake"
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr "Tarjotut piilopalvelut"
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "Onion-osoite"
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "Virtuaaliportti"
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "Kohde"
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "Kansion sijainti"
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "Käytössä"
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "Lisää uusi palvelu listalle"
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "Poista valittu palvelu listalta"
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr "Kopioi onion-osoite valitusta palvelusta leikepöydälle"
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr "Selaa paikallista tiedostojärjestelmää ja valitse kansio valitulle palvelulle"
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "Tor on luonut"
+
+msgctxt "Stream"
+msgid "New"
+msgstr "Uusi"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Selvitetään"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Yhdistetään"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "Avoinna"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Epäonnistui"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Suljettu"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Yritetään uudelleen"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "uudelleenohjattu"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Tuntematon"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "Prosessi %1 epäonnistui pysähtymästä. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "Tor-palvelua ei ole asennettu."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "Tor-palvelun käynnistäminen epäonnistui."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "Ohjaussalasanan varmistussummaus epäonnistui."
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "Onnistui"
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "UPnP-laitteita ei löytynyt"
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "Yhteensopivia UPnP:tä käyttäviä Internet-yhdyskäytävälaitteita ei löytynyt"
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "WSAStartup epäonnistui"
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "Portin lisäys epäonnistui"
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "Porttitietojen saaminen epäonnistui"
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "Portin poistaminen käytöstä epäonnistui"
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "Tuntematon virhe"
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "Etsitään UPnP-laitteita"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "Päivitetään listaporttitietoja"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "Päivitetään reititinporttitietoja"
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "Testi onnistui!"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "Testataan UPnP-tukea"
+
+msgctxt "UPNPTestDialog"
+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."
+
+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."
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for available updates..."
+msgstr "Tarkistetaan saatavilla olevia päivityksiä..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Hide"
+msgstr "Piilota"
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr "Ladataan päivityksiä..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr "Asennetaan päivitettyä ohjelmistoa..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr "Valmis! Ohjelmistosi on nyt ajan tasalla."
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr "Ohjelmistopäivitykset"
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr "Tarkistetaan päivityksien varalta..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr "Peruuta"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr "Tor-ohjelmaan on saatavilla päivitys"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr "Muistuta Minua Myöhemmin"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr "Asenna"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr "Seuraavat päivitetyt ohjelmistopaketit ovat valmiina asennettaviksi:"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr "Paketti"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr "versio"
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Peruuta"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Kyllä"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Ei"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Ohje"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Yritä uudelleen"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Näytä loki"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Näytä asetukset"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Jatka"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Lopeta"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Selaa"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Virheellinen komento"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia on jo päällä"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Näyttää tämän käyttöviestin ja sulkee."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "Palauttaa KAIKKI asetukset oletusarvoiksi."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Asettaa Vidalian käyttämän kansion tietokansioksi."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Asettaa Vidalian pid-tiedoston nimen ja sijainnin."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Asettaa Vidalian lokitiedoston nimen ja sijainnin."
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Asettaa Vidalian lokikirjaamisen tason."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Asettaa Vidalian käyttöliittymän tyylin."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Asettaa Vidalian kielen."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Vidalian käyttötiedot"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "Lokitiedoston'%1': %2 avaaminen epäonnistui"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr "Virheellinen kielikoodi määritettynä:"
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr "Virheellinen graafisen käyttöliittymän tyyli määritetty:"
+
+msgctxt "Vidalia"
+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"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+"Toinen Vidalia prosessi on mahdollisesti jo käynnissä. Jos näin on, voit "
+"jatkaa jokatapauksessa.\n"
+"\n"
+"Haluatko jatkaa ja käynnistää Vidalian?"
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr "%1 sekuntia"
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr "%1 t/s"
+
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr "%1 Kt/s"
+
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr "%1 Mt/s"
+
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
+msgstr "%1 Gt/s"
+
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr "%1 päivää"
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr "%1 tuntia"
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr "%1 minuuttia"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fr/qt_fr.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fr/qt_fr.po
new file mode 100644
index 0000000..827f09e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fr/qt_fr.po
@@ -0,0 +1,442 @@
+msgid ""
+msgstr ""
+"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: 2009-04-29 20:06+0000\n"
+"Last-Translator: Mfr <mfr at misericordia.be>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "Activer"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "L'exécutable '%1' requiert Qt %2 (Qt %3 présent)."
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "Erreur : bibliothèque Qt incompatible"
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "LTR"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "Active la fenêtre principale du programme"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "OK"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "Enregistrer"
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "Ouvrir"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "Annuler"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "Fermer"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "Appliquer"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "Réinitialiser"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "Aide"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "Ne pas enregistrer"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "Ne pas enregistrer"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "&Oui"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "Oui à &tout"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "&Non"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "Non à to&ut"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "Tout Enregistrer"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "Abandonner"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "Réessayer"
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "Ignorer"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "Restaurer les valeurs par défaut"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "Fermer sans sauvegarder"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "&OK"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "Nom"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "Taille"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "Type"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "Type"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "Dernière Modification"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "Tous les fichiers (*)"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "Dossiers"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "&Ouvrir"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "&Enregistrer"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "Ouvrir"
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"%1 existe déjà.\n"
+"Voulez-vous le remplacer ?"
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+"%1\n"
+"Fichier introuvable.\n"
+"Veuillez vérifier que le nom du fichier est correct."
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "Mon ordinateur"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "&Renommer"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "Suppri&mer"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "Afficher les fic&hiers cachés"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "Précédent (historique)"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "Dossier parent"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "Affichage liste"
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "Affichage détaillé"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "Fichiers de type :"
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "Dossier :"
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+"%1\n"
+"Dossier introuvable.\n"
+"Veuillez vérifier que le nom du dossier est correct."
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+"'%1' est protégé en écriture.\n"
+"Voulez-vous quand même le supprimer ?"
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "Êtes-vous sûr de vouloir supprimer '%1' ?"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "Impossible de supprimer le dossier."
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "Tous les fichiers (*.*)"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "Enregistrer sous"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "Unité"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "Fichier"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "Chercher dans le dossier"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "Montrer "
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "Successeur"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "Nouveau dossier"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "&Nouveau dossier"
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "&Choisir"
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "Supprimer"
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "&Nom de fichier :"
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "Voir dans:"
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "Créer un nouveau dossier"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "Invalid filename"
+msgstr "Nom de fichier invalide"
+
+#: 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>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"
+msgid "Name"
+msgstr "Nom"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "Taille"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "Type"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "Type"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "Dernière modification"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "Mon ordinateur"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "Ordinateur"
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr "%1 To"
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr "%1 Go"
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr "%1 Mo"
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr "%1 Ko"
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr "%1 octets"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fr/vidalia_fr.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fr/vidalia_fr.po
new file mode 100644
index 0000000..cc66ff8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fr/vidalia_fr.po
@@ -0,0 +1,3357 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2009-08-16 16:38+0000\n"
+"Last-Translator: Mfr <mfr at misericordia.be>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "À propos de Vidalia"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "Licence"
+
+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 "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' 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."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Sélectionner le fichier de configuration Tor"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Fichier non trouvé"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+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é"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+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"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Impossible d'enlever le service Tor"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "Impossible d'installer le service Tor"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "Vidalia n'a pas pu installer le service Tor."
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Port de contrôle"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "Authentification :"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Adresse :"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "Aucun"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Témoin (cookie)"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Mot de passe"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "défini aléatoirement"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+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)"
+
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "Choisissez le chemin de votre fichier de configuration"
+
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Parcourir"
+
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr "Dossier de 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"
+
+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"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+"Vidalia n'a pa pu supprimer le service de Tor.\n"
+"\n"
+"Vous pouvez avoir à le supprimer manuellement."
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Langue"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Choisir la langue utilisée par Vidalia"
+
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Style"
+
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Choisir le style de l'interface de 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 "BandwidthGraph"
+msgid "Since:"
+msgstr "Depuis :"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Masquer options"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Montrer options"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Bande passante utilisée par Tor"
+
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "Remettre à zéro"
+
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Taux de réception"
+
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Taux d'envoi"
+
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Toujours en avant-plan"
+
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Style"
+
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Changer le niveau de transparence du graphe de la bande passante"
+
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% d'opacité"
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Enregistrer"
+
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Annuler"
+
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr "Lancement de la demande de passerelle HTTPS..."
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr "Connexion à %1:%2..."
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr "Envoi d'une demande HTTPS pour les passerelles..."
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr "Téléchargement de la liste des passerelles..."
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr "Téléchargement des passerelles"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr "Impossible de télécharger les passerelles: %1"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr "Nouvelle demande de passerelle..."
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr "Pays"
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+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"
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr "Resumé de l'utilisation du pont"
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr "Résumé client"
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "Nouveau"
+
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Ouvert"
+
+msgctxt "Circuit"
+msgid "Building"
+msgstr "En construction"
+
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Échec"
+
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Fermé"
+
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Inconnu"
+
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Chemin vide>"
+
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Connexion"
+
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "État"
+
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Zoomer sur le circuit"
+
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "Fermer le circuit (suppr)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Arrêter le flux (Suppr)"
+
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "Général"
+
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Réseau"
+
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr "Partage"
+
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "Services"
+
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Interface"
+
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Avancé"
+
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Aide"
+
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Erreur lors de l'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."
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Erreur lors de l'application des paramètress"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia n'est pas parvenu à appliquer vos paramètres de %1 pour Tor."
+
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Paramètres"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Vidalia ne peut pas 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."
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
+msgstr "Se souvenir du mot de passe"
+
+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."
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+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]"
+
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+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]"
+
+msgctxt "CountryInfo"
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+msgctxt "CountryInfo"
+msgid "Andorra"
+msgstr "Andorre"
+
+msgctxt "CountryInfo"
+msgid "Angola"
+msgstr "Angola"
+
+msgctxt "CountryInfo"
+msgid "Antigua & Barbuda"
+msgstr "Antigua et Barbuda"
+
+msgctxt "CountryInfo"
+msgid "Argentina"
+msgstr "Argentine"
+
+msgctxt "CountryInfo"
+msgid "Armenia"
+msgstr "Arménie"
+
+msgctxt "CountryInfo"
+msgid "Australia"
+msgstr "Australie"
+
+msgctxt "CountryInfo"
+msgid "Azerbaijan"
+msgstr "Azerbaïdjan"
+
+msgctxt "CountryInfo"
+msgid "Bahamas"
+msgstr "Bahamas"
+
+msgctxt "CountryInfo"
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+msgctxt "CountryInfo"
+msgid "Barbados"
+msgstr "Barbades"
+
+msgctxt "CountryInfo"
+msgid "Belarus"
+msgstr "Biélorussie"
+
+msgctxt "CountryInfo"
+msgid "Belgium"
+msgstr "Belgique"
+
+msgctxt "CountryInfo"
+msgid "Belize"
+msgstr "Bélize"
+
+msgctxt "CountryInfo"
+msgid "Bhutan"
+msgstr "Boutan"
+
+msgctxt "CountryInfo"
+msgid "Bolivia"
+msgstr "Bolivie"
+
+msgctxt "CountryInfo"
+msgid "Bosnia & Herzegovina"
+msgstr "Bosnie-Herzégovine"
+
+msgctxt "CountryInfo"
+msgid "Botswana"
+msgstr "Botswana"
+
+msgctxt "CountryInfo"
+msgid "Brazil"
+msgstr "Brésil"
+
+msgctxt "CountryInfo"
+msgid "Brunei Darussalam"
+msgstr "Brunei"
+
+msgctxt "CountryInfo"
+msgid "Bulgaria"
+msgstr "Bulgarie"
+
+msgctxt "CountryInfo"
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+msgctxt "CountryInfo"
+msgid "Burundi"
+msgstr "Burundi"
+
+msgctxt "CountryInfo"
+msgid "Cambodia"
+msgstr "Cambodge"
+
+msgctxt "CountryInfo"
+msgid "Cameroon"
+msgstr "Cameroon"
+
+msgctxt "CountryInfo"
+msgid "Canada"
+msgstr "Canada"
+
+msgctxt "CountryInfo"
+msgid "Cape Verde"
+msgstr "Cap Vert"
+
+msgctxt "CountryInfo"
+msgid "Central African Republic"
+msgstr "Centre Afrique"
+
+msgctxt "CountryInfo"
+msgid "Chad"
+msgstr "Tchad"
+
+msgctxt "CountryInfo"
+msgid "Chile"
+msgstr "Chili"
+
+msgctxt "CountryInfo"
+msgid "China"
+msgstr "Chine"
+
+msgctxt "CountryInfo"
+msgid "Colombia"
+msgstr "Colombie"
+
+msgctxt "CountryInfo"
+msgid "Comoros"
+msgstr "Comores"
+
+msgctxt "CountryInfo"
+msgid "Congo, The Democratic Republic of the"
+msgstr "Congo, République démocratique du"
+
+msgctxt "CountryInfo"
+msgid "Congo"
+msgstr "Congo"
+
+msgctxt "CountryInfo"
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+msgctxt "CountryInfo"
+msgid "Cote d’Ivoire"
+msgstr "Côte d'Ivoire"
+
+msgctxt "CountryInfo"
+msgid "Croatia"
+msgstr "Croatie"
+
+msgctxt "CountryInfo"
+msgid "Cuba"
+msgstr "Cuba"
+
+msgctxt "CountryInfo"
+msgid "Cyprus"
+msgstr "Chypre"
+
+msgctxt "CountryInfo"
+msgid "Czech Republic"
+msgstr "République tchèque"
+
+msgctxt "CountryInfo"
+msgid "Denmark"
+msgstr "Danemark"
+
+msgctxt "CountryInfo"
+msgid "Djibouti"
+msgstr "Djibouti"
+
+msgctxt "CountryInfo"
+msgid "Dominica"
+msgstr "Dominique"
+
+msgctxt "CountryInfo"
+msgid "Dominican Republic"
+msgstr "République dominicaine"
+
+msgctxt "CountryInfo"
+msgid "Ecuador"
+msgstr "Equateur"
+
+msgctxt "CountryInfo"
+msgid "Egypt"
+msgstr "Egypte"
+
+msgctxt "CountryInfo"
+msgid "El Salvador"
+msgstr "Salvador"
+
+msgctxt "CountryInfo"
+msgid "Equatorial Guinea"
+msgstr "Guinée équatoriale"
+
+msgctxt "CountryInfo"
+msgid "Eritrea"
+msgstr "Erytrée"
+
+msgctxt "CountryInfo"
+msgid "Estonia"
+msgstr "Estonie"
+
+msgctxt "CountryInfo"
+msgid "France"
+msgstr "France"
+
+msgctxt "CountryInfo"
+msgid "Gabon"
+msgstr "Gabon"
+
+msgctxt "CountryInfo"
+msgid "Gambia"
+msgstr "Gambie"
+
+msgctxt "CountryInfo"
+msgid "Georgia"
+msgstr "Georgie"
+
+msgctxt "CountryInfo"
+msgid "Germany"
+msgstr "Allemagne"
+
+msgctxt "CountryInfo"
+msgid "Ghana"
+msgstr "Ghana"
+
+msgctxt "CountryInfo"
+msgid "Grenada"
+msgstr "Grenade"
+
+msgctxt "CountryInfo"
+msgid "Guatemala"
+msgstr "Guatemala"
+
+msgctxt "CountryInfo"
+msgid "Guinea"
+msgstr "Guinée"
+
+msgctxt "CountryInfo"
+msgid "Guinea-Bissau"
+msgstr "Guinée-Bissau"
+
+msgctxt "CountryInfo"
+msgid "Guyana"
+msgstr "Guyane"
+
+msgctxt "CountryInfo"
+msgid "Hong Kong"
+msgstr "Hong Kong"
+
+msgctxt "CountryInfo"
+msgid "Haiti"
+msgstr "Haïti"
+
+msgctxt "CountryInfo"
+msgid "Honduras"
+msgstr "Honduras"
+
+msgctxt "CountryInfo"
+msgid "Israel"
+msgstr "Israël"
+
+msgctxt "CountryInfo"
+msgid "Italy"
+msgstr "Italie"
+
+msgctxt "CountryInfo"
+msgid "Jamaica"
+msgstr "Jamaïque"
+
+msgctxt "CountryInfo"
+msgid "Japan"
+msgstr "Japon"
+
+msgctxt "CountryInfo"
+msgid "Jordan"
+msgstr "Jordanie"
+
+msgctxt "CountryInfo"
+msgid "Kazakhstan"
+msgstr "Kazakhstan"
+
+msgctxt "CountryInfo"
+msgid "Kenya"
+msgstr "Kenya"
+
+msgctxt "CountryInfo"
+msgid "Kiribati"
+msgstr "Kiribati"
+
+msgctxt "CountryInfo"
+msgid "Kuwait"
+msgstr "Koweït"
+
+msgctxt "CountryInfo"
+msgid "Kyrgyzstan"
+msgstr "Kirghizistan"
+
+msgctxt "CountryInfo"
+msgid "Laos"
+msgstr "Laos"
+
+msgctxt "CountryInfo"
+msgid "Latvia"
+msgstr "Lettonie"
+
+msgctxt "CountryInfo"
+msgid "Lebanon"
+msgstr "Liban"
+
+msgctxt "CountryInfo"
+msgid "Lesotho"
+msgstr "Lesotho"
+
+msgctxt "CountryInfo"
+msgid "Liberia"
+msgstr "Libéria"
+
+msgctxt "CountryInfo"
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+msgctxt "CountryInfo"
+msgid "Lithuania"
+msgstr "Lituanie"
+
+msgctxt "CountryInfo"
+msgid "Luxembourg"
+msgstr "Luxembourg"
+
+msgctxt "CountryInfo"
+msgid "Macedonia"
+msgstr "Macédoine"
+
+msgctxt "CountryInfo"
+msgid "Madagascar"
+msgstr "Madagascar"
+
+msgctxt "CountryInfo"
+msgid "Malawi"
+msgstr "Malawi"
+
+msgctxt "CountryInfo"
+msgid "Malaysia"
+msgstr "Malaisie"
+
+msgctxt "CountryInfo"
+msgid "Mali"
+msgstr "Mali"
+
+msgctxt "CountryInfo"
+msgid "Malta"
+msgstr "Malte"
+
+msgctxt "CountryInfo"
+msgid "Marshall Islands"
+msgstr "Iles Marshall"
+
+msgctxt "CountryInfo"
+msgid "Mauritania"
+msgstr "Mauritanie"
+
+msgctxt "CountryInfo"
+msgid "Mauritius"
+msgstr "Ile Maurice"
+
+msgctxt "CountryInfo"
+msgid "Micronesia"
+msgstr "Micronésie"
+
+msgctxt "CountryInfo"
+msgid "Moldova"
+msgstr "Moldavie"
+
+msgctxt "CountryInfo"
+msgid "Monaco"
+msgstr "Monaco"
+
+msgctxt "CountryInfo"
+msgid "Mongolia"
+msgstr "Mongolie"
+
+msgctxt "CountryInfo"
+msgid "Montenegro"
+msgstr "Monténégro"
+
+msgctxt "CountryInfo"
+msgid "Morocco"
+msgstr "Maroc"
+
+msgctxt "CountryInfo"
+msgid "Mozambique"
+msgstr "Mozambique"
+
+msgctxt "CountryInfo"
+msgid "Namibia"
+msgstr "Namibie"
+
+msgctxt "CountryInfo"
+msgid "Nauru"
+msgstr "Nauru"
+
+msgctxt "CountryInfo"
+msgid "Nepal"
+msgstr "Népal"
+
+msgctxt "CountryInfo"
+msgid "Netherlands"
+msgstr "Pays-Bas"
+
+msgctxt "CountryInfo"
+msgid "New Zealand"
+msgstr "Nouvelle Zélande"
+
+msgctxt "CountryInfo"
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+msgctxt "CountryInfo"
+msgid "Niger"
+msgstr "Niger"
+
+msgctxt "CountryInfo"
+msgid "Nigeria"
+msgstr "Nigéria"
+
+msgctxt "CountryInfo"
+msgid "Norway"
+msgstr "Norvège"
+
+msgctxt "CountryInfo"
+msgid "Oman"
+msgstr "Oman"
+
+msgctxt "CountryInfo"
+msgid "Pakistan"
+msgstr "Pakistan"
+
+msgctxt "CountryInfo"
+msgid "Palau"
+msgstr "Palaos"
+
+msgctxt "CountryInfo"
+msgid "Palestine"
+msgstr "Palestine"
+
+msgctxt "CountryInfo"
+msgid "Panama"
+msgstr "Panama"
+
+msgctxt "CountryInfo"
+msgid "Papua New Guinea"
+msgstr "Papouasie Nouvelle Guinée"
+
+msgctxt "CountryInfo"
+msgid "Paraguay"
+msgstr "Paraguay"
+
+msgctxt "CountryInfo"
+msgid "Peru"
+msgstr "Péru"
+
+msgctxt "CountryInfo"
+msgid "Philippines"
+msgstr "Philippines"
+
+msgctxt "CountryInfo"
+msgid "Poland"
+msgstr "Pologne"
+
+msgctxt "CountryInfo"
+msgid "Portugal"
+msgstr "Portugal"
+
+msgctxt "CountryInfo"
+msgid "Qatar"
+msgstr "Qatar"
+
+msgctxt "CountryInfo"
+msgid "Romania"
+msgstr "Roumanie"
+
+msgctxt "CountryInfo"
+msgid "Russia"
+msgstr "Russie"
+
+msgctxt "CountryInfo"
+msgid "Rwanda"
+msgstr "Rwanda"
+
+msgctxt "CountryInfo"
+msgid "Saint Kitts & Nevis"
+msgstr "Saint Christophe et Niévès"
+
+msgctxt "CountryInfo"
+msgid "Saint Lucia"
+msgstr "Sainte Lucie"
+
+msgctxt "CountryInfo"
+msgid "Saint Vincent & the Grenadines"
+msgstr "Saint Vincent et les Grenadines"
+
+msgctxt "CountryInfo"
+msgid "Samoa"
+msgstr "Samoa"
+
+msgctxt "CountryInfo"
+msgid "San Marino"
+msgstr "San Marin"
+
+msgctxt "CountryInfo"
+msgid "Sao Tome & Principe"
+msgstr "Sao Tome & Principe"
+
+msgctxt "CountryInfo"
+msgid "Saudi Arabia"
+msgstr "Arabie Saoudite"
+
+msgctxt "CountryInfo"
+msgid "Senegal"
+msgstr "Sénégal"
+
+msgctxt "CountryInfo"
+msgid "Serbia"
+msgstr "Serbie"
+
+msgctxt "CountryInfo"
+msgid "Seychelles"
+msgstr "Seychelles"
+
+msgctxt "CountryInfo"
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+msgctxt "CountryInfo"
+msgid "Singapore"
+msgstr "Singapour"
+
+msgctxt "CountryInfo"
+msgid "Slovakia"
+msgstr "Slovaquie"
+
+msgctxt "CountryInfo"
+msgid "Slovenia"
+msgstr "Slovénie"
+
+msgctxt "CountryInfo"
+msgid "Solomon Islands"
+msgstr "Iles Salomon"
+
+msgctxt "CountryInfo"
+msgid "Somalia"
+msgstr "Somalie"
+
+msgctxt "CountryInfo"
+msgid "South Africa"
+msgstr "Afrique du Sud"
+
+msgctxt "CountryInfo"
+msgid "Spain"
+msgstr "Espagne"
+
+msgctxt "CountryInfo"
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+msgctxt "CountryInfo"
+msgid "Sudan"
+msgstr "Soudan"
+
+msgctxt "CountryInfo"
+msgid "Suriname"
+msgstr "Surinam"
+
+msgctxt "CountryInfo"
+msgid "Swaziland"
+msgstr "Swaziland"
+
+msgctxt "CountryInfo"
+msgid "Sweden"
+msgstr "Suède"
+
+msgctxt "CountryInfo"
+msgid "Switzerland"
+msgstr "Suisse"
+
+msgctxt "CountryInfo"
+msgid "Syria"
+msgstr "Syrie"
+
+msgctxt "CountryInfo"
+msgid "Tajikistan"
+msgstr "Tadjikistan"
+
+msgctxt "CountryInfo"
+msgid "Tanzania"
+msgstr "Tanzanie"
+
+msgctxt "CountryInfo"
+msgid "Thailand"
+msgstr "Thailande"
+
+msgctxt "CountryInfo"
+msgid "Timor-Leste (East Timor)"
+msgstr "Timor Oriental"
+
+msgctxt "CountryInfo"
+msgid "Togo"
+msgstr "Togo"
+
+msgctxt "CountryInfo"
+msgid "Tonga"
+msgstr "Tonga"
+
+msgctxt "CountryInfo"
+msgid "Trinidad & Tobago"
+msgstr "Trinité & Tobago"
+
+msgctxt "CountryInfo"
+msgid "Tunisia"
+msgstr "Tunisie"
+
+msgctxt "CountryInfo"
+msgid "Turkey"
+msgstr "Turquie"
+
+msgctxt "CountryInfo"
+msgid "Turkmenistan"
+msgstr "Turkménistan"
+
+msgctxt "CountryInfo"
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+msgctxt "CountryInfo"
+msgid "Uganda"
+msgstr "Ouganda"
+
+msgctxt "CountryInfo"
+msgid "Ukraine"
+msgstr "Ukraine"
+
+msgctxt "CountryInfo"
+msgid "United Arab Emirates"
+msgstr "Emirats Arabes Unis"
+
+msgctxt "CountryInfo"
+msgid "United Kingdom"
+msgstr "Royaume Uni"
+
+msgctxt "CountryInfo"
+msgid "United States"
+msgstr "Etats Unis"
+
+msgctxt "CountryInfo"
+msgid "Uruguay"
+msgstr "Uruguay"
+
+msgctxt "CountryInfo"
+msgid "Uzbekistan"
+msgstr "Ouzbékistan"
+
+msgctxt "CountryInfo"
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+msgctxt "CountryInfo"
+msgid "Vatican"
+msgstr "Cité du Vatican"
+
+msgctxt "CountryInfo"
+msgid "Venezuela"
+msgstr "Vénézuela"
+
+msgctxt "CountryInfo"
+msgid "Vietnam"
+msgstr "Vietnam"
+
+msgctxt "CountryInfo"
+msgid "Western Sahara"
+msgstr "Sahara Occidental"
+
+msgctxt "CountryInfo"
+msgid "Yemen"
+msgstr "Yémen"
+
+msgctxt "CountryInfo"
+msgid "Zambia"
+msgstr "Zambie"
+
+msgctxt "CountryInfo"
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+msgctxt "CountryInfo"
+msgid "Albania"
+msgstr "Albanie"
+
+msgctxt "CountryInfo"
+msgid "Algeria"
+msgstr "Algérie"
+
+msgctxt "CountryInfo"
+msgid "Austria"
+msgstr "Autriche"
+
+msgctxt "CountryInfo"
+msgid "Bahrain"
+msgstr "Bahreïn"
+
+msgctxt "CountryInfo"
+msgid "Benin"
+msgstr "Bénin"
+
+msgctxt "CountryInfo"
+msgid "Ethiopia"
+msgstr "Ethiopie"
+
+msgctxt "CountryInfo"
+msgid "Fiji"
+msgstr "Fidji"
+
+msgctxt "CountryInfo"
+msgid "Finland"
+msgstr "Finlande"
+
+msgctxt "CountryInfo"
+msgid "Greece"
+msgstr "Grèce"
+
+msgctxt "CountryInfo"
+msgid "Guam"
+msgstr "Guam"
+
+msgctxt "CountryInfo"
+msgid "Hungary"
+msgstr "Hongrie"
+
+msgctxt "CountryInfo"
+msgid "Iceland"
+msgstr "Islande"
+
+msgctxt "CountryInfo"
+msgid "India"
+msgstr "Inde"
+
+msgctxt "CountryInfo"
+msgid "Indonesia"
+msgstr "Indonésie"
+
+msgctxt "CountryInfo"
+msgid "Iran"
+msgstr "Iran"
+
+msgctxt "CountryInfo"
+msgid "Iraq"
+msgstr "Irak"
+
+msgctxt "CountryInfo"
+msgid "Ireland"
+msgstr "Irelande"
+
+msgctxt "CountryInfo"
+msgid "Korea, North"
+msgstr "Corée du Nord"
+
+msgctxt "CountryInfo"
+msgid "Korea, South"
+msgstr "Corée du Sud"
+
+msgctxt "CountryInfo"
+msgid "Libya"
+msgstr "Libye"
+
+msgctxt "CountryInfo"
+msgid "Maldives"
+msgstr "Maldives"
+
+msgctxt "CountryInfo"
+msgid "Mexico"
+msgstr "Mexique"
+
+msgctxt "CountryInfo"
+msgid "Myanmar"
+msgstr "Birmanie"
+
+msgctxt "CountryInfo"
+msgid "Taiwan"
+msgstr "Taïwan"
+
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Exécutables (*.exe)"
+
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Choisir le chemin de Tor"
+
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "Selectionnez 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."
+
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr "Les paramètres du proxy ne sont pas correctement formatés."
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr "Lancer Vidalia au démarrage du système"
+
+msgctxt "GeneralPage"
+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)"
+
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "Démarrer une application proxy lorsque Tor démarre."
+
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Arguments de l'application proxy:"
+
+msgctxt "GeneralPage"
+msgid "Software Updates"
+msgstr "Mises à jour du logiciel"
+
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
+msgstr "Vérifier automatiquement les mise à jours logicielles"
+
+msgctxt "GeneralPage"
+msgid "Check Now"
+msgstr "Vérifier maintenant"
+
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr "%1 Ko/s"
+
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr "%1 Ko"
+
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr "%1 Mo"
+
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr "%1 Go"
+
+msgctxt "GraphFrame"
+msgid "Recv:"
+msgstr "Reçu:"
+
+msgctxt "GraphFrame"
+msgid "Sent:"
+msgstr "Envoyé:"
+
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr "Le fichier XML spécifié n'est pas un document valide."
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "La recherche a atteint la fin du document"
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "La recherche a atteint le début du document"
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "Texte non trouvé dans le document"
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "%1 résultats trouvés"
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Aide de Vidalia"
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Retour"
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Page précédente (Retour arrière)"
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Retour arrière"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Avancer"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Avancer d'une page (Maj+Retour arrière)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Maj+Retour arrière"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Page d'accueil"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Aller à la page d'accueil (Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Chercher"
+
+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)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Fermer"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Fermer l'aide de Vidalia"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Échap"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Chercher :"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Trouver le précédent"
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Trouver le suivant"
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "Respecter la casse"
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Mots entiers seulement"
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Rubriques d'aide"
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Table des matières"
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Chercher"
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Rechercher :"
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Documents trouvés"
+
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
+msgstr "Erreur lors du chargement de l'aide:"
+
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr "Ouvrir un lien externe"
+
+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 peut ouvrir le lien que vous avez sélectionné dans votre navigateur par défaut. Si votre navigateur n'est pas actuellement configuré pour Tor, votre requête ne sera pas anonyme."
+
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr "Voulez vous que Vidalia ouvre le lien dans votre navigateur ?"
+
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr "Impossible d'ouvrir le lien"
+
+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."
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr "Erreur lors de l'ouverture de l'aide:"
+
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr "Information sur la licence"
+
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "Licence"
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr "Crédits"
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "Débogage"
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Information"
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Signalement"
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Avertissement"
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Erreur"
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Inconnue"
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "Lancer Tor"
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Quitter"
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Graphe de la bande passante"
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Journal des messages"
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Carte du réseau"
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr "Panneau de contrôle"
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Paramètres"
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr "À propos"
+
+msgctxt "MainWindow"
+msgid "Help"
+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"
+
+msgctxt "MainWindow"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "MainWindow"
+msgid "View"
+msgstr "Aperçu"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Aide de Vidalia"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "Erreur lors du démarrage du navigateur Web"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+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"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "Vidalia n'a pas pu lancer le client de MI configuré"
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Erreur lors du démarrage du serveur mandataire (proxy)"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia n'est pas parvenu à démarrer le serveur mandataire (proxy) configuré"
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Connexion à un annuaire de relais"
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "Etablissement d'une connexion annuaire cryptée"
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "Recherche de l'état du réseau"
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "Chargement de l'état du réseau"
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "Chargement des certificats des authorités"
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "Demande d'informations sur le relais"
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "Chargement des informations sur le relais"
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "Connexion au réseau Tor"
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "Etablissement d'un circuit Tor"
+
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr "Connecté au réseau Tor !"
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Etat de lancement inconnu"
+
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr "divers"
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "identité incorrecte"
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr "fait"
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "connexion refusée"
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "temps de connexion expiré"
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "erreur de lecture/écriture"
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "pas de route vers l'hôte"
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "ressources insuffisantes"
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "inconnu"
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor est arrêté"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Lancement du logiciel Tor"
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "Lancement de Tor"
+
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Erreur lors du démarrage 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."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "Connexion à Tor"
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "Erreur de Connexion"
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "Le relais est activé"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "Erreur lors de l'arrêt"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "Vidalia n'a pu arrêter le logiciel Tor."
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "Erreur inattendue"
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Authentification à Tor"
+
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "Cookie d'authentification requis"
+
+msgctxt "MainWindow"
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgstr "Le logiciel Tor demande que Vidalia envoie le contenu d'un cookie d'authentification, mais Vidalia n'a pas pu le trouver."
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "Voulez-vous effectuer manuellement la recherche du fichier 'control_auth_cookie' ?"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Répertoire de Données"
+
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+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"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr "Vidalia n'a pas pu enregistrer certains évènements. Plusieurs fonctionnalités de Vidalia peuvent être indisponibles."
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Erreur d'authentification"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia n'a pu s'authentifier au logiciel Tor. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Veuillez vérifier les paramètress d'authentification de votre port de contrôle."
+
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "Une mise à jour de Tor est 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 version actuellement installée de Tor est obsolète et n'est plus recommandée. Merci de visiter le site Web de Tor pour télécharger la dernière version."
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Site Web de Tor : %1"
+
+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."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "La création d'une nouvelle identité a échoué"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "Erreur de Transfert 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."
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+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"
+
+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"
+
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+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."
+
+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 ?"
+
+msgctxt "MainWindow"
+msgid "Potentially Unsafe Connection"
+msgstr "Connexion potentiellement non sûre"
+
+msgctxt "MainWindow"
+msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
+msgstr ""
+"L'un de vos programmes%1semble faire une connexion potentiellement non "
+"encryptée et non sûre vers le port %2. Rien de ce qui est envoyé par cette "
+"connexion ne peut être contrôlé. Veuillez vérifier la configuration de votre "
+"application et utiliser uniquement des protocoles encryptés, tel SSL, si "
+"cela est possible."
+
+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."
+
+msgctxt "MainWindow"
+msgid "Update Failed"
+msgstr "Echec de la mise à jour"
+
+msgctxt "MainWindow"
+msgid "Your software is up to date"
+msgstr "Votre logiciel est à jour"
+
+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."
+
+msgctxt "MainWindow"
+msgid "Installation Failed"
+msgstr "Echec de l'installation"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+"Vidalia n'a pas été capable d'installer les mises à jour de votre logiciel."
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr "L'erreur suivante s'est produite:"
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "échec (%1)"
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+"Votre relais s'arrête.\n"
+"Cliquer 'Arrêter' à nouveau pour arrêter votre relais immédiatement."
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
+"Vous hébergez actuellement un relais. Terminer le relais va interrompre "
+"toutes les connexions des clients.\n"
+"\n"
+"Voulez vous l'arrêter doucement et laisser à vos clients le temps de trouver "
+"un nouveau relais."
+
+msgctxt "MainWindow"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr ""
+"Vidalia a détecté que Tor s'est arrêté brutalement.\n"
+"\n"
+"Veuillez contrôler dans l'historique les derniers messages d'erreur ou "
+"d'alerte."
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", probablement Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", probablement un client email,"
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr "Fichier"
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "À propos de Vidalia"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Page d'accueil"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr "Vérifier les mises à jour"
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Erreur lors de l'application d'un filtre"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+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"
+
+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é."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Le nom de fichier du Journal des messages est requis"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "Vous devez entrer un nom de fichier pour pouvoir enregistrer les messages dans un fichier."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Sélectionner le fichier du Journal"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Enregistrer le Journal des messages"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Fichiers texte (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Chercher dans le Journal des messages"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Chercher :"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Non trouvé"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "La recherche a trouvé 0 résultat."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Journal des messages"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Filtres des messages..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Définir les filtres des messages"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Taille de l'historique..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Définir le nombre maximal de messages à afficher"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Effacer"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Effacer tout l'historique du Journal des messages (Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Copier"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Copier les messages sélectionnés dans le presse-papier (Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Sélectionner tout"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Sélectionner tous les messages (Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Enregistrer tout"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Enregistrer tous les messages dans un fichier"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Enregistrer la sélection"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Enregistrer les messages sélectionnés dans un fichier"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Options"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Ajuster les options du Journal des messages"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Aide"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Parcourir l'aide"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Fermer"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Fermer le Journal des messages"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Échap"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Chercher"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Trouver les messages contenant ce texte (Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Heure"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Type"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Message"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Enregistrer les options actuelles du Journal des messages"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Enregistrer les options"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Annuler les modifications"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Annuler"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Filtrage des messages"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Erreur"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Avertissement"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Signalement"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Information"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Débogage"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "Historique du Journal"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Nombre de messages à afficher dans la fenêtre du Journal des messages"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "messages"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Toujours enregistrer les nouveaux messages du Journal"
+
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "Parcourir"
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+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 "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."
+
+msgctxt "MessageLog"
+msgid "Messages that only appear when \n"
+"something has gone wrong with Tor."
+msgstr ""
+"Messages qui apparaissent uniquement quand\n"
+"un problème s'est produit avec Tor."
+
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently \n"
+"during normal Tor operation and are \n"
+"not considered errors, but you may \n"
+"care about."
+msgstr ""
+"Messages qui apparaissent de manière peu fréquente\n"
+"durant le fonctionnement normal\n"
+"de Tor et ne sont pas considérés comme\n"
+"des erreurs, mais dont vous devez tenir\n"
+"compte."
+
+msgctxt "MessageLog"
+msgid "Messages that appear frequently \n"
+"during normal Tor operation."
+msgstr ""
+"Messages qui apparaissent fréquemment \n"
+"durant le fonctionnement de Tor"
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+"Nombreux Messages destiné à \n"
+"l'usage principal des développeurs \n"
+"de Tor."
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+"Impossible d'écrire le fichier %1\n"
+"\n"
+"%2."
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Carte du réseau Tor"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Rafraîchir"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "Rafraîchir la liste des relais Tor et des connexions"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Aide"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Montrer l'aide de la carte du réseau"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Aide de la carte du réseau"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Fermer"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Fermer la carte du réseau"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Échap"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Rapprocher"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Agrandir l'échelle de la carte du réseau"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Éloigner"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Réduire l'échelle de la carte du réseau"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Adapter le zoom"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Adapter le zoom à l'ensemble des circuits actuellement affichés"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "Relais non trouvé"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr "Aucun détail disponible sur le relais sélectionné."
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "Inconnu"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+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."
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "Passerelle invalide"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "L'identifiant de passerelle spécifié est invalide."
+
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr "Copier (Ctrl+C)"
+
+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."
+
+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."
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' n'est pas un numéro de port valide."
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr "Cochez si votre réseau local a besoin d'un proxy mandataire pour accéder à Internet"
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "J'utilise un serveur mandataire (proxy) pour accéder à Internet"
+
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr "Paramètres du serveur mandataire (proxy)"
+
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "Mandataire HTTP :"
+
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr "Nom d'utilisateur :"
+
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "Utiliser aussi ce mandataire pour HTTPS"
+
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr "Mot de passe :"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "Port :"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr "Cochez pour se connecter uniquement au relais en utilisant les ports autorisés par votre parefeu."
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "Mon parefeu me laisse me connecter seulement à certains ports"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "Paramètres du parefeu"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "Ports autorisés :"
+
+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 "Cochez pour crypter les demandes d'annuaire et, facultativement, utilisez les relais passerelles pour accéder au réseau Tor."
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "Mon fournisseur d'accès à Internet bloque les connexions au réseau Tor"
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr "Paramètres de Passerelle"
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr "Le logiciel Tor que vous utilisez actuellement ne supporte pas les passerelles. <br> Les connexions Annuaire seront cryptées."
+
+msgctxt "NetworkPage"
+msgid "Add a Bridge:"
+msgstr "Ajouter une passerelle :"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Comment puis-je trouver un relais passerelle ?</a>"
+
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr "Supprimer de la liste les passerelles sélectionnées"
+
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr "Copier les passerelles sélectionnées dans le presse-papier"
+
+msgctxt "NetworkPage"
+msgid "Find Bridges Now"
+msgstr "Rechercher maintenant des passerelles"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
+msgstr ""
+"<a href=\"bridges.finding\">Comment puis-je trouver autrement des passerelles "
+"?</a>"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
+msgstr "<a href=\"bridges.finding\">Comment puis-je trouver des passerelles ?</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 ""
+"Pas de nouvelle passerelle disponible. Vous pouvez soit attendre un peu et "
+"réessayer, ou encore essayer une autre méthode pour trouver de nouvelles "
+"passerelles."
+
+msgctxt "NetworkPage"
+msgid "Click Help to see other methods of finding new bridges."
+msgstr ""
+"Appuyez sur Aide pour voir d'autres moyens de trouver de nouvelles "
+"passerelles."
+
+msgctxt "Policy"
+msgid "accept"
+msgstr "accepter"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "rejeter"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "En ligne"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Hibernation"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Hors ligne"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Localisation :"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "Adresse IP :"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Plateforme :"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Bande passante :"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Durée de fonctionnement :"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Dernière mise à jour :"
+
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Copier"
+
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
+msgstr "En hibernation"
+
+msgctxt "RouterInfoDialog"
+msgid "Online"
+msgstr "En ligne"
+
+msgctxt "RouterInfoDialog"
+msgid "Offline"
+msgstr "Hors ligne"
+
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr "Inconnu"
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr "Détails du Relais"
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr "Résumé"
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr "Nom :"
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr "État :"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "Localisation :"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "Adresse IP :"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "Plateforme :"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "Bande passante :"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "Durée de fonctionnement :"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "Contact :"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "Dernière mise à jour :"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr "Identifiant"
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Hors ligne"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Hibernation"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 Ko/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Relais"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "Zoomer sur le relais"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 relais en ligne"
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Copier"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "Surnom"
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "Empreinte"
+
+msgctxt "ServerPage"
+msgid "Bridge Support Unavailable"
+msgstr "Le support pour la passerelle est indisponible"
+
+msgctxt "ServerPage"
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgstr "Vous avez configuré Tor en tant que relais passerelle pour les utilisateurs censurés, mais la version de Tor que vous utilisez ne supporte pas les passerelles."
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "Merci de mettre à jour Tor ou de configurer votre version actuelle pour agir en tant que relais Tor normal."
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "Votre relais passerelle n'est pas actif."
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "Vous devez spécifier au moins un nom de relais et un port."
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "Lancer uniquement comme client"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Relayer le trafic pour le réseau Tor"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "Port relais :"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+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"
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "Test"
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "Voir la rubrique d'aide sur le transfert de port"
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Port de l'annuaire :"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Numéro du port de l'annuaire"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Info. de contact :"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "Nom de votre relais"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "Port par lequel les utilisateurs et les autres relais peuvent communiquer avec votre relais"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Surnom :"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Options de base"
+
+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."
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "Câble/ADSL 256 kbit/s"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "Câble/ADSL 512 kbit/s"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "Câble/ADSL 768 kbit/s"
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/Câble/ADSL 1.5 Mbit/s"
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 1.5 Mbit/s"
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "Personnalisé"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Sélectionner dans la liste déroulante l'entrée qui se rapproche le plus de votre connexion Internet"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Afficher la rubrique d'aide sur les limitations de la bande passante"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Taux moyen"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Limite à long terme du taux moyen de la bande passante"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "Ko/s"
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Débit maximal"
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "Pic maximal de la bande passante"
+
+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."
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Limites de la bande passante"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Ports 6660 - 6669 et 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Chat (IRC)"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Ports 110, 143, 993 et 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Téléchargement des courriels (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Ports non spécifiés par d'autres choix prédéfinis"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Autres services"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 et 8888"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "Messagerie instantanée (IM)"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "Port 443"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "Sites Web sécurisés (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Port 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Sites Web"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "Afficher la rubrique d'aide des politiques de sortie"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr "Quelles sont les ressources d'Internet auquelles peuvent avoir accès les utilisateurs par votre relais ?"
+
+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."
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+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 :"
+
+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"
+
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr "Copier l'identité de votre passerelle dans le presse-papier"
+
+msgctxt "ServerPage"
+msgid "No Recent Usage"
+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."
+
+msgctxt "ServerPage"
+msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgstr ""
+"Laisser votre relais actif de façon à ce que les clients aient un chance de "
+"le trouver et de l'utiliser."
+
+msgctxt "ServerPage"
+msgid "Bridge History"
+msgstr "Historique de la Passerelle"
+
+msgctxt "ServerPage"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgstr "Vidalia n'a pas réussi à sauvegarder l'historique de la passerelle."
+
+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."
+
+msgctxt "ServerPage"
+msgid "The returned response was: %1"
+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"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr "<a href=\"#bridgeUsage\">Qui a utilisé ma passerelle ?</a>"
+
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory"
+msgstr "Héberger une copie du répertoire des relais"
+
+msgctxt "ServerPage"
+msgid "Email address at which you may be reached if there is a\n"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr ""
+"Adresse email à laquelle vous pouvez être joint s'il y a un \n"
+"problème avec votre relais. Vous pouvez aussi inclure votre empreinte PGP ou "
+"GPG."
+
+msgctxt "ServicePage"
+msgid "Error while trying to unpublish all services"
+msgstr "Erreur lors de la dépublication de tous les 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 "Merci de configurer au moins un répertoire et un port virtuel pour chacun des services que vous voulez sauver. Supprimez les autres."
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Erreur"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "Merci de choisir un Service."
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "Sélectionnez le répertoire de Service"
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "Les ports virtuels peuvent uniquement contenir des numéros de ports valides [1..65535]"
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "Destination doit uniquement contenir addresse:port, addresse, or port."
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr "Répertoire déjà utilisé par un autre service"
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "Formulaire"
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr "Services Cachés hébergés"
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "Adresse Onion"
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "Port Virtuel"
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "Destination"
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "Chemin du dossier"
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "Activé"
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "Ajouter un nouveau service à la liste"
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+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."
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr "Parcourez le système de fichiers et choisissez le dossier du service sélectionné"
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "Créé par Tor"
+
+msgctxt "Stream"
+msgid "New"
+msgstr "Nouveau"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Résolution"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Connexion"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "Ouvert"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Échec"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Fermé"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Réessai"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "'Remappé'"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Inconnu"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "Le processus %1 ne s'est pas arrêté. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+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é."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "Échec lors du hashage du mot de passe de contrôle."
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "Succès"
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "Aucun périphérique UPnP trouvé"
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "Aucun périphérique de passerelle Internet UPnP n'a été trouvé"
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "Echec du lancement de WSA"
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "Echec lors de l'ajout d'un transfert de port"
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "Echec lors de la recherche d'un transfert de port"
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "Echec lors de la suppression d'un transfert de port"
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "Erreur inconnue"
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "Recherche des périphériques UPnP"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "Mise à jour du transfert du port Annuaire"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "Mise à jour du transfert du port Relais"
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "Test terminé avec succès !"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "Test du support UPnP"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr "Teste le support du Plug & Play Universel"
+
+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'."
+
+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."
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for available updates..."
+msgstr "Recherche des mises à jour..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Hide"
+msgstr "Cacher"
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr "Téléchargement des mises à jour..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+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."
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr "Mise à jour logicielles"
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr "Recherche des mises à jour..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr "Annuler"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr "Des mises à jour logicielles sont disponibles"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr "Rappelez moi plus tard"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr "Installer"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr "Les mise à jour suivantes sont disponibles pour l'installation:"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr "Ensemble"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr "Version"
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Annuler"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Oui"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Non"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Aide"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Réessayer"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Voir l'historique"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Montrer options"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Continuer"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Quitter"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Parcourir"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Argument invalide"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia est déjà en fonctionnement"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Affiche ce message et quitte."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+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."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Définir le nom et le chemin du fichier d'identification du processus Vidalia (pidfile)."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Définir le nom et le chemin du fichier du Journal des messages de Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Indiquer le degré de verbosité du Journal des messages de Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Choisir le style de l'interface de Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Choisir la langue de Vidalia."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Information sur l'usage de Vidalia"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "Impossible d'ouvrir le fichier du Journal des messages '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr "Code langage demandé invalide:"
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr "Style d'interface demandé invalide:"
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr "Niveau d'historique demandé invalide:"
+
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+"Un autre processus Vidalia est peut être actif. S'il n'y a réellement aucun "
+"autre processus fonctionnant, vous pouvez choisir de continuer quand même. \n"
+"\n"
+"Voulez vous continuer à lancer Vidalia ?"
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr "%1 secs"
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr "%1 o/s"
+
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr "%1 Ko/s"
+
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr "%1 Mo/s"
+
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
+msgstr "%1 Go/s"
+
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr "%1 jours"
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr "%1 heures"
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr "%1 mins"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fur/qt_fur.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fur/qt_fur.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fur/qt_fur.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fur/vidalia_fur.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fur/vidalia_fur.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/fur/vidalia_fur.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/gl/qt_gl.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/gl/qt_gl.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/gl/qt_gl.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/gl/vidalia_gl.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/gl/vidalia_gl.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/gl/vidalia_gl.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/gu/qt_gu.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/gu/qt_gu.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/gu/qt_gu.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/gu/vidalia_gu.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/gu/vidalia_gu.po
new file mode 100755
index 0000000..dccbe1f
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/gu/vidalia_gu.po
@@ -0,0 +1,2681 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: 2009-12-10 03:28-0700\n"
+"Last-Translator: Jignesh Makwana <makwanajigneshm 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"
+"X-Generator: Pootle 1.1.0\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "ક્યૂટી"
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "ટૉર"
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr "અપ્રાપ્ય"
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr "બંધ"
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr "૦.૨.૦"
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr "0.2.0.31-આલ્ફા-ડેવ (આર123456)"
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr "૪.૪.૨"
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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' ઍ સચો આઇપી ક્રમાંક નથી"
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "તમે ગુપ્તાન્ક ચકાસણી પસંદ કરી છે, પરન્તુ ગુપ્તાંક આપ્યો નથી"
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/he/qt_he.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/he/qt_he.po
new file mode 100644
index 0000000..7b002ca
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/he/qt_he.po
@@ -0,0 +1,430 @@
+msgid ""
+msgstr ""
+"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: 2008-08-20 06:19+0000\n"
+"Last-Translator: Matt <edmanm at vidalia-project.net>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "RTL"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/he/vidalia_he.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/he/vidalia_he.po
new file mode 100644
index 0000000..94df975
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/he/vidalia_he.po
@@ -0,0 +1,3293 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "אודות Vidalia"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Vidalia 0.2.0"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "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 אינו כתובת IP חוקית."
+
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "בחרת באימות 'סיסמה', אך לא הגדרת סיסמה."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "בחר קובץ הגדרות ל-Tor"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "קובץ לא נמצא"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 לא קיים. האם ברצונך ליצור אותו?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "כשלון בעת יצירת קובץ"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "לא יכול ליצור %1 (%2)"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "בחר ספריה לאחסון המידע של Tor"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "לא יכול להסיר את שירות Tor"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "לא יכול להתקין את שירות Tor"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "Vidalia לא הצליח להתקין את שירות Tor."
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "פורט שליטה"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "אימות:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "כתובת:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "כלום"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "עוגיה"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "סיסמה"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "יצר אקראית"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+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 ""
+
+msgctxt "AdvancedPage"
+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"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+
+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 "BandwidthGraph"
+msgid "Since:"
+msgstr "מאז:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "הסתר הגדרות"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "הצג הגדרות"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "שימוש רוחב-פס של Tor"
+
+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 ""
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr ""
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "חדש"
+
+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 "סגור מעגל (Del)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "סגור זרם (Del)"
+
+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 "Vidalia לא הצליח לשמור את השינויים בהגדרות 1%."
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "תקלה בעת הפעלת שינויים"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia לא הצליח להפעיל את השינויים בהגדרות 1%."
+
+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 ""
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "סוקט שליטה לא מחובר."
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "שגיעה בעת שליחת פקודת שליטה. (%1)"
+
+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 "אודות Vidalia"
+
+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"
+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 "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 "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 "The proxy arguments specified are not properly formatted."
+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 "Tor"
+
+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 "%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 "Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "קדימה"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "עבור לדף הבא (Shift+Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "דף בית"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "עבור לדף הבית (Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "מצא"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "חפש מילה או ביטוי בדף הנוכחי (Ctrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "סגור"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "סגור את עזרת Vidalia"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "מצא:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "מצא הבא"
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "מצא קודם"
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "התחשב ב-Case"
+
+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 "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 "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"
+
+msgctxt "MainWindow"
+msgid "View"
+msgstr "תצוגה"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "עזרה אודות Vidalia"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "שגיעה בעת פתיחת דפדפן"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia נכשל בהפעלת הדפדפן המוגדר"
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor אינו רץ"
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "Tor בתהליך עצירה"
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting 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."
+msgstr "Vidalia לא הצליח להפעיל את Tor. אנא בדוק את ההגדרות וודא שהשם ומיקום קובץ הרצת Tor הינו נכון."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "מימסור מופעל"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "האם ברצונך לציין את המיקום של הקובץ 'control_auth_cookie' בעצמך?"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Control 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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "אנא בדוק את הגדרות אימות פורט השליטה שלך."
+
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "עידכון Tor זמין"
+
+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 על מנת להוריד את הגירסה האחרונה."
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "אתר Tor: %1"
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "כל החיבורים הבאים יראו שונים מהחיבורים הישנים."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "כשלון ביצירת זהות חדשה"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "לוח הבקרה של Vidalia"
+
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "מצב"
+
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "קיצורי-דרך של Tor"
+
+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 ""
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "הצג מידע גירסה ורישיון"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "צא מ-Vidalia"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "הצג חלון זה בעת אתחול"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "הסתר"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "הסתר חלון זה"
+
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgstr "גירסת Tor הנוכחית מיושנת ולא מומלצת יותר לשימוש. אנא בקר באתר 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 "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 "עידכון Tor זמין"
+
+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 "Vidalia לא הצליח להתקין את שירות Tor."
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+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 ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "אודות Vidalia"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "דף בית"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "שגעיה בעת קביעת סינון"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia לא הצליח להרשם ליומן האירועים של Tor."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "שגיעה באת פתיחת קובץ יומן"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia לא הצליח לפתוח את קובץ היומן הנבחר."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "דרוש שם קובץ יומן"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "עליך להכניס שם קובץ על מנת לשמור הודעות יומן לקובץ."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "בחר קובץ יומן"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "שמור הודעות יומן"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "קבצי טקסט (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "חפש ביומן הודעות"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "חפש:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "לא נמצא"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "החיפוש מצא אפס תוצאות."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "יומן הודעות"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "מסנני הודעות..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "קבע מסנני הודעות"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "גודל היסטוריה..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "קבע את מספר ההודעות המירבי להצגה"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "נקה"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "נקה את כל ההודעות מיומן ההודעות (Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "(Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "העתק"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "העתק את ההודעות הנבחרות ללוח-העריכה (Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "בחר הכל"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "בחר את כל ההודעות (Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "שמור הכל"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "שמור את כל ההודעות לקובץ"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "שמור הודעות נבחרות"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "שמור את ההודעות הנבחרות לקובץ"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "הגדרות"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "שנה הגדרות יומן הודעות"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "עזרה"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "הצג את דפדפן העזרה"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "סגור"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "סגור את יומן ההודעות"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "מצא"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "מצא את כל ההודעות המכילות את טקסט החיפוש (Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "זמן"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "סוג"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "הודעה"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "שומר את ההגדרות הנוכחיות של יומן ההודעות"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "שמור הגדרות"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "מבטל את השינויים שנעשו"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "ביטול"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "מסנן הודעות"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "שגיעה"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "אזהרה"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "שים-לב"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "מידע"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "דיבאג"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "היסטוריית יומן הודעות"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "מספר הודעות להצגה בחלון יומן ההודעות"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "הודעות"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log 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 "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."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "מפת רשת Tor"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "עדכן"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "עדכן את רשימת הנתבים והחיבורים של Tor"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "עזרה"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "הצג עזרה על מפת הרשת"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "הצג עזרה על מפת רשת"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "סגור"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "סגור מפת רשת"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "קרב"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "קרב את מפת הרשת"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "הרחק"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "הרחק את מפת הרשת"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "הצג הכל"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "קרב להצגת כל המעגלים המוצגים"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "קובץ לא נמצא"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "לא ידוע"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+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."
+msgstr "עליך לציין כתובת IP או שם ומספר פורט על מנת להגדיר את Tor לשימוש בשרת פרוקסי."
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "עליך לציין פורט אחד או יותר שחומת-האש שלך מאפשרת לך להתחבר אליהם."
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' אינו מספר פורט חוקי."
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "אני משתמש בשרת פרוקסי על מנת לגשת לאינטרנט"
+
+msgctxt "NetworkPage"
+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 "סיסמה:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "פורט:"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "חומת האש שלי מאפשרת לי להתחבר לפורטים מסוימים"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "הגדרות חומת אש"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "פורטים מורשים:"
+
+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 ""
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "ספק האינטרנט שלי חוסם חיבורים לרשת Tor"
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+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 "הסר את הגשרים הנבחרים מהרשימה"
+
+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 "Policy"
+msgid "accept"
+msgstr "קבל"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "דחה"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "מחובר"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "ישן"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "לא מחובר"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "מיקום:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "כתובת IP:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "מערכת:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "רוחב-פס:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "זמן:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "עודכן לאחרונה:"
+
+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:"
+msgstr "מצב"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "מיקום:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "כתובת IP:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "מערכת:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "רוחב-פס:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "זמן:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "מידע התקשרות:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "עודכן לאחרונה:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "לא מחובר"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "ישן"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "מימסר"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "קרב למימסר"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "העתק"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr ""
+
+msgctxt "ServerPage"
+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."
+msgstr "הגדרת את Tor לשמש בגשר למשתמשים מצונזרים, אבל גירסת Tor שלך לא תומכת בגשרים."
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "אנא עדכן את Tor או הגדרת את Tor לשמש כמימסר Tor רגיל."
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "הגשר שלך לא רץ."
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "עליך לציין לפחות כינוי ופורט מימסר."
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "העבר מידע עבור רשת Tor"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "פורט מימסר:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "פורט ספרייה:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "מספר פורט ספרייה"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "מידע התקשרות:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "השם של המימשר שלך"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "הפורט שבו משתמשים ומימסרים נוספים יוכלו לתקשר עם המימסר שלך"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "כינוי:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "הגדרות בסיסיות"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "לחיבורי אינטרנט עם קצב הורדה מהיר אבל קצב העלאה איטי, אנא הכנס את קצב ההעלאה שלך כאן."
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "כבלים/DSL 256 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "כבלים/DSL 512 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "כבלים/DSL 768 Kbps"
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/כבלים/DSL 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "יותר מ 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "נתון אישית"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "בחר את הנתון הדומה ביותר לחיבור האינטרנט שלך"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "הצג עזרה בנוגע להגבלת רוחב פס"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "קצב ממוצע"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "הגבלת רוחב-פס ממוצע לטווח ארוך"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "%1 KB/s"
+
+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 "רוחב הפס המירבי חייב להיות גדול או שווה לרוחב הפס הממוצע. על שני הערכים להיוצ לפחות 20 KB/s."
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "הגבלות רוחב פס"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "פורטים 6660-6669 ו 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "פורטים 110, 143, 993 ו 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "קבלת דוא\"ל (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "פורטים שלא נתונים על ידי תיבות בחירה אחרות"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "שירותים נוספים"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "פורטים 706, 1863, 5050, 5190, 5222, 8300 ו 8888 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "הודעות מיידיות"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "פורט 443"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "אתר מאובטח (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "פורט 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "אתרי רשת"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "הצג עזרה בנוגע למדיניות יציאה"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "מדיניות יציאה"
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr "אפשר לאחרים לגשת לגשר שלך על ידי העברת השורה הבאה:"
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "זוהי הזהות של הגשר שלך שניתן להעביר לאחרים"
+
+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 לא הצליח לשמור את השינויים בהגדרות 1%."
+
+msgctxt "ServerPage"
+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 ""
+
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network"
+msgstr "עזור למשתמשים מצונזרים לגשת לרשת Tor (גרסה 0.2.0.8-alpha ומעלה)"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr "<a href=\"bridges.finding\">כיצד אני מוצא גשר?</a>"
+
+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 ""
+
+msgctxt "ServicePage"
+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."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "שגיעה"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+msgctxt "Stream"
+msgid "New"
+msgstr "חדש"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "מתרגם"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "מתחבר"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "פתוח"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "נכשל"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "סגור"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "מנסה מחדש"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "ממופה מחדש"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "לא ידוע"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "תהליך %1 לא הצליח לעצור. (%2)"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "שירות Tor לא מותקן."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "התחלת שירות Tor נכשלה."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "ערבול סיסמת שליטה נכשל."
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+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 "עידכון Tor זמין"
+
+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 "Backspace"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "אישור"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "ביטול"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "כן"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "לא"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "עזרה"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "נסה שנית"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "הצג יומן"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "הצג הגדרות"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "המשך"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "יציאה"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "חפש"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "ארגומנט שגוי"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia כבר פעיל"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "מציג הודעת שימוש זו ויוצא."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "מאפס את כל ההגדרות השמורות של Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "קובע את הספריה ש-Vidalia משתמשת לשמירת קבצי מידע."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "קובע את השם ומיקום קובץ ה-PID של Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "קובע את השם והמיקום של קובת היומן של Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "קובע את הגיבוב של היומן."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "קובע את סגנון הממשק של Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "קובע את השפה של Vidalia."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "מידע שימוש ל-Vidalia"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "כשלון בפתחיחת קובץ יומן '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr "%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 ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hi/qt_hi.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hi/qt_hi.po
new file mode 100644
index 0000000..4763dd8
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hi/qt_hi.po
@@ -0,0 +1,431 @@
+msgid ""
+msgstr ""
+"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: 2009-04-12 14:16-0400\n"
+"Last-Translator: Matt Edman <edmanm at vidalia-project.net>\n"
+"Language-Team: Hindi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hi/vidalia_hi.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hi/vidalia_hi.po
new file mode 100644
index 0000000..2019d34
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hi/vidalia_hi.po
@@ -0,0 +1,2683 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: 2009-02-27 15:45+0000\n"
+"Last-Translator: Dharmesh Shah <deshah 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"
+"X-Generator: Pootle 1.1.0\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "विडालिया के बारे मे "
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr "विडालिया "
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "Qt"
+
+#: 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 "०.२.०.३१ - alpha-dev (r१२३४५६)"
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr "४.४.२"
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 "'% १' IP पता मन्य नहि है ।"
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+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 "टोर सॉफ्टवेयर को निर्दिष्ट संरूपण संचिका के द्वरा प्रारंभ करे (torrc)"
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "आपकि संरूपण संचिका के लिये पथ चुने "
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr "आंकडो के लिये निर्देशिका "
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr "टोर के सॉफ्टवेयर आंकडो को निम्नलिखित निर्देशिका मे सग्रह करे "
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr "टोर के सॉफ्टवेयर आंकडो को सग्रह करने वाली निर्देशिका को चुने "
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "भाषा"
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "वीडालीया मे प्रयुक्त होने वली भाषा को चुने "
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr "विडालिया चुनि गयी भाषा के अनुवाद को लोड करने मे असमर्थ रहा ।"
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "अनुकुलन दिखाओ"
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "टोर बैंडविड्थ का उपयोग "
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "पुनःस्थाप"
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "हमेशा उपर रहो "
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "शैलि"
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "१००"
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% ओपैक"
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "सईव / बचाना"
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "रद्द "
+
+#: circuit.cpp:112
+msgctxt "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 "बन्द सर्किट (Del)"
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "समन्य "
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "नेटवर्क"
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr "सहभाजन"
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "सेवाएँ"
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+#: aboutdialog.ui:107
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "लाइसेंस"
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "स्थिति"
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr "नया"
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr "खोले"
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr "विफ़ल"
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr "बन्द"
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "अज्ञात"
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "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
+#: bwgraph.ui:40
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "अनुकुलन दिखाओ"
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hr/qt_hr.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hr/qt_hr.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hr/qt_hr.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hr/vidalia_hr.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hr/vidalia_hr.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hr/vidalia_hr.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hu/qt_hu.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hu/qt_hu.po
new file mode 100644
index 0000000..26511f2
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hu/qt_hu.po
@@ -0,0 +1,436 @@
+msgid ""
+msgstr ""
+"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: 2008-11-12 19:51+0000\n"
+"Last-Translator: kabbe agoston <kabbe at pofa.be>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "Aktíválás"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "A '%1' állomány a Qt %2 -t igényli. Jelenleg Qt %3 van a gépen."
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "Qt könyvtár hiba"
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "QT_LAYOUT_DIRECTION"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "Aktíválja a progam fõ ablakát"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "OK"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "Mentés"
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "Megnyitás"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "Mégse"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "Bezár"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "Alkalmaz"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "Visszaállít"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "Súgó"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "Ne mentse"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "Elvetés"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "&Igen"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "Igen &Mindet"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "&Nem"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "Egyiket &Sem"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "Minden mentése"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "Elvetés"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "Újra"
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "Kihagyás"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "Alapértékek visszaállítása"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "Bezárás mentés nélkül"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "&OK"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "Név"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "Méret"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "Fajta"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "Típus"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "Módosítás ideje"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "Minden Fájl (*)"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "Könyvtárak"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "&Megnyitás"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "M&entés"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "Megnyitás"
+
+#: qfiledialog.cpp:1670
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr "%1 már létezik. Kívánja felülírni?"
+
+#: qfiledialog.cpp:1690
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr "%1 nem létezik. Ellenõrizze, hogy pontosan adta meg a nevet."
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "Sajátgép"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "&Átnevezés"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "&Törlés"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "&Rejtett fájlok mutatása"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "Vissza"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "Fel"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "Lista nézet"
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "Részletes nézet"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "Típus fájljai:"
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "Könyvtár:"
+
+#: qfiledialog.cpp:2476
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr "%1 könyvtár nem létezik. Ellenõrizze, hogy jól adta-e meg a nevet."
+
+#: qfiledialog.cpp:2281
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr "'%1' írásvédett. Mégis kívánja törölni?"
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "Biztos hogy kívánja törölni ezt: '%1' ?"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "A könyvtár törlése sikertelen."
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "Minden fájl (*.*)"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "Mentés másként"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "Meghajtó"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "Fájl"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "Könyvtár keresése"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "Mutasd"
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "Elõre"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "Új könyvtár"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "&Új könyvtár"
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "&Kiválaszt"
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "Töröl"
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "Fájl &név: "
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "Nézzen a: "
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "Új könyvtár létrehozása"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "Invalid filename"
+msgstr "Érvénytelen fájlnév"
+
+#: 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>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"
+msgid "Name"
+msgstr "Név"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "Méret"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "Fajta"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "Típus"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "Módosítás ideje"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "Sajátgép"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "Számítógép"
+
+#: 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 bájt"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hu/vidalia_hu.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hu/vidalia_hu.po
new file mode 100644
index 0000000..a2605de
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/hu/vidalia_hu.po
@@ -0,0 +1,3293 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "A Vidalia-ról"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "Licensz"
+
+msgctxt "AboutDialog"
+msgid "Vidalia 0.2.0"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "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' egy nem létezõ IP cím."
+
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "Kiválasztotta a Jelszavas bejelentkezést, de nem adott meg jelszót."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "TOR Konfigurációs Fájl kiválasztása"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "A fájl nem található"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 nem létezik. Kívánja létrehozni?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Fájl létrehozása sikertelen"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "Nem lehet létrehozni %1-t [%2]"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Válasszon egy könyvtárat a TOR adatok tárolásához"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Jelenleg a TOR szolgáltatás nem lekapcsolható"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "Jelenleg a TOR szolgáltatás nem elindítható"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "A TOR szolgáltatás telepítése sikertelen."
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Kontroll port"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "Ellenõrzés:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Cím:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "Nincs"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Süti"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Jelszó"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "Jelszó véletlenszerû létrehozása"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "TOR Konfigurációs Fájl"
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "TOR indítása a 'torrc' konfigurációs fájllal"
+
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "Adja meg a konfigurációs fájl helyét"
+
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Böngészés"
+
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr "Adat könyvtár"
+
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr "TOR adatok tárolása a következõ könyvtárban"
+
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr "Válassza ki a könytárat melyet a TOR adatok tárolására fog használni"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Nyelv"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Vidalia nyelve"
+
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Stílus"
+
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Vidalia külalakja"
+
+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 "BandwidthGraph"
+msgid "Since:"
+msgstr "Ekkortól:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Beállítások elrejtése"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Beállítások megjelenítése"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Sávszélesség statisztikák"
+
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "Visszaállítás"
+
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Fogadási arány"
+
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Küldési arány"
+
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Mindig látható"
+
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Stílus"
+
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "A Sávszélesség grafikon áttûnésének megváltoztatása"
+
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% Áttûnés"
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Mentés"
+
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Mégse"
+
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr ""
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "Új"
+
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Nyitott"
+
+msgctxt "Circuit"
+msgid "Building"
+msgstr "Felépítés alatt"
+
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Sikertelen"
+
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Lezárt"
+
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Üres ösvény>"
+
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Kapcsolat"
+
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "Állapot"
+
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Kapcsolatra közelítés"
+
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "Ösvény lekapcsolása (Del)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Adás megszakítása (Del)"
+
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "Általános"
+
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Hálózat"
+
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr "Megosztás"
+
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "Folyamatok"
+
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Megjelenés"
+
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Haladó"
+
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Súgó"
+
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Hiba adatmentés közben"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr "A %1 beállítás mentése sikertelen."
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Hiba lealkalmazás közben"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "A %1 TOR beállítás lealkalmazása sikertelen."
+
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Beállítások"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Nem sikerült a TOR-hoz kapcsolódni. (%1)"
+
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "A Vezérlõ socket nem kapcsolódott."
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "Jelszó szükséges"
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
+msgstr "Emlékezzen a jelszavamra"
+
+msgctxt "ControlPasswordInputDialog"
+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 "A Vezérlõ socket nem kapcsolódott."
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Hiba történt a kontroll parancs küldésekor. [%1]"
+
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr "A kapcsolat megszûnt egy adatsor beolvasása közben."
+
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Érvénytelen kontroll válasz. [%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 "A Vidalia-ról"
+
+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 "Névjegy"
+
+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 "Mégse"
+
+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 "Általános"
+
+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 "Licensz"
+
+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 "Elõre"
+
+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 "Port:"
+
+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 "Általános"
+
+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 "Megosztás"
+
+msgctxt "CountryInfo"
+msgid "Sri Lanka"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sudan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Suriname"
+msgstr "Becenév"
+
+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 "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 "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Futtatható állományok (*.exe)"
+
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "TOR elérési útjának megadása"
+
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+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."
+
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr "A Proxy kapcsolói nem megfelelõen vannak beállítva."
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr "Vidalia indítása a rendszerrel"
+
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr "Böngészés"
+
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "TOR indítása a Vidaliával"
+
+msgctxt "GeneralPage"
+msgid "Tor"
+msgstr "TOR"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr "Proxy Program (opcionális)"
+
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "Proxy program indítása a TOR-ral"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Proxy program parancssori kapcsolói:"
+
+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 "A megadott XML állomány nem egy érvényes Tartalomdokumentum."
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "A keresés elérte a dokumentum végét"
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "A keresés elérte a dokumentum elejét"
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "A keresett szöveg nem található"
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "%1 darab találat"
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Vidalia súgó"
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Vissza"
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Ugrás az elõzõ oldalra (Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Elõre"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Ugrás a következõ oldalra (Shift+Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Kezdõlap"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Ugrás a kezdõ oldalra (Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Keresés"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "Szóra vagy kifejezésre keresés az aktuális oldalon(Vtrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Bezárás"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Vidalia súgó bezárása"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Keresés:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Elõzõ keresése"
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Következõ keresése"
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "Kis- és nagybetûérzékeny"
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Csak teljes szavakra"
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Súgó témakörök"
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Tartalom"
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Keresés"
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Keresés erre:"
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Talált dokumentumok"
+
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr "Külsõ hivatkozás megnyitása"
+
+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 "A Vidalia meg tudja nyitni ezt a hivatkozást az alapértelmezett böngészõben. Ha a böngészõ nincs jelenleg a TOR beállításaihoz igazítva, a kapcsolat nem lesz titkos !"
+
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr "Kívánja, hogy a Vidalia megnyissa ezt a hivatkozást az alapértelmezett böngészõben?"
+
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr "A hivatkozást nem lehet megnyitni"
+
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr "A Vidalia nem tudta megnyitni a kiválasztott hivatkozást a böngészõben. Próbálja meg <b>Másol</b>ni a hivatkozást és <b>Beilleszt</b>eni a böngészõ URL sávjába."
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr "Licensz információk"
+
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "Licensz"
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr "Készítők"
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "Hibakeresés"
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Infó"
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Megjegyzés"
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Figyelmeztetés"
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Hiba"
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "TOR indítása"
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Kilépés"
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Sávszélesség grafikon"
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Log üzenetek"
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Hálózat térkép"
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr "Vezérlõpult"
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Beállítások"
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr "Névjegy"
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr "Súgó"
+
+msgctxt "MainWindow"
+msgid "New Identity"
+msgstr "Új identitás"
+
+msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "CTRL+I"
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "CTRL+P"
+
+msgctxt "MainWindow"
+msgid "Tor"
+msgstr "TOR"
+
+msgctxt "MainWindow"
+msgid "View"
+msgstr "Nézet"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Vidalia súgó"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "Hiba a böngészõ indításakor"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "A beállított böngészõ indítása sikertelen"
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "Hiba az IM (azonnali üzenetküldõ) program indításakor"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "A beállított IM program indítása sikertelen"
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Hiba a proxy kiszolgáló indításakor"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "A beállított proxy kiszolgáló indítása sikertelen"
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Csatlakozás egy Elosztó címtárhoz"
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "Titkosított címtárkapcsolat létrehozása"
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "Hálózat státuszának lekérdezése"
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "Hálózat státuszának betöltése"
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "Biztonsági ellenõrzõk betöltése"
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "Elosztási adatok lekérdezése"
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "Elosztási adatok betöltése"
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "Kapcsolódás a TOR hálózathoz"
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "TOR kapcsolat felépítése"
+
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr "TOR kapcsolódva !"
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Felismerhetetlen indítási státusz"
+
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr "egyebek"
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "identitás eltérés"
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr "kész"
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "kapcsolódás visszautasítva"
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "a kapcsolódási idõ letelt"
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "írás/olvasás hiba"
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "nincs út a kiszolgálóhoz"
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "elfogytak az erõforrások"
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "ismeretlen"
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "TOR lekapcsolva"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "TOR indítása"
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "TOR indítása"
+
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Hiba a TOR indításával"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgstr "A Vidalia nem tudta elindítani a TOR-t. Ellenõrizze a beállításait, hogy jól van-e megadva a TOR indítófájl neve és elérési útja."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "TOR kapcsolódása"
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "Kapcsolódási hiba"
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "Elosztás bekapcsolva"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "Hiba a lekapcsoláskor"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "A TOR leállítása sikertelen."
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "Váratlan hiba"
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "TOR beléptetése"
+
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "Süti ellenõrzés szükséges"
+
+msgctxt "MainWindow"
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgstr "A TOR egy bejelentkezõ süti elküldését kéri, de nem található."
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "Kívánja kiválasztani kézzel a következõ állományt: 'control_auth_cookie' ?"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Adat könyvtár"
+
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Kontroll süti (control_auth_cookie)"
+
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "Hiba az Események bejegyzésekor"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr "Nem sikerült a Vidaliát kifogástalanul elindítani, ezért bizonyos funkciói várhatóan nem fognak rendeltetésszerûen mûködni."
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Ellenõrzési hiba"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "TOR ellenõrzött beléptetése sikertelen. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Ellenõrizze a kontroll port bejelentkezési beállításait !"
+
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "A legújabb TOR verzió elérhetõ"
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr "A TOR jelenleg telepített verziója lejárt, vagy nem ajánlatos továbbá használni. Látogasson el a TOR weboldalára a legfrissebb verzióért !"
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "TOR weboldal: %1"
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "Ösvények újrakiépítve.Minden további kapcsolat a régi kapcsolataitól különbözõként fog szerepelni."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "Új identitás létrehozása sikertelen"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "Port továbbítás sikertelen"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "Automata Port továbbítás beállítása sikertelen."
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Vidalia vezérlõpult"
+
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "Állapot"
+
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Vidalia Parancsikonok"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Elosztás beállítása"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Elosztás beállítása és a TOR hálózat sebességének növelése"
+
+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 "Létezõ 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ációja"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Verzió és licensz információk megtekintése"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Kilépés a Vidaliából"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Megjelenítés indításkor"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Elrejtés"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Ablak elrejtése"
+
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr "A jelszó-visszaállítás nem sikerült"
+
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, 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, hogy nem fut-e más TOR példány a Feladatkezelőben !"
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgstr "A TOR jelenleg telepített verziója lejárt, vagy nem ajánlatos továbbá használni. Látogasson el a TOR weboldalára a legfrissebb verzióért !"
+
+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 "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 "A legújabb TOR verzió elérhetõ"
+
+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 "A TOR leállítása sikertelen."
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+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 ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "A Vidalia-ról"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Kezdõlap"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Hiba a szûrõ beállításakor"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "A Vidalia nem tudta regisztrálni a TOR log eseményeit."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "Hiba a log fájl megnyitásakor"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "A Vidalia nem tudta megnyitni a megadott log állományt."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Log állománynév szükséges"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "Meg kell adnia egy állománynevet a naplózás elmentéséhez."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Log fájl kiválasztása"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Log üzenetek mentése"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Szöveges állományok (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Keresés a log üzenetekben:"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Keresés:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Nem található"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "A keresés 0 találati eredményt adott."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Log üzenetek (Napló)"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Üzenet szûrési feltételek..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Üzenet szûrési feltételek beálllítása"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Elõzmények mérete..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "A megjelenítendõ üzenetek maximális számának megadása"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Törlés"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Az összes üzenet törlése a logból (Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Másolás"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "A kiválasztott üzenetek vágólapra másolása (Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Minden kiválasztása"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Minden üzenet kiválasztása (Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Minden mentése"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Minden üzenet fájlba mentése"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "A kiválasztott mentése"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "A kiválasztott üzenetek fájlba mentése"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Beállítások"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Log üzenetek beállításainak módosítása"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Súgó"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Súgó böngészõ megjelenítése"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Bezárás"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Log üzenetek bezárása"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Keresés"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Minden, az adott szöveget tartalmazó üzenet megkeresése (Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Idõ"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Típus"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Üzenet"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "A log üzenetek jelenlegi beállításainak mentése"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Beállítások mentése"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Beállítások módosításainak visszavonása"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Mégse"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Üzenet szûrési feltétel"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Hiba"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Figyelmeztetés"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Megjegyzés"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Infó"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Hibakeresés"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "Üzenet napló"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Naplóban egyidejûleg megjeleníthetõ log üzenetek száma"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "üzenetek"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Mindig mentse az új üzeneteket"
+
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "Böngészés"
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr "Új üzenetek automatikus mentésének bekapcsolása"
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "Mindig mentse automatikusan az új üzeneteket"
+
+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."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "TOR hálózati térkép"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Frissítés"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "TOR Elosztások és kapcsolatok listájának frissítése"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "CTRL+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Súgó"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "A hálózati térkép súgójának megtekintése"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "A hálózati térkép súgójának megtekintése"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Bezár"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "A hálózati térkép bezárása"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Nagyítás"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Nagyítás a hálózati térképen"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Kicsinyítés"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Kicsinyítés a hálózati térképen"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Optimális közelítés"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Közelítés a megjelenített ösvényekre"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "A fájl nem található"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+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)"
+
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr "Meg kell adni mind vagy egy IP címet, vagy egy állomásnevet (host) és egy portot , ahhoz, hogy a TOR ezen a proxy-n keresztül kapcsolódjon az Internethez."
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "Meg kell adni egy vagy több olyan portot, amelyek engedélyezve (nyitva) vannak a tûzfalban."
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "A következõ port érvénytelen: '%1'"
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr "Tegye be a pipát, ha a helyi hálózata proxy-t igényel az Internethez való kapcsolódáshoz"
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "Proxy-t használok az Internetre való kapcsolódáshoz"
+
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr "Proxy beállítások"
+
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "HTTP Proxy:"
+
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr "Felhasználónév:"
+
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "Ezen proxy használata a https:// kapcsolatokhoz is"
+
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr "Jelszó:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "Port:"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr "Kizárólag olyan Elosztókhoz való kapcsolódás, amelyek a tûzfalam nyitott portjaira vannak konfigurálva"
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "A tûzfalam csak néhány porton engedélyez kapcsolódást"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "Tûzfal beállítások"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "Engedélyezett portok:"
+
+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 "Címtár lekérdezések titkosítása és opcionálisan, Hídkapcsolatok használata a TOR-hoz való kapcsolódáshoz"
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "A szolgáltatóm blokkolja a TOR-t"
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr "Hídkapcsolatok beállításai"
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr "A TOR jelenleg futó verziója nem támogatja a Hídkapcsolatokat.<br>A címtárlista le- és feltöltése azonban titkosított lesz."
+
+msgctxt "NetworkPage"
+msgid "Add a Bridge:"
+msgstr "Hídkapcsolat hozzáadása:"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Hogyan találhatok Hídkapcsolatokat?</a>"
+
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr "Hídkapcsolat eltávolítása a listából"
+
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr "A kiválasztott Hídkapcsolat vágólapra másolása"
+
+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 "Policy"
+msgid "accept"
+msgstr "elfogad"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "visszautasít"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Csatlakozva"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Hibernált"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Kapcsolat nélkül"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Hely:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "IP cím:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Platform:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Sávszélesség:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Aktivitási idõ:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Utolsó frissítés ideje:"
+
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Másolás"
+
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
+msgstr "Hibernált"
+
+msgctxt "RouterInfoDialog"
+msgid "Online"
+msgstr "Csatlakozva"
+
+msgctxt "RouterInfoDialog"
+msgid "Offline"
+msgstr "Kapcsolat nélkül"
+
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr "Becenév:"
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr "Állapot"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "Hely:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "IP cím:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "Platform:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "Sávszélesség:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "Aktivitási idõ:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "Kapcsolat infó:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "Utolsó frissítés ideje:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Kapcsolat nélkül"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Hibernált"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Elosztás"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "Elosztókra szûkítés"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 Elosztó kapcsolódva"
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Másolás"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "Becenév"
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "Digitális Ujjlenyomat"
+
+msgctxt "ServerPage"
+msgid "Bridge Support Unavailable"
+msgstr "A Hídkapcsolat támogatás nem elérhetõ"
+
+msgctxt "ServerPage"
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgstr "Ön beállította a TOR-t Hídkapcsolati Elosztóként,blokkolt felhasználók TOR-hoz kapcsolódásának segítéséhez, viszont ez a TOR verzió nem támogatja a Hídkapcsolati Elosztást."
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "Frissítse a TOR-t vagy állítsa be hagyományos forgalom-Elosztóként (közvetítõként)."
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "A Hídkapcsolati Elosztása nem fut."
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "Minimum egy Elosztónevet és a portot meg kell adnia."
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "Csak kliens indítása"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "A TOR hálózat forgalmának közvetítése (Elosztás)"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "Közvetítõ port:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "Az Elosztócímtár tükrözésének bekapcsolása"
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "Port továbbítás automatikus konfigurálásának indítása"
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "Teszt"
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "Port továbbítással kapcsolatos súgó témakörök megtekintése"
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Címtár port:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Címtár portja"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Kapcsolat infó:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "Az Elosztó neve"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "A port, amelyen más felhasználók és Elosztók kommunikálnak az Ön közvetítésével"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Becenév:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Alap beállítások"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Gyors letöltés, de lassú feltöltés esetén adja meg a feltöltési sebességét itt."
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "Kábel/DSL 256 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "Kábel/DSL 512 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "Kábel/DSL 768 Kbps"
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/Kábel/DSL 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "több mint 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "Egyéni"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Válassza ki az Internet-sebességéhez legközelebb álló értéket"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Sávszélesség-korlátozással kapcsolatos súgó témák megjelenítése"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Átlagos sávszélesség"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Hosszútávú átlagos sávszélesség korlátozás"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Maximum sebesség"
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "Sávszélesség-korlátozás maximuma"
+
+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 Internetsebességnek nagyobbnak kell lennie, mint az átlagosnak, de mindkét érték minimum 20 KB/s lehet."
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Sávszélesség-korlátozások"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Portok: 6660 - 6669 és 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "IRC chat"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Portok: 110, 143, 993 és 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Levél fogadása (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Portok melyek egyébként nincsenek máshol bejelölve"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Egyéb Szolgáltatások"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Portok: 706, 1863, 5050, 5190, 5222, 5223, 8300 és 8888"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "IM (azonnali üzenetküldõk)"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "443-as port"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "Biztonságos (https) weblapok"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "80-as port"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Weboldalak"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "Kilépési szabályokkal kapcsolatos súgó témák megjelenítése"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr "Mely típusú Internet-kapcsolatokat engedélyezi a felhasználóknak?"
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr "A TOR továbbra is blokkolni fog némely levelező és fájlmegosztó szolgáltatásokat, a visszaélések megfékezése érdekében."
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Kilépési szabályok"
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr "Ezen sort adja meg másoknak, akiket szeretne hozzásegíteni a Hídkapcsolatával a TOR hálózathoz:"
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "Ez az Ön Hídkapcsolati azonosítója, amelyet megadhat másoknak"
+
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr "A Hídkapcsolati azonosító vágólapra másolása"
+
+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 "Hídkapcsolatok beállításai"
+
+msgctxt "ServerPage"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgstr "A %1 beállítás mentése sikertelen."
+
+msgctxt "ServerPage"
+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 ""
+
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network"
+msgstr "Blokkolt felhasználók segítése a TOR hálózathoz való kapcsolódához (TOR 0.2.0.8-alfa vagy újabb)"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Hogyan találhatok Hídkapcsolatokat?</a>"
+
+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 ""
+
+msgctxt "ServicePage"
+msgid "Error while trying to unpublish all services"
+msgstr "Hiba minden futó szolgáltatás lekapcsolásakor"
+
+msgctxt "ServicePage"
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
+msgstr "Adjon meg minimum egy szolgáltatás könyvtárat és egy portot minden elmentendõ szolgáltatáshoz, a többit pedig törölje."
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Hiba"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "Válasszon egy szolgáltatást."
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "Szolgáltatás könyvtár kiválasztása"
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "A Virtuális port csak érvényes (1..65535) számokat tartalmazhat"
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "A cél megadási szintaktikája csak a következõ lehet:<br>IP cím:port vagy csak IP cím, vagy csak port."
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr "A könyvár már használatban van egy másik szolgáltatás által."
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "Forma"
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr "Megadott Rejtett Szolgáltatások"
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "Onion cím"
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "Virtuális Port"
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "Cél"
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "Címtár Útvonal"
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "Státusz"
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "Új szolgáltatás felvétele a listába"
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "Kiválasztott szolgáltatás eltávolítása a listából"
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr "A kiválasztott szolgáltatás .onion címének vágólapra másolása"
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr "A kiválasztott szolgáltatás helyének kitallózása a Sajátgépben"
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "TOR által generálva"
+
+msgctxt "Stream"
+msgid "New"
+msgstr "Új"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Feloldás"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Kapcsolódás"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "Nyitott"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Nem sikerült"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Lezárt"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Újabb próbálkozás"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "Újratérképezve"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "%1 folyamat leállítása sikertelen. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "A TOR szolgáltatás nincs telepítve."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "TOR szolgáltatás indítása sikertelen."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "Kontroll jelszó ellenõrzõ-végösszegének létrehozása sikertelen."
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "Siker"
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "Nem található UPnP eszköz"
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "Nem található UPnP támogatású Internet Átjáró eszköz"
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "WSA elindítása sikertelen"
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "Port térképezés hozzáadása sikertelen"
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "Port térképezés fogadása sikertelen"
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "Port térképezés eltávolítása sikertelen"
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "Ismeretlen hiba"
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "Bekapcsolt UPnP eszközök felderítése"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "Címtár térképezés frissítése"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "Elosztó térképezés frissítése"
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "A teszt sikerült !"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "UPnP támogatás tesztelése"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr "Universal Plug & Play támogatás tesztelése"
+
+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 "Elrejtés"
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr "TOR indítása"
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr "Mégse"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr "A legújabb TOR verzió elérhetõ"
+
+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 "Backspace"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr "verzió"
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Mégse"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Igen"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Nem"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Súgó"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Újra"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Log megtekintése"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Beállítások megtekintése"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Folytatás"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Kilépés"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Böngészés"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Érvénytelen kapcsoló"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "A Vidalia már fut"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Megjeleníti ezt az üzenetet és kilép."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "Visszaállít minden tárolt Vidalia beállítást."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Beállítja a könyvtárat melyben a Vidalia adatokat tárol."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Beállítja a nevét és a helyét a Vidalia pid-állományának."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Beállítja a nevét és a helyét a Vidalia logjának (naplójának)."
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Beállítja a Vidalia naplózásának összetettségét."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Beállítja a Vidalia kinézetét."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Beállítja a Vidalia nyelvét."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Vidalia használati útmutató"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "A '%1' napló megnyitása sikertelen: %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr "%1 másodperc"
+
+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 ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/id/qt_id.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/id/qt_id.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/id/qt_id.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/id/vidalia_id.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/id/vidalia_id.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/id/vidalia_id.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/is/qt_is.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/is/qt_is.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/is/qt_is.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/is/vidalia_is.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/is/vidalia_is.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/is/vidalia_is.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/it/qt_it.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/it/qt_it.po
new file mode 100644
index 0000000..75abcce
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/it/qt_it.po
@@ -0,0 +1,447 @@
+msgid ""
+msgstr ""
+"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: 2009-10-02 09:37+0000\n"
+"Last-Translator: Jan Reister <jan.reister at unimi.it>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "Attiva"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "Eseguibile '%1' richiede Qt %2, trovato Qt %3."
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "Errore libreria Qt incompatibile"
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "QT_LAYOUT_DIRECTION"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "Attiva la finestra principale del programma"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "OK"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "Salva"
+
+# o volendo anche Carica
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "Apri"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "Annulla"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "Chiudi"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "Applica"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "Reinizializza"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "Aiuto"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "Non salvare"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "Scarta"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "&Sì"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "Sì a &tutto"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "&No"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "N&o a tutto"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "Salva tutto"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "Interrompi"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "Riprova"
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "Ignora"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "Ripristina i valori predefiniti"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "Chiudi senza salvare"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "&OK"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "Nome"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "Dimensione"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "Genere"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "Tipo"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "Data di modifica"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "Tutti i file (*)"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "Cartelle"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "&Apri"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "&Salva"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "Apri"
+
+#: qfiledialog.cpp:1670
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"%1 esiste già.\n"
+"Vuoi sostituirlo?"
+
+#: qfiledialog.cpp:1690
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+"%\n"
+"File non trovato.\n"
+" Verifica qual'è il nome corretto del file"
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "Mio Computer"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "&Rinomina"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "&Cancella"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "Mostra &file nascosti"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "Indietro"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "Parent directory"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "Vista a lista"
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "Vista dettaglio"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "File del tipo:"
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "Cartella:"
+
+#: qfiledialog.cpp:2476
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+"%1\n"
+"Cartella non trovata.\n"
+"Controlla il nome corretto della cartella"
+
+#: qfiledialog.cpp:2281
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+"'%1' è protetto.\n"
+"Vuoi comunque cancellare?"
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "Sei sicuro di voler cancellare '%1'?"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "Cartella non cancellabile"
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "Tutti i files (*.*)"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "Salva come"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "Drive"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "File"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "Trova cartella"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "Mostra"
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "Avanti"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "Nuova cartella"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "&Nuova cartella"
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "&Scegli"
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "Rimuovi "
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "Nome File:"
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "Guarda in:"
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "Crea nuova cartella"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "Invalid filename"
+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."
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr "Nome"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "Dimensione"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "Genere"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "Tipo"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "Data modifica"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "Mio Computer"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "Computer"
+
+#: 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 byte"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/it/vidalia_it.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/it/vidalia_it.po
new file mode 100644
index 0000000..cf9cde0
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/it/vidalia_it.po
@@ -0,0 +1,3349 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2009-06-04 08:09+0000\n"
+"Last-Translator: Jan Reister <jan.reister at unimi.it>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Informazioni su Vidalia"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "Licenza"
+
+msgctxt "AboutDialog"
+msgid "Vidalia 0.2.0"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "Tor 0.2.0.32"
+msgstr "Tor 0.2.0.32"
+
+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 "versione"
+
+msgctxt "AdvancedPage"
+msgid "'%1' is not a valid IP address."
+msgstr "'%1' non è un indirizzo IP valido."
+
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "Hai scelto l'autenticazione tramite password, ma non ne hai specificata nessuna."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Scegliere il file di configurazione di Tor"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "File non trovato."
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 non esiste. Vuoi crearlo?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Non è possibile creare il file"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "Non è possibile creare %1 [%2]"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Selezionare una cartella da usare per i dati di Tor"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Impossibile rimuovere il servizio Tor"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+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."
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Porta di controllo"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "Autenticazione:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Indirizzo:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "Nessuno"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Cookie"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Password"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "Genera casualmente"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "File di configurazione di Tor"
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "Avvia Tor con il file di configurazione (torrc) specificato"
+
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "Seleziona il percorso del tuo file di configurazione"
+
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Sfoglia"
+
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr "Cartella dei dati"
+
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr "Conserva i dati di Tor nella seguente cartella"
+
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr "Seleziona la cartella per conservare i dati di Tor"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+"Vidalia non ha potuto rimuovere il servizio Tor.\n"
+"\n"
+"Dovresti rimuoverlo manualmente."
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Lingua"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Scegli la lingua da usare in Vidalia"
+
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Stile"
+
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Scegliere lo stile dell'interfaccia di Vidalia"
+
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr "Vidalia non è in grado di caricare la traduzione della lingua prescelta"
+
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr "Dal:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Nascondi impostazioni"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Mostra Impostazioni"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Utilizzo di banda di Tor"
+
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "Reinizializza"
+
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Velocità di ricezione"
+
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Velocità di invio"
+
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Sempre in primo piano"
+
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Stile"
+
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Modifica la trasparenza del grafico dell'ampiezza di banda"
+
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% Opaco"
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Salva"
+
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Annulla"
+
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr "Inizio la richiesta HTTPS di bridge..."
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr "In connessione a %1:%2..."
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr "Invio una richiesta HTTPS di bridge..."
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr "Scarico una lista di bridge..."
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr "Scarico i Bridge"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr "Non riesco a scaricare i bridge: %1"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr "Riprovo a richiedere i bridge..."
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr "Paese"
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr "# di client"
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr "A partire da %1 i client di questi paesi hanno usato il tuo relay"
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr "Riepilogo sull'uso del bridge"
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr "Riepilogo sui client"
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "Nuovo"
+
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Aperto"
+
+msgctxt "Circuit"
+msgid "Building"
+msgstr "In costruzione"
+
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Non funzionante"
+
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Chiuso"
+
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Percorso vuoto>"
+
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Connessione"
+
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "Stato"
+
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Dettagli del circuito"
+
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "Chiudi circuito (Canc)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Chiudi flusso (Canc)"
+
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "Generale"
+
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Rete"
+
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr "Condivisione"
+
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "Servizi"
+
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Aspetto"
+
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Avanzato"
+
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Aiuto"
+
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Errore nel salvare le impostazioni"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr "Vidalia non è riuscito a salvare la tua impostazione %1"
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Errore nell'applicare le impostazioni"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia non è riuscito ad applicare la tua impostazione %1 a Tor"
+
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Impostazioni"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Vidalia non è riuscito a collegarsi a Tor. (%1)"
+
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "Il socket di controllo non è connesso."
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "Password richiesta"
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
+msgstr "Ricorda la mia password"
+
+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:"
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "Il socket di controllo non è connesso."
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Errore nell'invio del comando di controllo. [%1]"
+
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr ""
+"Il socket si è disconnesso durante il tentativo di leggere una riga di dati."
+
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Risposta di controllo non valida. [%1]"
+
+msgctxt "CountryInfo"
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+msgctxt "CountryInfo"
+msgid "Andorra"
+msgstr "Andorra"
+
+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 "Armenia"
+
+msgctxt "CountryInfo"
+msgid "Australia"
+msgstr "Australia"
+
+msgctxt "CountryInfo"
+msgid "Azerbaijan"
+msgstr "Azerbaijan"
+
+msgctxt "CountryInfo"
+msgid "Bahamas"
+msgstr "Bahamas"
+
+msgctxt "CountryInfo"
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+msgctxt "CountryInfo"
+msgid "Barbados"
+msgstr "Barbados"
+
+msgctxt "CountryInfo"
+msgid "Belarus"
+msgstr "Bielorussia"
+
+msgctxt "CountryInfo"
+msgid "Belgium"
+msgstr "Belgio"
+
+msgctxt "CountryInfo"
+msgid "Belize"
+msgstr "Belize"
+
+msgctxt "CountryInfo"
+msgid "Bhutan"
+msgstr "Bhutan"
+
+msgctxt "CountryInfo"
+msgid "Bolivia"
+msgstr "Bolivia"
+
+msgctxt "CountryInfo"
+msgid "Bosnia & Herzegovina"
+msgstr "Bosnia Herzegovina"
+
+msgctxt "CountryInfo"
+msgid "Botswana"
+msgstr "Botswana"
+
+msgctxt "CountryInfo"
+msgid "Brazil"
+msgstr "Brasile"
+
+msgctxt "CountryInfo"
+msgid "Brunei Darussalam"
+msgstr "Brunei Darussalam"
+
+msgctxt "CountryInfo"
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+msgctxt "CountryInfo"
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+msgctxt "CountryInfo"
+msgid "Burundi"
+msgstr "Burundi"
+
+msgctxt "CountryInfo"
+msgid "Cambodia"
+msgstr "Cambogia"
+
+msgctxt "CountryInfo"
+msgid "Cameroon"
+msgstr "Camerun"
+
+msgctxt "CountryInfo"
+msgid "Canada"
+msgstr "Canada"
+
+msgctxt "CountryInfo"
+msgid "Cape Verde"
+msgstr "Capo Verde"
+
+msgctxt "CountryInfo"
+msgid "Central African Republic"
+msgstr "Repubblica Centrafricana"
+
+msgctxt "CountryInfo"
+msgid "Chad"
+msgstr "Ciad"
+
+msgctxt "CountryInfo"
+msgid "Chile"
+msgstr "Cile"
+
+msgctxt "CountryInfo"
+msgid "China"
+msgstr "Cina"
+
+msgctxt "CountryInfo"
+msgid "Colombia"
+msgstr "Colombia"
+
+msgctxt "CountryInfo"
+msgid "Comoros"
+msgstr "Comore"
+
+msgctxt "CountryInfo"
+msgid "Congo, The Democratic Republic of the"
+msgstr "Repubblica Democratica del Congo"
+
+msgctxt "CountryInfo"
+msgid "Congo"
+msgstr "Congo"
+
+msgctxt "CountryInfo"
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+msgctxt "CountryInfo"
+msgid "Cote d’Ivoire"
+msgstr "Costa d'Avorio"
+
+msgctxt "CountryInfo"
+msgid "Croatia"
+msgstr "Croazia"
+
+msgctxt "CountryInfo"
+msgid "Cuba"
+msgstr "Cuba"
+
+msgctxt "CountryInfo"
+msgid "Cyprus"
+msgstr "Cipro"
+
+msgctxt "CountryInfo"
+msgid "Czech Republic"
+msgstr "Repubblica Ceca"
+
+msgctxt "CountryInfo"
+msgid "Denmark"
+msgstr "Danimarca"
+
+msgctxt "CountryInfo"
+msgid "Djibouti"
+msgstr "Gibuti"
+
+msgctxt "CountryInfo"
+msgid "Dominica"
+msgstr "Dominica"
+
+msgctxt "CountryInfo"
+msgid "Dominican Republic"
+msgstr "Repubblica Dominicana"
+
+msgctxt "CountryInfo"
+msgid "Ecuador"
+msgstr "Ecuador"
+
+msgctxt "CountryInfo"
+msgid "Egypt"
+msgstr "Egitto"
+
+msgctxt "CountryInfo"
+msgid "El Salvador"
+msgstr "El Salvador"
+
+msgctxt "CountryInfo"
+msgid "Equatorial Guinea"
+msgstr "Guibnea Equatoriale"
+
+msgctxt "CountryInfo"
+msgid "Eritrea"
+msgstr "Eritrea"
+
+msgctxt "CountryInfo"
+msgid "Estonia"
+msgstr "Estonia"
+
+msgctxt "CountryInfo"
+msgid "France"
+msgstr "Francia"
+
+msgctxt "CountryInfo"
+msgid "Gabon"
+msgstr "Gabon"
+
+msgctxt "CountryInfo"
+msgid "Gambia"
+msgstr "Gambia"
+
+msgctxt "CountryInfo"
+msgid "Georgia"
+msgstr "Georgia"
+
+msgctxt "CountryInfo"
+msgid "Germany"
+msgstr "Germania"
+
+msgctxt "CountryInfo"
+msgid "Ghana"
+msgstr "Ghana"
+
+msgctxt "CountryInfo"
+msgid "Grenada"
+msgstr "Grenada"
+
+msgctxt "CountryInfo"
+msgid "Guatemala"
+msgstr "Guatemala"
+
+msgctxt "CountryInfo"
+msgid "Guinea"
+msgstr "Guinea"
+
+msgctxt "CountryInfo"
+msgid "Guinea-Bissau"
+msgstr "Guinea-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 "Israele"
+
+msgctxt "CountryInfo"
+msgid "Italy"
+msgstr "Italia"
+
+msgctxt "CountryInfo"
+msgid "Jamaica"
+msgstr "Giamaica"
+
+msgctxt "CountryInfo"
+msgid "Japan"
+msgstr "Giappone"
+
+msgctxt "CountryInfo"
+msgid "Jordan"
+msgstr "Giordania"
+
+msgctxt "CountryInfo"
+msgid "Kazakhstan"
+msgstr "Kazakistan"
+
+msgctxt "CountryInfo"
+msgid "Kenya"
+msgstr "Kenya"
+
+msgctxt "CountryInfo"
+msgid "Kiribati"
+msgstr "Kiribati"
+
+msgctxt "CountryInfo"
+msgid "Kuwait"
+msgstr "Kuwait"
+
+msgctxt "CountryInfo"
+msgid "Kyrgyzstan"
+msgstr "Kirgizistan"
+
+msgctxt "CountryInfo"
+msgid "Laos"
+msgstr "Laos"
+
+msgctxt "CountryInfo"
+msgid "Latvia"
+msgstr "Lettonia"
+
+msgctxt "CountryInfo"
+msgid "Lebanon"
+msgstr "Libano"
+
+msgctxt "CountryInfo"
+msgid "Lesotho"
+msgstr "Lesotho"
+
+msgctxt "CountryInfo"
+msgid "Liberia"
+msgstr "Liberia"
+
+msgctxt "CountryInfo"
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+msgctxt "CountryInfo"
+msgid "Lithuania"
+msgstr "Lituania"
+
+msgctxt "CountryInfo"
+msgid "Luxembourg"
+msgstr "Lussemburgo"
+
+msgctxt "CountryInfo"
+msgid "Macedonia"
+msgstr "Macedonia"
+
+msgctxt "CountryInfo"
+msgid "Madagascar"
+msgstr "Madagascar"
+
+msgctxt "CountryInfo"
+msgid "Malawi"
+msgstr "Malawi"
+
+msgctxt "CountryInfo"
+msgid "Malaysia"
+msgstr "Malesia"
+
+msgctxt "CountryInfo"
+msgid "Mali"
+msgstr "Mali"
+
+msgctxt "CountryInfo"
+msgid "Malta"
+msgstr "Malta"
+
+msgctxt "CountryInfo"
+msgid "Marshall Islands"
+msgstr "Isole Marshall"
+
+msgctxt "CountryInfo"
+msgid "Mauritania"
+msgstr "Mauritania"
+
+msgctxt "CountryInfo"
+msgid "Mauritius"
+msgstr "Mauritius"
+
+msgctxt "CountryInfo"
+msgid "Micronesia"
+msgstr "Micronesia"
+
+msgctxt "CountryInfo"
+msgid "Moldova"
+msgstr "Moldavia"
+
+msgctxt "CountryInfo"
+msgid "Monaco"
+msgstr "Monaco"
+
+msgctxt "CountryInfo"
+msgid "Mongolia"
+msgstr "Mongolia"
+
+msgctxt "CountryInfo"
+msgid "Montenegro"
+msgstr "Montenegro"
+
+msgctxt "CountryInfo"
+msgid "Morocco"
+msgstr "Marocco"
+
+msgctxt "CountryInfo"
+msgid "Mozambique"
+msgstr "Mozambico"
+
+msgctxt "CountryInfo"
+msgid "Namibia"
+msgstr "Namibia"
+
+msgctxt "CountryInfo"
+msgid "Nauru"
+msgstr "Nauru"
+
+msgctxt "CountryInfo"
+msgid "Nepal"
+msgstr "Nepal"
+
+msgctxt "CountryInfo"
+msgid "Netherlands"
+msgstr "Olanda"
+
+msgctxt "CountryInfo"
+msgid "New Zealand"
+msgstr "Nuova Zelanda"
+
+msgctxt "CountryInfo"
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+msgctxt "CountryInfo"
+msgid "Niger"
+msgstr "Niger"
+
+msgctxt "CountryInfo"
+msgid "Nigeria"
+msgstr "Nigeria"
+
+msgctxt "CountryInfo"
+msgid "Norway"
+msgstr "Norvegia"
+
+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 Nuova Guinea"
+
+msgctxt "CountryInfo"
+msgid "Paraguay"
+msgstr "Paraguay"
+
+msgctxt "CountryInfo"
+msgid "Peru"
+msgstr "Peru"
+
+msgctxt "CountryInfo"
+msgid "Philippines"
+msgstr "Filippine"
+
+msgctxt "CountryInfo"
+msgid "Poland"
+msgstr "Polonia"
+
+msgctxt "CountryInfo"
+msgid "Portugal"
+msgstr "Portogallo"
+
+msgctxt "CountryInfo"
+msgid "Qatar"
+msgstr "Qatar"
+
+msgctxt "CountryInfo"
+msgid "Romania"
+msgstr "Romania"
+
+msgctxt "CountryInfo"
+msgid "Russia"
+msgstr "Russia"
+
+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 "Arabia Saudita"
+
+msgctxt "CountryInfo"
+msgid "Senegal"
+msgstr "Senegal"
+
+msgctxt "CountryInfo"
+msgid "Serbia"
+msgstr "Serbia"
+
+msgctxt "CountryInfo"
+msgid "Seychelles"
+msgstr "Seychelles"
+
+msgctxt "CountryInfo"
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+msgctxt "CountryInfo"
+msgid "Singapore"
+msgstr "Singapore"
+
+msgctxt "CountryInfo"
+msgid "Slovakia"
+msgstr "Slovacchia"
+
+msgctxt "CountryInfo"
+msgid "Slovenia"
+msgstr "Slovenia"
+
+msgctxt "CountryInfo"
+msgid "Solomon Islands"
+msgstr "Isole Salomone"
+
+msgctxt "CountryInfo"
+msgid "Somalia"
+msgstr "Somalia"
+
+msgctxt "CountryInfo"
+msgid "South Africa"
+msgstr "Sud Africa"
+
+msgctxt "CountryInfo"
+msgid "Spain"
+msgstr "Spagna"
+
+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 "Svezia"
+
+msgctxt "CountryInfo"
+msgid "Switzerland"
+msgstr "Svizzera"
+
+msgctxt "CountryInfo"
+msgid "Syria"
+msgstr "Siria"
+
+msgctxt "CountryInfo"
+msgid "Tajikistan"
+msgstr "Tagikistan"
+
+msgctxt "CountryInfo"
+msgid "Tanzania"
+msgstr "Tanzania"
+
+msgctxt "CountryInfo"
+msgid "Thailand"
+msgstr "Tailandia"
+
+msgctxt "CountryInfo"
+msgid "Timor-Leste (East Timor)"
+msgstr "Timor Est"
+
+msgctxt "CountryInfo"
+msgid "Togo"
+msgstr "Togo"
+
+msgctxt "CountryInfo"
+msgid "Tonga"
+msgstr "Tonga"
+
+msgctxt "CountryInfo"
+msgid "Trinidad & Tobago"
+msgstr "Trinidad & Tobago"
+
+msgctxt "CountryInfo"
+msgid "Tunisia"
+msgstr "Tunisia"
+
+msgctxt "CountryInfo"
+msgid "Turkey"
+msgstr "Turchia"
+
+msgctxt "CountryInfo"
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+msgctxt "CountryInfo"
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+msgctxt "CountryInfo"
+msgid "Uganda"
+msgstr "Uganda"
+
+msgctxt "CountryInfo"
+msgid "Ukraine"
+msgstr "Ucraina"
+
+msgctxt "CountryInfo"
+msgid "United Arab Emirates"
+msgstr "Emirati Arabi Uniti"
+
+msgctxt "CountryInfo"
+msgid "United Kingdom"
+msgstr "Regno Unito"
+
+msgctxt "CountryInfo"
+msgid "United States"
+msgstr "Stati Uniti"
+
+msgctxt "CountryInfo"
+msgid "Uruguay"
+msgstr "Uruguay"
+
+msgctxt "CountryInfo"
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+msgctxt "CountryInfo"
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+msgctxt "CountryInfo"
+msgid "Vatican"
+msgstr "Vaticano"
+
+msgctxt "CountryInfo"
+msgid "Venezuela"
+msgstr "Venezuela"
+
+msgctxt "CountryInfo"
+msgid "Vietnam"
+msgstr "Vietnam"
+
+msgctxt "CountryInfo"
+msgid "Western Sahara"
+msgstr "Sahara Occidentale"
+
+msgctxt "CountryInfo"
+msgid "Yemen"
+msgstr "Yemen"
+
+msgctxt "CountryInfo"
+msgid "Zambia"
+msgstr "Zambia"
+
+msgctxt "CountryInfo"
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+msgctxt "CountryInfo"
+msgid "Albania"
+msgstr "Albania"
+
+msgctxt "CountryInfo"
+msgid "Algeria"
+msgstr "Algeria"
+
+msgctxt "CountryInfo"
+msgid "Austria"
+msgstr "Austria"
+
+msgctxt "CountryInfo"
+msgid "Bahrain"
+msgstr "Bahrain"
+
+msgctxt "CountryInfo"
+msgid "Benin"
+msgstr "Benin"
+
+msgctxt "CountryInfo"
+msgid "Ethiopia"
+msgstr "Etiopia"
+
+msgctxt "CountryInfo"
+msgid "Fiji"
+msgstr "Figi"
+
+msgctxt "CountryInfo"
+msgid "Finland"
+msgstr "Finlandia"
+
+msgctxt "CountryInfo"
+msgid "Greece"
+msgstr "Grecia"
+
+msgctxt "CountryInfo"
+msgid "Guam"
+msgstr "Guam"
+
+msgctxt "CountryInfo"
+msgid "Hungary"
+msgstr "Ungheria"
+
+msgctxt "CountryInfo"
+msgid "Iceland"
+msgstr "Islanda"
+
+msgctxt "CountryInfo"
+msgid "India"
+msgstr "India"
+
+msgctxt "CountryInfo"
+msgid "Indonesia"
+msgstr "Indonesia"
+
+msgctxt "CountryInfo"
+msgid "Iran"
+msgstr "Iran"
+
+msgctxt "CountryInfo"
+msgid "Iraq"
+msgstr "Iraq"
+
+msgctxt "CountryInfo"
+msgid "Ireland"
+msgstr "Irlanda"
+
+msgctxt "CountryInfo"
+msgid "Korea, North"
+msgstr "Corea del Nord"
+
+msgctxt "CountryInfo"
+msgid "Korea, South"
+msgstr "Corea del Sud"
+
+msgctxt "CountryInfo"
+msgid "Libya"
+msgstr "Libia"
+
+msgctxt "CountryInfo"
+msgid "Maldives"
+msgstr "Maldive"
+
+msgctxt "CountryInfo"
+msgid "Mexico"
+msgstr "Messico"
+
+msgctxt "CountryInfo"
+msgid "Myanmar"
+msgstr "Birmania"
+
+msgctxt "CountryInfo"
+msgid "Taiwan"
+msgstr "Taiwan"
+
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Eseguibili (*.exe)"
+
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Imposta il percorso di Tor"
+
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "Seleziona l'eseguibile del proxy"
+
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr "Devi indicare il nome dell'eseguibile di Tor"
+
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr "Le impostazioni del proxy che hai fornito non sono formattate correttamente"
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr "Avvia Vidalia all'avvio del sistema"
+
+msgctxt "GeneralPage"
+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"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr "Applicazione Proxy (facoltativa)"
+
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "Avvia un'applicazione proxy quando Tor si avvia"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Argomenti applicazione proxy:"
+
+msgctxt "GeneralPage"
+msgid "Software Updates"
+msgstr "Aggiornamenti Software"
+
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
+msgstr "Controlla automaticamente gli aggiornamenti software"
+
+msgctxt "GeneralPage"
+msgid "Check Now"
+msgstr "Controlla adesso"
+
+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 "Ricevuti:"
+
+msgctxt "GraphFrame"
+msgid "Sent:"
+msgstr "Inviati:"
+
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr "Il file XML specificato non è un documento valido di contenuto."
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "La ricerca ha raggiunto la fine del documento"
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "La ricerca ha raggiunto l'inizio del documento"
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "Il testo non è stato trovato nel documento"
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "Trovati %1 risultati"
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Aiuto di Vidalia"
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Indietro"
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Sposta alla pagina precedente (Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Avanti"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Sposta alla prossima pagina (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 "Vai alla Home (Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Cerca"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "Cerca una parola o una frase nella pagina corrente (Crtl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Chiudi"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Chiudi l'aiuto di Vidalia"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Cerca:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Cerca precedente"
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Cerca successivo"
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "Maiuscole/minuscole"
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Solo parole intere"
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Argomenti"
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Contenuti"
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Cerca"
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Ricerca di:"
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Documenti trovati"
+
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
+msgstr "Errore nel caricamento dei contenuti d'aiuto"
+
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr "Apertura di un collegamento esterno"
+
+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 può aprire il collegamento che hai scelto dentro il tuo browser web predefinito. Se il tuo browser non è configurato per usare Tor, la richiesta non sarà anonima."
+
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr "Vuoi che Vidalia apra il collegamento nel tuo browser web?"
+
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr "Impossibile aprire il collegamento"
+
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr "Vidalia non è riuscito ad aprire il collegamento nel tuo browser web. Puoi sempre copiare l'indirizzo e incollarlo nel tuo browser."
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr "Errore nell'apertura del file di aiuto"
+
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr "Informazioni sulla licenza"
+
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "Licenza"
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr "Crediti"
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "Debug"
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Informazioni"
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Avviso"
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Attenzione"
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Errore"
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "Avvia Tor"
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Esci"
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Grafico dell'ampiezza di banda"
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Log dei messaggi"
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Mappa della rete"
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr "Pannello di controllo"
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Impostazioni"
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr "Informazioni su"
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr "Aiuto"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia non è riuscito ad avviare il browser web impostato"
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "Errore all'avvio del client IM"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "Vidalia non è riuscito a configurare il client IM"
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Errore nell'avvio del proxy server"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia non è riuscito ad avviare il proxy server configurato"
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Connessione ad una directory dei relay"
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "Sto creando una connessione cifrata alla directory"
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "Sto ottenendo informazioni sullo stato della rete"
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "Caricamento dello stato della rete"
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "Caricamento dei certificati delle authority"
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "Richiesta di informazioni sui relay"
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "Caricamento delle informazioni sui relay"
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "Mi sto connettendo alla rete Tor"
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "Sto creando un circuito Tor"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "discordanza di identità"
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr "fatto"
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "connessione rifiutata"
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "timeout della connessione"
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "errore di lettura/scrittura"
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "nessun rotta per l'host"
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "risorse insufficienti"
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "sconosciuto"
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor non è attivo"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Avvio del software Tor"
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "Avvio di Tor"
+
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Errore nell'avvio di 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 non è riuscito ad avviare Tor. Controlla le impostazioni per assicurarti di aver specificato nome e posizione corretti per l'eseguibile di Tor."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "Connessione a Tor"
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "Errore di connessione"
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "Il relaying è attivato"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "Errore durante la chiusura"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "Vidalia non è riuscito a chiudere Tor"
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "Errore inaspettato"
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Autenticazione a Tor"
+
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "Autenticazione tramite cookie richiesta"
+
+msgctxt "MainWindow"
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgstr "Tor richiede Vidalia per mandare i contenuti di un cookie di autenticazione, ma Vidalia non è stato in grado di trovarne uno."
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "Vuoi cercare manualmente il file 'control_auth_cookie'?"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Directory dai dati"
+
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Cookie di controllo (control_auth_cookie)"
+
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "Errore nella registrazione degli eventi"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr "Vidalia non è stato in grado di registrare alcuni eventi. Alcune funzioni di Vidalia potrebbero non essere disponibili"
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Errore di autenticazione"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia non è riuscito ad autenticarsi al software Tor. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Verificare le impostazioni di autenticazione per la porta di controllo."
+
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "È disponibile un aggiornamento di 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 "L'installazione corrente di Tor è obsoleta o non è più raccomandata. Per favore visita il sito di Tor per scaricare l'ultima versione."
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Sito Tor: %1"
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "Tutte le nuove connessioni appariranno diverse dalle vecchie."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "Impossibile creare una nuova identità"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "Port forwarding fallito"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "Vidalia non è riuscito a configurare il port forwarding automatico"
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Pannello di controllo Vidalia"
+
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "Stato"
+
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Shortcut di Vidalia"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Configurazione del relaying"
+
+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."
+
+msgctxt "MainWindow"
+msgid "Would you like to check if a newer package is available for installation?"
+msgstr "Vuoi controllare se c'è un pacchetto più recente da installare?"
+
+msgctxt "MainWindow"
+msgid "Potentially Unsafe Connection"
+msgstr "Connessione potenzialmente insicura"
+
+msgctxt "MainWindow"
+msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
+msgstr ""
+"Una delle tue applicazioni%1sembra effettuare una connessione potenzialmente "
+"non cifrata ed insicura alla porta %2. Il traffico inviato su questa "
+"connessione potrebbe essere sorvegliato. Controlla la configurazione della "
+"tua applicazione ed usa solo protocolli cifrati, come SSL, se possibile."
+
+msgctxt "MainWindow"
+msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgstr ""
+"Tor ha chiuso automaticamente la connessione per proteggere il tuo "
+"anonimato."
+
+msgctxt "MainWindow"
+msgid "Update Failed"
+msgstr "È disponibile un aggiornamento di Tor"
+
+msgctxt "MainWindow"
+msgid "Your software is up to date"
+msgstr "Il software è aggiornato"
+
+msgctxt "MainWindow"
+msgid "There are no new Tor software packages available for your computer at this time."
+msgstr "Per ora non ci sono nuovi pacchetti software Tor per il tuo computer."
+
+msgctxt "MainWindow"
+msgid "Installation Failed"
+msgstr "L'installazione è fallita"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to install your software updates."
+msgstr "Vidalia non è riuscito a chiudere Tor"
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr "Si è verificato questo errore:"
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "fallito (%1)"
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+"Il tuo relay si sta spegnendo.\n"
+"Fai di nuovo clic su 'Stop' per fermare il tuo relay adesso."
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
+"Hai realizzato un relay Tor. Se lo spegni tutte le connessioni aperte dai "
+"client verranno interrotte.\n"
+"\n"
+"Vuoi chiuderlo gradualmente per dare ai client il tempo di trovare un nuovo "
+"relay?"
+
+msgctxt "MainWindow"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr ""
+"Vidalia ha rilevato che il software Tor si è chiuso inaspettatamente.\n"
+"\n"
+"Controlla il log dei messaggi alla ricerca di avvisi o messaggi di errore "
+"recenti."
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", probabilmente Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", probabilmente un client email,"
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr "File"
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "Informazioni su Vidalia"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Home"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr "Controlla gli aggiornamenti"
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Errore nell'impostazione del filtro"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia non è riuscito a registrarsi per gli eventi di log di Tor."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "Errore nell'apertura del file di log"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia non è riuscito ad aprire il file di log specificato."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Nome del file di log necessario"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "Devi inserire un nome per salvare i messaggi di log in un file."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Selezionare il file di log"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Salva i messaggi di log"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "File di testo (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Cerca nel log dei messaggi"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Cerca:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Non trovato"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "La ricerca non ha prodotto risultati."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Log dei messaggi"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Filtri messaggi..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Imposta i filtri per i messaggi"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Dimensioni della cronologia..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Imposta il numero massimo di messaggi da visualizzare"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Pulisci"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Svuota i messaggi del log (Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Copia"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Copia i messaggi selezionati negli appunti (Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Seleziona tutti"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Seleziona tutti i messaggi (Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Salva tutto"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Salva tutti i messaggi in un file"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Salva selezionati"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Salva i messaggi selezionati in un file"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Impostazioni"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Modifica le impostazioni del log dei messaggi"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Aiuto"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Mostra l'aiuto"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Chiudi"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Chiude il log dei messaggi"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Cerca"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Cerca tutti i messaggi contenenti il testo di ricerca (Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Ora"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Tipo"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Messaggio"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Salva le impostazioni correnti per il log dei messaggi"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Salva impostazioni"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Annulla i cambiamenti alle impostazioni"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Annulla"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Filtro messaggi"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Errore"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Attenzione"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Avviso"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Informazioni"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Debug"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "Cronologia del log dei messaggi"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Numero di messaggi da mostrare nella finestra dei log"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "messaggi"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Salva sempre i nuovi messaggi di log"
+
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "Sfoglia"
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr "Abilita il salvataggio automatico dei messaggi su file"
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "Salva automaticamente i nuovi messaggi su file"
+
+msgctxt "MessageLog"
+msgid "Messages that appear when something has \n"
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+"Messaggi che compaiono quando qualcosa è andato \n"
+"davvero storto e Tor non può continuare a funzionare."
+
+msgctxt "MessageLog"
+msgid "Messages that only appear when \n"
+"something has gone wrong with Tor."
+msgstr ""
+"Messaggi che compaiono solo quando \n"
+"qualcosa è andato storto con Tor."
+
+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 ""
+"Messaggi che compaiono di rado \n"
+"durante il normale funzionamento \n"
+"di Tor e non sono considerati errori, \n"
+"ma potrebbero comunque interessarti."
+
+msgctxt "MessageLog"
+msgid "Messages that appear frequently \n"
+"during normal Tor operation."
+msgstr ""
+"Messaggi che compaiono spesso \n"
+"durante il funzionamento di Tor."
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+"Messaggi molto prolissi che interessano \n"
+"principalmente gli sviluppatori di Tor."
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+"Non riesco a scrivere il file %1\n"
+"\n"
+"%2."
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Mappa della rete Tor"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Ricarica"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "Ricarica la lista dei relay Tor e delle connessioni"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Aiuto"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Mostra l'aiuto della mappa di rete"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Mostra l'aiuto della mappa di rete"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Chiudi"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Chiudi la mappa della rete"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Ingrandisci"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Ingrandisci la mappa della rete"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Rimpicciolisci"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Riduci la mappa della rete"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Adatta"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Adatta per includere tutti i circuiti attualmente visualizzati"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "File non trovato."
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr "Non sono disponibili dettagli per questo relay."
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr "A schermo intero"
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr "Guarda la mappa della rete in una finestra a schermo intero"
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "Bridge non valido"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "L'identifier del bridge specificat non è valido."
+
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr "Copia (Ctrl+C)"
+
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr "Devi indicare sia un indirizzo IP o un nome host, sia un numero di porta per configurare Tor e usare un proxy per accedere a Internet"
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "Devi indicare una o più porte a cui il tuo firewall permette di connettersi"
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' non è un numero di porta valido."
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr "Seleziona nel caso che la tua rete locale richieda un proxy per accedere a Internet"
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "Uso un proxy per accedere a Internet"
+
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr "Impostazioni proxy"
+
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "HTTP Proxy:"
+
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr "Nome utente:"
+
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "Usa questo proxy anche per HTTPS"
+
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr "Password:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "Porta:"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr "Seleziona per connetterti ai relay solo attraverso le porte consentite dal tuo firewall"
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "Il mio firewall mi permette di connettermi solo a certe porte"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "Impostazioni firewall"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "Porte consentite:"
+
+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 "Seleziona per cifrare le richieste di directory e, facoltativamente, usare bridge relay per accedere alla rete Tor"
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "Il mio ISP blocca le connessioni alla rete Tor"
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr "Impostazioni bridge"
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr "Il software Tor che stai usando non supporta i bridge. <br>Le connessioni di directory saranno comunque cifrate."
+
+msgctxt "NetworkPage"
+msgid "Add a Bridge:"
+msgstr "Aggiungi un bridge"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Come trovo un bridge?</a>"
+
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr "Rimuovi i bridge selezionati dalla lista"
+
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr "Copia i bridge selezionati negli appunti"
+
+msgctxt "NetworkPage"
+msgid "Find Bridges Now"
+msgstr "Trova dei bridge adesso"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
+msgstr "<a href=\"bridges.finding\">In che altri modi trovo dei bridge?</a>"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
+msgstr "<a href=\"bridges.finding\">Come trovo dei bridge?</a>"
+
+msgctxt "NetworkPage"
+msgid "No new bridges are currently available. You can either wait a while and try again, or try another method of finding new bridges."
+msgstr ""
+"Non ci sono nuovi bridge disponibili. Puoi aspettare un po' e riprovare, "
+"oppure cerca un altro modo per trovare dei bridge"
+
+msgctxt "NetworkPage"
+msgid "Click Help to see other methods of finding new bridges."
+msgstr "Fai clic su Aiuto per vedere altri modi di trovare nuovi bridge."
+
+msgctxt "Policy"
+msgid "accept"
+msgstr "accetta"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "rifiuta"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Online"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Ibernazione"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Offline"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Luogo:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "Indirizzo IP:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Piattaforma:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Larghezza di banda:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Uptime:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Ultimo aggiornamento:"
+
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Copia"
+
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
+msgstr "Ibernazione"
+
+msgctxt "RouterInfoDialog"
+msgid "Online"
+msgstr "Online"
+
+msgctxt "RouterInfoDialog"
+msgid "Offline"
+msgstr "Offline"
+
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr "Dettagli del relay"
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr "Sommario"
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr "Nickname:"
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr "Stato"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "Luogo:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "Indirizzo IP:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "Piattaforma:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "Larghezza di banda:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "Uptime:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "Informazioni di contatto:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "Ultimo aggiornamento:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr "Descrittore"
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Offline"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Ibernazione"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Relay"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "Zoom sul relay"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 relay connessi"
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Copia"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "Nickname"
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "Fingerprint"
+
+msgctxt "ServerPage"
+msgid "Bridge Support Unavailable"
+msgstr "Supporto dei bridge non disponibile"
+
+msgctxt "ServerPage"
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgstr "Hai configurato Tor per fare da bridge relay per utendi censurati, ma la tua versione di Tor non supporta i bridge."
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "Aggiorna il tuo software Tor o configura Tor per fare da normale relay Tor"
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "Il tuo bridge relay non è attivo."
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "Devi specificare un nickname del relay ed una porta"
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "Usa solo come client"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Fai da relay e scambia traffico per la rete Tor"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "Porta relay:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "Attiva per fare da mirror della directory dei relay"
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "Tenta di configurare automaticamente il port forwarding"
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "Test"
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "Mostra l'aiuto sul port forwarding"
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Porta directory:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Numero della porta directory"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Informazioni di contatto:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "Nome del tuo relay"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "Porta tramite cui utenti e altri relay possono comunicare con il tuo relay"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Nickname:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Impostazioni di base"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Se hai una connessione ad internet con molta banda in download ma poca in upload, inserisci la tua velocità di upload qui."
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "Cavo/DSL 256 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "Cavo/DSL 512 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "Cavo/DSL 768 Kbps"
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/Cavo/DSL 1.5 Mpbs"
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "Personalizzata"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Seleziona la voce che si avvicina di più alla tua connessione internet"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Mostra l'aiuto per l'impostazione dei limiti di banda"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Banda media"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Limite medio di banda a lungo termine"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Massimo"
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "Picco massimo di banda"
+
+msgctxt "ServerPage"
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr "La banda massima deve essere maggiore o uguale alla banda allocata media. Entrambi i valori devono essere almeno 20 KB/s."
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Limiti di banda"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Porte 6660 - 6660 e 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Porte 110, 143, 993 e 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Ricevi email (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Porte non specificate da altre caselle di selezione"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Altri servizi"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Porte 706, 1863, 5050, 5190, 5222, 8300 e 8888"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "Messaggistica Instantaea (IM)"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "Porta 443"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "Siti web sicuri (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Porta 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Siti web"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "Mostra l'aiuto sulle exit policy"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr "A quali risorse di internet gli utenti possono accedere tramite il tuo relay?"
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr "Tor bloccherà di default alcune mail in uscita e programmi di condivisione file per ridurre spam ed altri abusi"
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Exit policy"
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr "Consenti agli altri di accedere al tuo bridge dando loro questa riga di testo:"
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "Questa è l'identità del tuo bridge relay che puoi dare a altre persone"
+
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr "Copia l'identità del tuo bridge relay negli appunti"
+
+msgctxt "ServerPage"
+msgid "No Recent Usage"
+msgstr "Nessun uso recente"
+
+msgctxt "ServerPage"
+msgid "No clients have used your relay recently."
+msgstr "Nessun client ha usato il tuo relay recentemente."
+
+msgctxt "ServerPage"
+msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgstr ""
+"Mantieni attivo il tuo relay così che i client possano meglio trovarlo ed "
+"usarlo."
+
+msgctxt "ServerPage"
+msgid "Bridge History"
+msgstr "Impostazioni bridge"
+
+msgctxt "ServerPage"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgstr "Vidalia non è riuscito a salvare la tua impostazione %1"
+
+msgctxt "ServerPage"
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgstr ""
+"Tor ha dato una risposta malformata quando Vidalia ha chiesto lo storico "
+"d'utilizzo del tuo bridge."
+
+msgctxt "ServerPage"
+msgid "The returned response was: %1"
+msgstr "La risposta fornita è stata: %1"
+
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network"
+msgstr ""
+"Aiuta gli utenti sotto censura a raggiungere la rete Tor (Tor 0.2.0.8-alpha "
+"o più recente)"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Come trovo un bridge?</a>"
+
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory"
+msgstr "Offri un mirror della directory dei relay"
+
+msgctxt "ServerPage"
+msgid "Email address at which you may be reached if there is a\n"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr ""
+"L'indirizzo email per contattarti se ci fosse un \n"
+"problema col tuo relay. Puoi inserire anche il tuo fingerprint PGP o GPG."
+
+msgctxt "ServicePage"
+msgid "Error while trying to unpublish all services"
+msgstr "Errore durante il ritiro dei servizi"
+
+msgctxt "ServicePage"
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
+msgstr "Configura almeno una cartella per il servizio e una porta virtuale per ogni servizio che vuoi salvare. Rimuovi gli altri."
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Errore"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "Seleziona un servizio"
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "Seleziona la cartella del servizio"
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "La porta virtuale può solo contenere numeri di porta validi [1..65535]."
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "Il target può solo contenere indirizzo:porta, indirizzo o porta."
+
+msgctxt "ServicePage"
+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"
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "Indirizzo .onion"
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "Porta virtuale"
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "Target"
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "Percorso della cartella"
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "Attivato"
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "Aggiungi un nuovo servizio alla lista"
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "Rimuovi il servizio selezionato dalla lista"
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr "Copia l'indirizzo onion selezionato negli appunti"
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr "Esplora nei file di sistema locali e scegli una cartella per i servizi selezionati"
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "Creato da Tor"
+
+msgctxt "Stream"
+msgid "New"
+msgstr "Nuovo"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Risoluzione"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Connessione"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "Apri"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Non funzionante"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Chiuso"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Nuovo tentativo"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "Rimappato"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "Il processo %1 non è riuscito a terminare. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "Il servizio Tor non è installato."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "Non è stato possibile avviare il servizio Tor."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "L'hash della password di controllo è fallito."
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "Successo"
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "Nessuna periferica UpnP trovata"
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "Nessun gateway internet UPnP trovato"
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "Avvio WSA fallito"
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "Non sono riuscito ad aggiungere una mappatura delle porte"
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "Non sono riuscito a caricare una mappatura delle porte"
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "Non sono riuscito a rimuovere una mappatura delle porte"
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "Errore sconosciuto"
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "Ricerca di dispositivi UPnP"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "Sto aggiornando la mappatura porte di directory"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "Sto aggiornando la mappatura porte di relay"
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "Test completato con successo!"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "Test supporto UPnP"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr "Sto testando il supporto Universal Plug & Play"
+
+msgctxt "UpdateProcess"
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgstr ""
+"Vidalia non ha potuto controllare gli aggiornamenti software perché non ha "
+"trovato '%1'."
+
+msgctxt "UpdateProcess"
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgstr ""
+"Vidalia non ha potuto controllare gli aggiornamenti software perché il "
+"processo di aggiurnamento di Tor si è interrotto inaspettatamente."
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for available updates..."
+msgstr "Cerco gli aggiornamenti disponibili..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Hide"
+msgstr "Nascondi"
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr "Scarico gli aggiornamenti..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr "Installo il software aggiornato..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr "Fatto! Il tuo software ora è aggiornato."
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr "Aggiornamenti software"
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr "Controllo gli aggiornamenti..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr "Annulla"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr "È disponibile un aggiornamento di Tor"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr "Ricordamelo più tardi"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr "Installa"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr "Sono pronti per l'installazione questi pacchetti software:"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr "Pacchetto"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr "versione"
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Annulla"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Sì"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "No"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Aiuto"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Riprova"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Mostra log"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Mostra impostazioni"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Continua"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Esci"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Sfoglia"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Parametro non valido"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia è già in esecuzione"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Mostra questo messaggio di aiuto ed esci."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "Reinizializza TUTTE le impostazioni di Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Imposta la cartella che Vidalia userà per i dati."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Imposta il nome e la posizione del pidfile di Vidalia"
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Imposta il nome e la posizione del file di log di Vidalia"
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Imposta il livello di dettaglio del log di Vidalia"
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Imposta lo stile dell'interfaccia di Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Imposta la lingua di Vidalia"
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Informazioni sull'uso di Vidalia"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "Non è stato possibile aprire il file di log '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr "Il codice della lingua indicato non è valido:"
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr "Lo stile della GUI indicato non è valido:"
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr "Il livello di log indicato non è valido:"
+
+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 ""
+"Sembra che un altro processo di Vidalia stia già girando. Se davvero non c'è "
+"un altro processo Vidalia in funzione, puoi decidere di continuare lo "
+"stesso.\n"
+"\n"
+"Vuoi continuare ed avviare Vidalia?"
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr "%1 sec"
+
+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 giorni"
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr "%1 ore"
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr "%1 minuti"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ja/qt_ja.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ja/qt_ja.po
new file mode 100644
index 0000000..e77369e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ja/qt_ja.po
@@ -0,0 +1,440 @@
+msgid ""
+msgstr ""
+"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-04-10 02:29-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"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "アクティブに"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "実行可能ファイル '%1' には Qt %2 が必要です。Qt %3 が見つかりました。"
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "互換性のないQtライブラリエラー"
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "LTR"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "メインウィンドウをアクティブにする"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "OK"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "保存"
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "オープン"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "閉じる"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "適用"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "リセット"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "ヘルプ"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "保存しない"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "変更を破棄"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "はい(&Y)"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "全てにはい(&A)"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "いいえ(&N)"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "全てにいいえ(&O)"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "すべて保存"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "中止"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "再試行"
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "無視"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "デフォルトに戻す"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "保存せずに閉じる"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "OK(&O)"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "名前"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "サイズ"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "種類"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "タイプ"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "更新日"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "すべてのファイル(*)"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "ディレクトリ"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "オープン(&O)"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "保存(&S)"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "オープン"
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"%1はすでに存在します。\n"
+"置き換えますか?"
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+"%1\n"
+"ファイルが見つかりません。\n"
+"正しいファイル名が入力されたかどうか確認してください。"
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "マイ コンピュータ"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "名前の変更(&R)"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "削除(&D)"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "隠しファイルの表示(&H)"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "戻る"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "親ディレクトリ"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "一覧表示"
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "詳細表示"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "ファイルの種類:"
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "ディレクトリ:"
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+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"
+"本当に削除しますか？"
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "'%1' を本当に削除しますか？"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "ディレクトリを削除できませんでした。"
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "すべてのファイル(*.*)"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "名前を付けて保存"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "ドライブ"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "ファイル"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "不明"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "ディレクトリの検索"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "表示"
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "進む"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "新しいフォルダ"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "削除"
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "ファイル名:"
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "検索する場所:"
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "新しいフォルダの作成"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr "名前"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "サイズ"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "種類"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "タイプ"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "更新日"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "マイ コンピュータ"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ja/vidalia_ja.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ja/vidalia_ja.po
new file mode 100644
index 0000000..6541a26
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ja/vidalia_ja.po
@@ -0,0 +1,3292 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2010-04-10 02:06-0600\n"
+"Last-Translator: Shinji R. Yamane <s-yamane at computer.org>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Vidalia について"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "ライセンス"
+
+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 "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."
+msgstr "'パスワード' 認証を選択しましたが、パスワードを指定しませんでした。"
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Tor の構成ファイルの選択"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "ファイルが見つかりません"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 は存在しません。作成しますか？"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "ファイルの作成に失敗しました"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "%1 [%2] を作成することができません"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Tor のデータに使用するディレクトリの選択"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Tor サービスを削除することができません"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "Tor サービスをインストールすることができません"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "Vidalia は Tor サービスをインストールすることができませんでした。"
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "制御ポート"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "認証:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "アドレス:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "なし"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Cookie"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "パスワード"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "ランダムに生成する"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Torの設定ファイル"
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "指定した構成ファイル (torrc) と共に Tor ソフトウェアを開始"
+
+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 ""
+
+msgctxt "AdvancedPage"
+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"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+
+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 "BandwidthGraph"
+msgid "Since:"
+msgstr "起点:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "設定を非表示にする"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "設定の表示"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Tor の帯域幅使用量"
+
+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 ""
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr "ブリッジのリストをダウンロード..."
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr "国"
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr ""
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "新規"
+
+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 "回路を閉じる (Del)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "ストリームを閉じる (Del)"
+
+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 "Vidalia は %1 の設定を保存することができませんでした。"
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "設定の適用エラー"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia は Tor へ %1 の設定を適用することができませんでした。"
+
+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 ""
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "コントロール ソケットは接続されていません。"
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "コントロール コマンドの送信エラーです。[%1]"
+
+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"
+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 "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 "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 "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+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 ""
+
+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 "Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "進む"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "次のページへ移動します (Shift+Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "ホーム"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "ホーム ページへ移動します (Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "検索"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "現在のページから単語を検索します (Ctrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "閉じる"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Vidalia のヘルプを閉じます"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "検索:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "前を検索"
+
+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 "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 "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 "表示"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Vidalia のヘルプ"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "ウェブ ブラウザの起動エラー"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia は構成されたウェブ ブラウザを起動することができませんでした"
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "プロキシ サーバーの起動エラー"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia は構成されたプロキシ サーバーを起動することができませんでした"
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr "Torネットワークに接続しました!"
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr "完了"
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor は起動していません"
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "Tor はシャットダウンしています"
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting 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."
+msgstr "Vidalia は Tor を開始することができませんでした。Tor の実行ファイルの正しい名前と場所が指定されていることを確実にするには設定をチェックします。"
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "リレーは有効です"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Authenticating to 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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "ご自身でファイル 'control_auth_cookie' を参照しますか?"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "データディレクトリ"
+
+msgctxt "MainWindow"
+msgid "Control 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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "コントロール ポートの認証の設定をチェックしてください。"
+
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "Tor の更新が利用可能です"
+
+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 のウェブサイトを訪問してください。"
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Tor のウェブサイト: %1"
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "すべて順次接続は古い接続と異なっているようにみえます。"
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "新しい識別の作成に失敗しました"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Vidalia のコントロール パネル"
+
+msgctxt "MainWindow"
+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 ""
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "バージョンとライセンス情報を表示します"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Vidalia を終了します"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "起動時にこのウィンドウを表示する"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "非表示にする"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "このウィンドウを非表示にします"
+
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgstr "Tor の現在インストールされているバージョンは期限切れであるかもう推奨されない可能性があります。最新のバージョンをダウンロードするには 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 "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 "更新に失敗しました"
+
+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 "Vidalia は Tor サービスをインストールすることができませんでした。"
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+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 ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "Vidalia について"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "ホーム"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "フィルタの設定エラー"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia は Tor のログ イベントを登録することができませんでした。"
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "ログ ファイルのオープン エラー"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia は指定されたログ ファイルを開くことができませんでした。"
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "ログのファイル名が必要です"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "ファイルへログ メッセージを保存することができるファイル名を入力する必要があります。"
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "ログ ファイルの選択"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "ログ メッセージの保存"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "テキスト ファイル (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "メッセージ ログから検索"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "検索:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "見つかりません"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "検索が 0 件の一致を見つけました。"
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "メッセージ ログ"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "メッセージ フィルタ..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "メッセージ フィルタを設定します"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "履歴のサイズ..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "表示するメッセージの最大数を設定します"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "クリア"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "メッセージ ログからすべてのメッセージをクリアします (Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "コピー"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "クリップボードへ選択されたメッセージをコピーします (Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "すべて選択"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "すべてのメッセージを選択します (Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "すべて保存"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "ファイルへすべてのメッセージを保存します"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "選択済みの保存"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "ファイルへ選択されたメッセージを保存します"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "設定"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "メッセージ ログの設定を調整します"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "ヘルプ"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "ヘルプ ブラウザを表示します"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "閉じる"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "メッセージ ログを閉じます"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "検索"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "すべての検索テキストを含むメッセージを検索します (Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "時間"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "種類"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "メッセージ"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "現在のメッセージ ログの設定を保存します"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "設定の保存"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "設定への変更を取り消します"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "キャンセル"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "メッセージ フィルタ"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "エラー"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "警告"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "通知"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "情報"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "デバッグ"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "メッセージ ログの履歴"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "メッセージ ログ ウィンドウに表示するメッセージの数です"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "件のメッセージ"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log 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 "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."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor のネットワーク マップ"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "更新"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "Tor リレーと接続の一覧を更新します"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "ヘルプ"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "ネットワーク マップのヘルプを表示します"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "ネットワーク マップのヘルプを表示します"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "閉じる"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "ネットワーク マップを閉じます"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "拡大"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "ネットワーク マップを拡大します"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "縮小"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "ネットワーク マップを縮小します"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "合わせて拡大"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "すべての現在表示されている回路に合わせて拡大します"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "ファイルが見つかりません"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "不明"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr "フルスクリーン表示"
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+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."
+msgstr "インターネットのアクセスにプロキシを使用するには Tor の構成へ IP アドレスまたはホスト名とポート番号を両方指定する必要があります。"
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "ファイアウォールが接続を許可する 1 つより多くのポートを指定する必要があります。"
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' は有効なポート番号ではありません。"
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "インターネットのアクセスにプロキシを使用します"
+
+msgctxt "NetworkPage"
+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 "パスワード:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "ポート:"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "ファイアウォールは特定のポートのみ接続させる"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "ファイアウォールの設定"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "許可されたポート:"
+
+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 ""
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "ISP は Tor ネットワークへの接続をブロックする"
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+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 "一覧から選択されたブリッジを削除します"
+
+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 "Policy"
+msgid "accept"
+msgstr "accept"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "reject"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "オンライン"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "休止状態"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "オフライン"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "場所:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "IP アドレス:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "プラットフォーム:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "帯域幅:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "アップ時間:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "最終更新:"
+
+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:"
+msgstr "状態"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "場所:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "IP アドレス:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "プラットフォーム:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "帯域幅:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "アップ時間:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "連絡先情報:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "最終更新:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "オフライン"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "休止状態"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "リレー"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "リレーへの拡大と縮小"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "コピー"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr ""
+
+msgctxt "ServerPage"
+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."
+msgstr "検閲されたユーザーのブリッジ リレーとなるよう Tor を構成していますが、Tor のバージョンがブリッジをサポートしません。"
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "Tor ソフトウェアをアップグレードするか通常の Tor リレーとなるよう Tor を構成してください。"
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "ブリッジ リレーは起動されていません。"
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "少なくともリレーのニックネームとポートを指定する必要があります。"
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Tor ネットワークのトラフィックをリレーする"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "リレーのポート:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "ディレクトリのポート:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "ディレクトリのポート番号です"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "連絡先情報:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "リレーの名前です"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "ユーザーおよびその他のリレーがリレーに接触できるポートです"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "ニックネーム:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "基本設定"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "高速なダウンロードの速度だが低速なアップロードのインターネット接続は、ここでアップロードの速度を記載してください。"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "ケーブル/DSL 256 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "ケーブル/DSL 512 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "ケーブル/DSL 768 Kbps"
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/ケーブル/DSL 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "カスタム"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "もっともインターネット接続に酷似したエントリを選択します"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "帯域幅レートの制限のヘルプ トピックを表示します"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "平均レート"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "長期間の平均帯域幅の制限です"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+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 "帯域幅の最大レートは帯域幅の平均レート以上である必要があります。両方の値は少なくとも 20 KB/s である必要があります。"
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "帯域幅の制限"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "ポート 6660 - 6669 および 6697 です"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "インターネット リレー チャット (IRC)"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "ポート 110、143、993 および 995 です"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "メールの回収 (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "その他のチェックボックスで未指定のポートです"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "その他のサービス"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "ポート 706、1863、5050、5190、5222、8300 および 8888 です {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "インスタント メッセージング (IM)"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "ポート 443 です"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "セキュア ウェブサイト (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "ポート 80 です"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "ウェブサイト"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "終了ポリシーのヘルプ トピックを表示します"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "終了ポリシー"
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr "その他をこの行で与えてブリッジをアクセスさせる:"
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "これはその他の人々へ与えられるブリッジ リレーの識別です"
+
+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 は %1 の設定を保存することができませんでした。"
+
+msgctxt "ServerPage"
+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 ""
+
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network"
+msgstr "検閲された Tor ネットワークに達するユーザーを支援する (Tor 0.2.0.8-alpha 以上)"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr "<a href=\"bridges.finding\">ブリッジを見つけるには?</a>"
+
+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 ""
+
+msgctxt "ServicePage"
+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."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "エラー"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+msgctxt "Stream"
+msgid "New"
+msgstr "新規"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "解決しています"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "接続しています"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "オープン"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "失敗しました"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "閉じました"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "再試行しています"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "再マップしました"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "不明"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "プロセス %1 が停止に失敗しました。[%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "Tor サービスはインストールされていません。"
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "Tor サービスを開始することができません。"
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "コントロール パスワードのハッシュに失敗しました。"
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+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 "OK"
+
+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 "Tor の更新が利用可能です"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "キャンセル"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "はい"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "いいえ"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "ヘルプ"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "再試行"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "ログの表示"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "設定の表示"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "続行"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "終了"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "参照"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "不正な引数"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia はすでに起動しています"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "この使用法メッセージを表示して終了します。"
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "すべての格納されている Vidalia の設定をリセットします。"
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Vidalia がデータ ファイルに使用するディレクトリを設定します。"
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Vidalia の pidfile の名前と場所を設定します。"
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Vidalia の logfile の名前と場所を設定します。"
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Vidalia のログの冗長さを設定します。"
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Vidalia のインターフェイス スタイルを設定します。"
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Vidalia の言語を設定します。"
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Vidalia の使用情報"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "ログ ファイル '%1' を開くことができません: %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr "%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 ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ka/qt_ka.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ka/qt_ka.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ka/qt_ka.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ka/vidalia_ka.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ka/vidalia_ka.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ka/vidalia_ka.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/km/qt_km.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/km/qt_km.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/km/qt_km.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/km/vidalia_km.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/km/vidalia_km.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/km/vidalia_km.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ko/qt_ko.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ko/qt_ko.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ko/qt_ko.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ko/vidalia_ko.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ko/vidalia_ko.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ko/vidalia_ko.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ku/qt_ku.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ku/qt_ku.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ku/qt_ku.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ku/vidalia_ku.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ku/vidalia_ku.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ku/vidalia_ku.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/mt/qt_mt.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/mt/qt_mt.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/mt/qt_mt.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/mt/vidalia_mt.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/mt/vidalia_mt.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/mt/vidalia_mt.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/nb/qt_nb.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/nb/qt_nb.po
new file mode 100644
index 0000000..a2db4ff
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/nb/qt_nb.po
@@ -0,0 +1,442 @@
+msgid ""
+msgstr ""
+"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: 2009-12-25 09:59-0700\n"
+"Last-Translator: Cato Auestad <c2auestad 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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "Aktiver"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "Kjørbare '%1' krever Qt %2, fant Qt %3."
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "Inkompatibelt Qt bibliotekfeil"
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "QT_LAYOUT_DIRECTION"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "Aktiverer programmets hovedvindu"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "OK"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "Lagre"
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "Åpne"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "Lukk"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "Bruk"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "Tilbakestill"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "Hjelp"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "Ikke lagre"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "Forkast"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "&Ja"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "Ja til &Alt"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "&Nei"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "&Nei til Alt"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "Lagre alt"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "Avbryt"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "Prøv på nytt"
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "Ignorer"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "Tilbakestill til standard"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "Lukk uten å lagre"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "&OK"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "Navn"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "Størrelse"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "Slag"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "Type"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "Modifisert dato"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "Alle filer (*)"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "Kataloger"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "&Åpne"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "&Lagre"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "Åpne"
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"%1 finnes allerede.\n"
+"Vil du overskrive?"
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+"%1\n"
+"Filen ble ikke funnet.\n"
+"Vennligst se at riktig filnavn ble angitt."
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "Min Datamaskin"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "&Gi nytt navn"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "&Slett"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "Vis &skjulte filer"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "Tilbake"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "Foreldrekatalog"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "Vis liste"
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "Vis detaljer"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "Filer av type:"
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "Katalog:"
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+"%1\n"
+"Katalogen ble ikke funnet.\n"
+"Vennligst se at riktig katalognavn ble angitt."
+
+#: 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?"
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "Er du sikker på at du vil slette '%1'?"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "Kunne ikke slette katalog."
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "Alle filer (*.*)"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "Lagre som"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "Disk"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "Fil"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "Finn katalog"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "Vis "
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "Fremover"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "Ny mappe"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "&Ny Mappe"
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "&Velg"
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "Fjern"
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "&Filnavn:"
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "Se i:"
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "Lag ny mappe"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "Invalid filename"
+msgstr "Ugyldig filnavn"
+
+#: 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>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"
+msgid "Name"
+msgstr "Navn"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "Størrelse"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "Slag"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "Type"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "Modifisert dato"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "Min Datamaskin"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "Datamaskin"
+
+#: 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 bytes"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/nb/vidalia_nb.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/nb/vidalia_nb.po
new file mode 100644
index 0000000..c4294f2
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/nb/vidalia_nb.po
@@ -0,0 +1,3370 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2009-12-26 05:53-0700\n"
+"Last-Translator: Cato Auestad <c2auestad at gmail.com>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Om Vidalia"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "Lisens"
+
+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 "AboutDialog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "Qt"
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr "versjon"
+
+msgctxt "AdvancedPage"
+msgid "'%1' is not a valid IP address."
+msgstr "'%1' er ikke en gyldig IP adresse."
+
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "Du valgte 'Passord' autentisering, men du spesifiserte ikke ett passord."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Velg konfigurasjonsfil for Tor"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Finner ikke filen"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 finnes ikke. Vil du opprette den?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Klarte ikke å lage fil"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "Kunne ikke opprette %1 [%2]"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Velg en mappe for lagring av Tors data"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Kunne ikke fjerne Tor-tjenesten"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "Kunne ikke installere Tor-tjenesten"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "Vidalia klarte ikke å installere Tor-tjenesten"
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Kontrollport"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "Autentisering:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Adresse:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "Ingen"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Informasjonskapsel"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Passord"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "Generer tilfeldig"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Tor-konfigurasjonsfil"
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "Start Tor med den spesifiserte konfigurasjonsfilen (torrc)"
+
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "Velg bane til konfigurasjonsfilen"
+
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Bla"
+
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr "Datamappe"
+
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr "Lagre Tor-data i følgende mappe"
+
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr "Velg mappen der Tor lagrer data"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+"Vidalia klarte ikke å fjerne Tor-tjenesten.\n"
+"\n"
+"Du kan bli nødt til å måtte fjerne det manuelt."
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Språk"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Velg språket du vil Vidalia skal bruke"
+
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Stil"
+
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Velg stil for Vidalia's grensesnitt"
+
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr "Vidalia kunne ikke laste inn den valgte språkoversettelsen"
+
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr "Siden:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Skjul innstillinger"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Vis innstillinger"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Tor båndbreddeforbruk"
+
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "Tilbakestill"
+
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Inngående hastighet"
+
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Utgående hastighet"
+
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Alltid øverst"
+
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Stil"
+
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Endrer transparentnivået for grafen av båndbreddeforbruket"
+
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% Ugjennomsiktig"
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Lagre"
+
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Avbryt"
+
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr "Starter HTTPS-broforespørsel"
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr "Kobler til %1:%2..."
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr "Sender en HTTP-forespørsel for broer..."
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr "Laster ned liste av broer..."
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr "Laster ned broer"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr "Klarte ikke å laste ned broer: %1"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr "Prøver på broforespørsel igjen..."
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr "Land"
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr "# Klienter"
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr "Klienter fra følgende land har brukt din relé siden %1"
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr "Oversikt over broforbruk."
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr "Oppsummering av klient"
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "Ny"
+
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Åpne"
+
+msgctxt "Circuit"
+msgid "Building"
+msgstr "Bygger"
+
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Feilet"
+
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Lukket"
+
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Ukjent"
+
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Tom Sti>"
+
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Forbindelse"
+
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "Status"
+
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Skaler til krets"
+
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "Lukk krets (Del)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Lukk strøm (Del)"
+
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "Generell"
+
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Nettverk"
+
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr "Deling"
+
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "Tjenester"
+
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Utseende"
+
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Avansert"
+
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Hjelp"
+
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Feil ved lagring av innstillinger"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr "Vidalia klarte ikke å lagre dine %1 innstillinger."
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Feil ved aktivering av innstillinger"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia kunne ikke aktivere dine %1 innstillinger for Tor."
+
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Innstillinger"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Vidalia klarte ikke å koble seg til Tor. (%1)"
+
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "Kontroll-socket er ikke tilkoblet."
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "Passord kreves"
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
+msgstr "Husk passordet"
+
+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:"
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "Kontroll-socket er ikke tilkoblet."
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Feil ved sending av kontrollkommando. [%1]"
+
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr "Forbindelsen ble avbrutt mens det ble forsøkt å lese data."
+
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Ugyldig kontrollsvar: [%1]"
+
+msgctxt "CountryInfo"
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+msgctxt "CountryInfo"
+msgid "Andorra"
+msgstr "Andorra"
+
+msgctxt "CountryInfo"
+msgid "Angola"
+msgstr "Angola"
+
+msgctxt "CountryInfo"
+msgid "Antigua & Barbuda"
+msgstr "Antigua og Barbuda"
+
+msgctxt "CountryInfo"
+msgid "Argentina"
+msgstr "Argentina"
+
+msgctxt "CountryInfo"
+msgid "Armenia"
+msgstr "Armenia"
+
+msgctxt "CountryInfo"
+msgid "Australia"
+msgstr "Australia"
+
+msgctxt "CountryInfo"
+msgid "Azerbaijan"
+msgstr "Aserbajdsjan"
+
+msgctxt "CountryInfo"
+msgid "Bahamas"
+msgstr "Bahamas"
+
+msgctxt "CountryInfo"
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+msgctxt "CountryInfo"
+msgid "Barbados"
+msgstr "Barbados"
+
+msgctxt "CountryInfo"
+msgid "Belarus"
+msgstr "Hviterussland"
+
+msgctxt "CountryInfo"
+msgid "Belgium"
+msgstr "Belgia"
+
+msgctxt "CountryInfo"
+msgid "Belize"
+msgstr "Belize"
+
+msgctxt "CountryInfo"
+msgid "Bhutan"
+msgstr "Bhutan"
+
+msgctxt "CountryInfo"
+msgid "Bolivia"
+msgstr "Bolivia"
+
+msgctxt "CountryInfo"
+msgid "Bosnia & Herzegovina"
+msgstr "Bosnia og Herzegovina"
+
+msgctxt "CountryInfo"
+msgid "Botswana"
+msgstr "Botswana"
+
+msgctxt "CountryInfo"
+msgid "Brazil"
+msgstr "Brasil"
+
+msgctxt "CountryInfo"
+msgid "Brunei Darussalam"
+msgstr "Brunei Darussalam"
+
+msgctxt "CountryInfo"
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+msgctxt "CountryInfo"
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+msgctxt "CountryInfo"
+msgid "Burundi"
+msgstr "Burundi"
+
+msgctxt "CountryInfo"
+msgid "Cambodia"
+msgstr "Kambodsja"
+
+msgctxt "CountryInfo"
+msgid "Cameroon"
+msgstr "Kamerun"
+
+msgctxt "CountryInfo"
+msgid "Canada"
+msgstr "Kanada"
+
+msgctxt "CountryInfo"
+msgid "Cape Verde"
+msgstr "Kapp Verde"
+
+msgctxt "CountryInfo"
+msgid "Central African Republic"
+msgstr "Den sentralafrikanske republikk"
+
+msgctxt "CountryInfo"
+msgid "Chad"
+msgstr "Tsjad"
+
+msgctxt "CountryInfo"
+msgid "Chile"
+msgstr "Chile"
+
+msgctxt "CountryInfo"
+msgid "China"
+msgstr "Kina"
+
+msgctxt "CountryInfo"
+msgid "Colombia"
+msgstr "Colombia"
+
+msgctxt "CountryInfo"
+msgid "Comoros"
+msgstr "Komorene"
+
+msgctxt "CountryInfo"
+msgid "Congo, The Democratic Republic of the"
+msgstr "Kongo, Den demokratiske republikken av"
+
+msgctxt "CountryInfo"
+msgid "Congo"
+msgstr "Kongo"
+
+msgctxt "CountryInfo"
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+msgctxt "CountryInfo"
+msgid "Cote d’Ivoire"
+msgstr "Elfenbenskysten"
+
+msgctxt "CountryInfo"
+msgid "Croatia"
+msgstr "Kroatia"
+
+msgctxt "CountryInfo"
+msgid "Cuba"
+msgstr "Kuba"
+
+msgctxt "CountryInfo"
+msgid "Cyprus"
+msgstr "Kypros"
+
+msgctxt "CountryInfo"
+msgid "Czech Republic"
+msgstr "Tsjekkia"
+
+msgctxt "CountryInfo"
+msgid "Denmark"
+msgstr "Danmark"
+
+msgctxt "CountryInfo"
+msgid "Djibouti"
+msgstr "Djibouti"
+
+msgctxt "CountryInfo"
+msgid "Dominica"
+msgstr "Dominica"
+
+msgctxt "CountryInfo"
+msgid "Dominican Republic"
+msgstr "Den Dominikanske Republikk"
+
+msgctxt "CountryInfo"
+msgid "Ecuador"
+msgstr "Ecuador"
+
+msgctxt "CountryInfo"
+msgid "Egypt"
+msgstr "Egypt"
+
+msgctxt "CountryInfo"
+msgid "El Salvador"
+msgstr "El Salvador"
+
+msgctxt "CountryInfo"
+msgid "Equatorial Guinea"
+msgstr "Guinea"
+
+msgctxt "CountryInfo"
+msgid "Eritrea"
+msgstr "Eritrea"
+
+msgctxt "CountryInfo"
+msgid "Estonia"
+msgstr "Estland"
+
+msgctxt "CountryInfo"
+msgid "France"
+msgstr "Frankrike"
+
+msgctxt "CountryInfo"
+msgid "Gabon"
+msgstr "Gabon"
+
+msgctxt "CountryInfo"
+msgid "Gambia"
+msgstr "Gambia"
+
+msgctxt "CountryInfo"
+msgid "Georgia"
+msgstr "Georgia"
+
+msgctxt "CountryInfo"
+msgid "Germany"
+msgstr "Tyskland"
+
+msgctxt "CountryInfo"
+msgid "Ghana"
+msgstr "Ghana"
+
+msgctxt "CountryInfo"
+msgid "Grenada"
+msgstr "Grenada"
+
+msgctxt "CountryInfo"
+msgid "Guatemala"
+msgstr "Guatemala"
+
+msgctxt "CountryInfo"
+msgid "Guinea"
+msgstr "Guinea"
+
+msgctxt "CountryInfo"
+msgid "Guinea-Bissau"
+msgstr "Guinea-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 "Israel"
+
+msgctxt "CountryInfo"
+msgid "Italy"
+msgstr "Italia"
+
+msgctxt "CountryInfo"
+msgid "Jamaica"
+msgstr "Jamaica"
+
+msgctxt "CountryInfo"
+msgid "Japan"
+msgstr "Japan"
+
+msgctxt "CountryInfo"
+msgid "Jordan"
+msgstr "Jordan"
+
+msgctxt "CountryInfo"
+msgid "Kazakhstan"
+msgstr "Kasakhstan"
+
+msgctxt "CountryInfo"
+msgid "Kenya"
+msgstr "Kenya"
+
+msgctxt "CountryInfo"
+msgid "Kiribati"
+msgstr "Kiribati"
+
+msgctxt "CountryInfo"
+msgid "Kuwait"
+msgstr "Kuwait"
+
+msgctxt "CountryInfo"
+msgid "Kyrgyzstan"
+msgstr "Kirgisistan"
+
+msgctxt "CountryInfo"
+msgid "Laos"
+msgstr "Laos"
+
+msgctxt "CountryInfo"
+msgid "Latvia"
+msgstr "Latvia"
+
+msgctxt "CountryInfo"
+msgid "Lebanon"
+msgstr "Libanon"
+
+msgctxt "CountryInfo"
+msgid "Lesotho"
+msgstr "Lesotho"
+
+msgctxt "CountryInfo"
+msgid "Liberia"
+msgstr "Liberia"
+
+msgctxt "CountryInfo"
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+msgctxt "CountryInfo"
+msgid "Lithuania"
+msgstr "Litauen"
+
+msgctxt "CountryInfo"
+msgid "Luxembourg"
+msgstr "Luxembourg"
+
+msgctxt "CountryInfo"
+msgid "Macedonia"
+msgstr "Makedonia"
+
+msgctxt "CountryInfo"
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+msgctxt "CountryInfo"
+msgid "Malawi"
+msgstr "Malawi"
+
+msgctxt "CountryInfo"
+msgid "Malaysia"
+msgstr "Malaysia"
+
+msgctxt "CountryInfo"
+msgid "Mali"
+msgstr "Mali"
+
+msgctxt "CountryInfo"
+msgid "Malta"
+msgstr "Malta"
+
+msgctxt "CountryInfo"
+msgid "Marshall Islands"
+msgstr "Marshall-øyene"
+
+msgctxt "CountryInfo"
+msgid "Mauritania"
+msgstr "Mauritania"
+
+msgctxt "CountryInfo"
+msgid "Mauritius"
+msgstr "Mauritius"
+
+msgctxt "CountryInfo"
+msgid "Micronesia"
+msgstr "Mikronesia"
+
+msgctxt "CountryInfo"
+msgid "Moldova"
+msgstr "Moldova"
+
+msgctxt "CountryInfo"
+msgid "Monaco"
+msgstr "Monaco"
+
+msgctxt "CountryInfo"
+msgid "Mongolia"
+msgstr "Mongolia"
+
+msgctxt "CountryInfo"
+msgid "Montenegro"
+msgstr "Montenegro"
+
+msgctxt "CountryInfo"
+msgid "Morocco"
+msgstr "Marokko"
+
+msgctxt "CountryInfo"
+msgid "Mozambique"
+msgstr "Mosambik"
+
+msgctxt "CountryInfo"
+msgid "Namibia"
+msgstr "Namibia"
+
+msgctxt "CountryInfo"
+msgid "Nauru"
+msgstr "Nauru"
+
+msgctxt "CountryInfo"
+msgid "Nepal"
+msgstr "Nepal"
+
+msgctxt "CountryInfo"
+msgid "Netherlands"
+msgstr "Nederland"
+
+msgctxt "CountryInfo"
+msgid "New Zealand"
+msgstr "Ny-Zealand"
+
+msgctxt "CountryInfo"
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+msgctxt "CountryInfo"
+msgid "Niger"
+msgstr "Niger"
+
+msgctxt "CountryInfo"
+msgid "Nigeria"
+msgstr "Nigeria"
+
+msgctxt "CountryInfo"
+msgid "Norway"
+msgstr "Norge"
+
+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 Ny-Guinea"
+
+msgctxt "CountryInfo"
+msgid "Paraguay"
+msgstr "Paraguay"
+
+msgctxt "CountryInfo"
+msgid "Peru"
+msgstr "Peru"
+
+msgctxt "CountryInfo"
+msgid "Philippines"
+msgstr "Filippinene"
+
+msgctxt "CountryInfo"
+msgid "Poland"
+msgstr "Polen"
+
+msgctxt "CountryInfo"
+msgid "Portugal"
+msgstr "Portugal"
+
+msgctxt "CountryInfo"
+msgid "Qatar"
+msgstr "Qatar"
+
+msgctxt "CountryInfo"
+msgid "Romania"
+msgstr "Romania"
+
+msgctxt "CountryInfo"
+msgid "Russia"
+msgstr "Russland"
+
+msgctxt "CountryInfo"
+msgid "Rwanda"
+msgstr "Rwanda"
+
+msgctxt "CountryInfo"
+msgid "Saint Kitts & Nevis"
+msgstr "Saint Kitts og Nevis"
+
+msgctxt "CountryInfo"
+msgid "Saint Lucia"
+msgstr "Saint Lucia"
+
+msgctxt "CountryInfo"
+msgid "Saint Vincent & the Grenadines"
+msgstr "Saint Vincent og Grenadinene"
+
+msgctxt "CountryInfo"
+msgid "Samoa"
+msgstr "Samoa"
+
+msgctxt "CountryInfo"
+msgid "San Marino"
+msgstr "San Marino"
+
+msgctxt "CountryInfo"
+msgid "Sao Tome & Principe"
+msgstr "Sao Tome og Principe"
+
+msgctxt "CountryInfo"
+msgid "Saudi Arabia"
+msgstr "Saudi-Arabia"
+
+msgctxt "CountryInfo"
+msgid "Senegal"
+msgstr "Senegal"
+
+msgctxt "CountryInfo"
+msgid "Serbia"
+msgstr "Serbia"
+
+msgctxt "CountryInfo"
+msgid "Seychelles"
+msgstr "Seychellene"
+
+msgctxt "CountryInfo"
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+msgctxt "CountryInfo"
+msgid "Singapore"
+msgstr "Singapore"
+
+msgctxt "CountryInfo"
+msgid "Slovakia"
+msgstr "Slovakia"
+
+msgctxt "CountryInfo"
+msgid "Slovenia"
+msgstr "Slovenia"
+
+msgctxt "CountryInfo"
+msgid "Solomon Islands"
+msgstr "Salomonøyene"
+
+msgctxt "CountryInfo"
+msgid "Somalia"
+msgstr "Somalia"
+
+msgctxt "CountryInfo"
+msgid "South Africa"
+msgstr "Sør-Afrika"
+
+msgctxt "CountryInfo"
+msgid "Spain"
+msgstr "Spania"
+
+msgctxt "CountryInfo"
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+msgctxt "CountryInfo"
+msgid "Sudan"
+msgstr "Sudan"
+
+msgctxt "CountryInfo"
+msgid "Suriname"
+msgstr "Surinam"
+
+msgctxt "CountryInfo"
+msgid "Swaziland"
+msgstr "Swaziland"
+
+msgctxt "CountryInfo"
+msgid "Sweden"
+msgstr "Sverige"
+
+msgctxt "CountryInfo"
+msgid "Switzerland"
+msgstr "Sveits"
+
+msgctxt "CountryInfo"
+msgid "Syria"
+msgstr "Syria"
+
+msgctxt "CountryInfo"
+msgid "Tajikistan"
+msgstr "Tadsjikistan"
+
+msgctxt "CountryInfo"
+msgid "Tanzania"
+msgstr "Tanzania"
+
+msgctxt "CountryInfo"
+msgid "Thailand"
+msgstr "Thailand"
+
+msgctxt "CountryInfo"
+msgid "Timor-Leste (East Timor)"
+msgstr "Øst-Timor"
+
+msgctxt "CountryInfo"
+msgid "Togo"
+msgstr "Togo"
+
+msgctxt "CountryInfo"
+msgid "Tonga"
+msgstr "Tonga"
+
+msgctxt "CountryInfo"
+msgid "Trinidad & Tobago"
+msgstr "Trinidad og Tobago"
+
+msgctxt "CountryInfo"
+msgid "Tunisia"
+msgstr "Tunisia"
+
+msgctxt "CountryInfo"
+msgid "Turkey"
+msgstr "Tyrkia"
+
+msgctxt "CountryInfo"
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+msgctxt "CountryInfo"
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+msgctxt "CountryInfo"
+msgid "Uganda"
+msgstr "Uganda"
+
+msgctxt "CountryInfo"
+msgid "Ukraine"
+msgstr "Ukraina"
+
+msgctxt "CountryInfo"
+msgid "United Arab Emirates"
+msgstr "De Forente Arabiske Emirater"
+
+msgctxt "CountryInfo"
+msgid "United Kingdom"
+msgstr "Storbritania"
+
+msgctxt "CountryInfo"
+msgid "United States"
+msgstr "Amerikas Forente Stater"
+
+msgctxt "CountryInfo"
+msgid "Uruguay"
+msgstr "Uruguay"
+
+msgctxt "CountryInfo"
+msgid "Uzbekistan"
+msgstr "Usbekistan"
+
+msgctxt "CountryInfo"
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+msgctxt "CountryInfo"
+msgid "Vatican"
+msgstr "Vatikanet"
+
+msgctxt "CountryInfo"
+msgid "Venezuela"
+msgstr "Venezuela"
+
+msgctxt "CountryInfo"
+msgid "Vietnam"
+msgstr "Vietnam"
+
+msgctxt "CountryInfo"
+msgid "Western Sahara"
+msgstr "Vest-Sahara"
+
+msgctxt "CountryInfo"
+msgid "Yemen"
+msgstr "Jemen"
+
+msgctxt "CountryInfo"
+msgid "Zambia"
+msgstr "Zambia"
+
+msgctxt "CountryInfo"
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+msgctxt "CountryInfo"
+msgid "Albania"
+msgstr "Albania"
+
+msgctxt "CountryInfo"
+msgid "Algeria"
+msgstr "Algerie"
+
+msgctxt "CountryInfo"
+msgid "Austria"
+msgstr "Østerrike"
+
+msgctxt "CountryInfo"
+msgid "Bahrain"
+msgstr "Bahrain"
+
+msgctxt "CountryInfo"
+msgid "Benin"
+msgstr "Benin"
+
+msgctxt "CountryInfo"
+msgid "Ethiopia"
+msgstr "Etiopia"
+
+msgctxt "CountryInfo"
+msgid "Fiji"
+msgstr "Fiji"
+
+msgctxt "CountryInfo"
+msgid "Finland"
+msgstr "Finland"
+
+msgctxt "CountryInfo"
+msgid "Greece"
+msgstr "Hellas"
+
+msgctxt "CountryInfo"
+msgid "Guam"
+msgstr "Guam"
+
+msgctxt "CountryInfo"
+msgid "Hungary"
+msgstr "Ungarn"
+
+msgctxt "CountryInfo"
+msgid "Iceland"
+msgstr "Island"
+
+msgctxt "CountryInfo"
+msgid "India"
+msgstr "India"
+
+msgctxt "CountryInfo"
+msgid "Indonesia"
+msgstr "Indonesia"
+
+msgctxt "CountryInfo"
+msgid "Iran"
+msgstr "Iran"
+
+msgctxt "CountryInfo"
+msgid "Iraq"
+msgstr "Irak"
+
+msgctxt "CountryInfo"
+msgid "Ireland"
+msgstr "Irland"
+
+msgctxt "CountryInfo"
+msgid "Korea, North"
+msgstr "Nord-Korea"
+
+msgctxt "CountryInfo"
+msgid "Korea, South"
+msgstr "Sør-Korea"
+
+msgctxt "CountryInfo"
+msgid "Libya"
+msgstr "Libya"
+
+msgctxt "CountryInfo"
+msgid "Maldives"
+msgstr "Maldivene"
+
+msgctxt "CountryInfo"
+msgid "Mexico"
+msgstr "Mexico"
+
+msgctxt "CountryInfo"
+msgid "Myanmar"
+msgstr "Burma"
+
+msgctxt "CountryInfo"
+msgid "Taiwan"
+msgstr "Taiwan"
+
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Kjørbare filer (*.exe)"
+
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Velg sti til Tor"
+
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "Velg kjørbar proxy-fil"
+
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr "Du må spesifisere navnet på din kjørbare Tor-fil."
+
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr "Proxy-argumentene som er spesifisert er ikke riktig formatert."
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr "Start Vidalia når systemet starter"
+
+msgctxt "GeneralPage"
+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"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr "Proxy-applikasjon (valgfritt)"
+
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "Start en proxy-applikasjon når Tor starter"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Proxy-applikasjons argumenter:"
+
+msgctxt "GeneralPage"
+msgid "Software Updates"
+msgstr "Programvareoppdateringer"
+
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
+msgstr "Automatisk sjekk for programvareopdateringer"
+
+msgctxt "GeneralPage"
+msgid "Check Now"
+msgstr "Sjekk nå"
+
+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 "Mottatt:"
+
+msgctxt "GraphFrame"
+msgid "Sent:"
+msgstr "Sendt:"
+
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr "Den oppgitte XML-filen er ikke ett dokument med gyldig innhold."
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "Søket nådde slutten av dokumentet"
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "Søket nådde begynnelsen av dokumentet"
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "Fant ikke teksten i dokumentet"
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "Fant %1 resultater"
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Vidalia Hjelp"
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Tilbake"
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Gå til forrige side (Slettetast)"
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Slettetast"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Fremover"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Gå til neste side (Shift+Slettetast)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Slettetast"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Hjem"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Flytt til Hjem-siden (Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Finn"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "Søk etter ord eller streng på denne siden (Ctrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Lukk"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Lukk Vidalia Hjelp"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Finn:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Finn Forrige"
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Finn Neste"
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "Skill mellom store og små bokstaver"
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Kun hele ord"
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Hjelpe-emner"
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Innhold"
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Søk"
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Søker etter:"
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Dokumenter Funnet"
+
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
+msgstr "Feil ved lasting av hjelpedokumenter:"
+
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr "Åpner ekstern lenke"
+
+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 åpne lenken du valgte i din standard nettleser. Hvis din "
+"nettleser er foreløpig ikke konfigurert til å bruke Tor vil forespørsel ikke "
+"bli anonym."
+
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr "Ønsker du at Vidalia åpner lenken i nettleseren?"
+
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr "Kunne ikke åpne lenke"
+
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr "Vidalia kunne ikke åpne den valgte lenken i nettleseren. Du kan kopiere URL-en og lime den inn i nettleseren."
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr "Feil ved åpning av hjelpefil:"
+
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr "Lisensinformasjon"
+
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "Lisens"
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr "Medvirkende"
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "Feilsøk"
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Info"
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Merknad"
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Advarsel"
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Feil"
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Ukjent"
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "Start Tor"
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Avslutt"
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Båndbredde Graf"
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Meldingslogg"
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Nettverkskart"
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr "Kontrollpanel"
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Innstillinger"
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr "Om"
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr "Hjelp"
+
+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"
+
+msgctxt "MainWindow"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia klarte ikke å starte den konfigurerte nettleseren"
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "Feil ved start av IM-klient"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "Vidalia klarte ikke å starte den konfigurerte IM-klienten"
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Feil ved start av proxy-server"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia klarte ikke å starte den konfigurerte proxy-serveren"
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Kobler til en relékatalog "
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "Etablerer en kryptert katalogforbindelse"
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "Mottar nettverkstatus"
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "Laster nettverkstatus"
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "Laster serfikater for autoritet"
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "Sender forespørsel om reléinformasjon"
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "Laster reléinformasjon"
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "Kobler til Tor-nettverket"
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "Etablerer en Tor-rute"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "feil identitet"
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr "ferdig"
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "forbindelse nektet"
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "forbindelse tidsavbrutt"
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "lese/skrive feil"
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "ingen rute til vert"
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "ikke nok resursser"
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "ukjent"
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor kjører ikke"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Starter Tor-programvare"
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "Starter Tor"
+
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Feil ved oppstart av 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 kunne ikke starte Tor. Sjekk innstillingene dine for å sikre at du har oppgitt Tor-programmets riktige navn og plassering."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "Kobler til Tor"
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "Feil på forbindelse"
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "Reléet er aktivert"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "Feil ved avslutning"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "Vidalia kunne ikke stoppe Tor."
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "Uventet feil"
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Autentiserer mot Tor"
+
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "Autentisering ved hjelp av informasjonskapsler påkrevd"
+
+msgctxt "MainWindow"
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgstr ""
+"Tor-programvaren trenger at Vidalia sender innholdet i en informasjonskapsel "
+"for autentisering, men Vidalia klarte ikke å finne én."
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "Vil du lete etter filen 'control_auth_cookie' på egenhånd?"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Datamappe"
+
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Kontrollinformasjonskapsel (control_auth_cookie)"
+
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "Feil oppstått ved registrering av hendelser"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr ""
+"Vidalia klarte ikke å registrere noen hendelser. Mange av Vidalias "
+"funksjoner kan være utilgjengelig."
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Autentiseringsfeil"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia kunne ikke autentisere mot Tor. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Vennligst sjekk innstillingene for autentisering mot kontrollporten"
+
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "Tor-oppdatering tilgjengelig"
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr "Den installerte versjonen av Tor er utdatert eller ikke lengre anbefalt. Besøk nettsiden til Tor for å laste ned nyeste versjon."
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Tor nettside: %1"
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "Alle dine forbindelser vil se annerledes ut enn dine nåværende forbindelser."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "Kunne ikke lage Ny Identitet"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "Portordning feilet"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "Vidalia klarte ikke å konfigurere portordninger automatisk"
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Vidalias Kontrollpanel"
+
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "Status"
+
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Vidalia Snarveier"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Konfigurer videresending (Relé)"
+
+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."
+
+msgctxt "MainWindow"
+msgid "Would you like to check if a newer package is available for installation?"
+msgstr "Vil du undersøke om en nyere pakke er tilgjengelig for innstallasjon?"
+
+msgctxt "MainWindow"
+msgid "Potentially Unsafe Connection"
+msgstr "Potensiell usikker forbindelse"
+
+msgctxt "MainWindow"
+msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
+msgstr ""
+"En av dine programmer %1 ser ut til å lage en potensiell ukryptert og utrygg "
+"forbindelse til port %2. Det som måtte bli sendt over denne forbindelsen "
+"kan bli overvåket. Vennligst sjekk innstillingene på programmet og bruk kun "
+"krypterte protokoller, som SSL, hvis mulig."
+
+msgctxt "MainWindow"
+msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgstr ""
+"Tor har automatisk lukket din forbindelse for å beskytte din anonymitet."
+
+msgctxt "MainWindow"
+msgid "Update Failed"
+msgstr "Oppdatering feilet"
+
+msgctxt "MainWindow"
+msgid "Your software is up to date"
+msgstr "Din programvare er utdatert"
+
+msgctxt "MainWindow"
+msgid "There are no new Tor software packages available for your computer at this time."
+msgstr ""
+"Det er ingen nye Tor-oppdateringer tilgjengelig for ditt system for "
+"øyeblikket."
+
+msgctxt "MainWindow"
+msgid "Installation Failed"
+msgstr "Innstallasjon feilet"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to install your software updates."
+msgstr "Vidalia klarte ikke å innstallere programvareoppdateringene."
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr "Følgende feil skjedde:"
+
+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.\n"
+"Trykk på \"Stopp\" igjen for å stenge din relé nå."
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
+"Du kjører for tiden en relé. Ved å avslutte din relé vil du avslutte alle "
+"åpne forbindelser til klienter.\n"
+"\n"
+"Vil du avslutte gradvis å la klientene få tid til å finne en annen relé?"
+
+msgctxt "MainWindow"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr ""
+"Vidalia oppdaget at Tor-programvaren avsluttet uforventet.\n"
+"\n"
+"Vennligst sjekk meldingshistorikken for en nylig advarsel eller feilmelding."
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", sannsynligvis Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", sannsynligvis en epostklient,"
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr "Fil"
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "Om Vidalia"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Hjem"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr "Se etter oppdateringer"
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Feilet ved innstilling av Filter"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia klarte ikke å hente ut Tor-logghendelser."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "Feil ved åpning av loggfil"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia klarte ikke å åpne spesifisert loggfil."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Loggfilnavn påkrevd"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "Du må oppgi ett filnavn for å kunne lagre loggen til en fil."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Velg Loggfil"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Lagre Loggmeldinger"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Tekstfiler (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Finn i Meldingsloggen"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Finn:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Ikke Funnet"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "Søket ga 0 resultater."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Meldingslogg"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Meldingsfiltre..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Velg meldingsfiltre"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Historikkstørrelse..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Velg maksimum antall meldinger som vises"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Tøm"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Tøm alle meldinger fra Meldingsloggen (Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Kopier"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Kopier valgte meldinger til utklippstavlen (Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Velg alt"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Velg alle meldinger (Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Lagre Alt"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Lagre alle meldinger til en fil"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Lagre merkede"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Lagre merkede meldinger i en fil"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Innstillinger"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Tilpass Innstillinger for Meldingloggen"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Hjelp"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Vis hjelpeleseren"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Lukk"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Lukk Meldingsloggen"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Finn"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Finn alle meldinger som inneholder søketeksten (Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Tid"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Type"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Melding"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Lagre de nåværende innstillingene for Meldingloggen"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Lagre Inntillinger"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Avbryter endring av innstillingene"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Avbryt"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Meldingsfilter"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Feil"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Advarsel"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Merknad"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Info"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Feilsøk"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "Meldingshistorikk"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Antall meldinger som vises i meldingsvinduet"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "meldinger"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Alltid lagre nye loggmeldinger"
+
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "Bla"
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr "Skru på automatisk lagring av alle nye loggmeldinger til en fil"
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "Lagre automatisk nye loggmeldinger til en fil"
+
+msgctxt "MessageLog"
+msgid "Messages that appear when something has \n"
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+"Meldinger som oppstår når noe har gått\n"
+"veldig galt og Tor ikke kan fortsette."
+
+msgctxt "MessageLog"
+msgid "Messages that only appear when \n"
+"something has gone wrong with Tor."
+msgstr ""
+"Meldinger som kun oppstår når\n"
+"noe har gått veldig galt med Tor."
+
+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 ""
+"Meldinger som oppstår av og til\n"
+"under en normal Tor-operasjon og\n"
+"er ikke ansett som feilmeldinger\n"
+"men som du kanskje vil bry deg om."
+
+msgctxt "MessageLog"
+msgid "Messages that appear frequently \n"
+"during normal Tor operation."
+msgstr ""
+"Meldinger som ofte oppstår\n"
+"i en normal Tor-operasjon."
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+"Lange meldinger som er mest\n"
+"av interesse for Tor-utviklere."
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+"Kan ikke skrive til fil %1\n"
+"\n"
+"%2."
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor Nettverkskart"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Oppdater"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "Oppdater listen over Tor-reléer og tilkoblinger"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Hjelp"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Vis hjelpeteksten for nettverkskartet"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Vis hjelpetekst for nettverkskartet"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Lukk"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Lukk nettverkskartet"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Zoom Inn"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Zoom inn på nettverkskartet"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Zoom Ut"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Zoom ut på nettverkskartet"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Zoom til å passe"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Zoomer slik at det passer alle viste forbindelser"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "Relé ikke funnet"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr "Ingen detaljer om den valgte relé er tilgjengelig."
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "Ukjent"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr "Fullskjerm"
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr "Vis nettverkskart i fullskjerm"
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "Ugyldig Bro"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "Den oppgitte broidentifikatoren er ikke gyldig"
+
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr "Kopier (Ctrl+C)"
+
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr "Du må spesifisere både IP adresse eller vertsnavn og et portnummer for å konfigurere Tor til å bruke en proxy for å koble til Internett."
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "Du må spesifisere en eller flere porter som din brannmur tillater deg å koble til."
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' er ikke ett gyldig portnummer."
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr "Sjekk om ditt lokale nettverk krever en proxy for å koble til Internett"
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "Jeg bruker en proxy for å tilknytte Internett"
+
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr "Proxy Innstillinger"
+
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "HTTP Proxy:"
+
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr "Brukernavn:"
+
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "Bruk denne proxyen også for HTTPS"
+
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr "Passord:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "Port:"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+"Velg for kun å koble seg til reléer ved bruk av porter som er åpne i din "
+"brannmur"
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "Brannmuren min lar meg bare tilknytte visse porter"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "Brannmur Innstillinger"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "Tillatte Porter:"
+
+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 ""
+"Velg for å kryptere katalogforespørsler og, valgfritt, bruk broer for å "
+"skape en forbindelse til Tor-nettverket."
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "Min ISP blokkerer forbindelser til Tor-nettverket"
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr "Bro Innstillinger"
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+"Tor-programvaren du kjører har ikke støtte for broer. <br>Katalog "
+"forbindelser vil fortsatt være kryptert."
+
+msgctxt "NetworkPage"
+msgid "Add a Bridge:"
+msgstr "Legg til Bro:"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Hvordan finner jeg en bro?</a>"
+
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr "Fjern de merkede broene fra listen"
+
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr "Kopier de merkede broene til utklippstavlen"
+
+msgctxt "NetworkPage"
+msgid "Find Bridges Now"
+msgstr "Finn broer nå"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
+msgstr "<a href=\"bridges.finding\">Hvordan kan jeg ellers finne broer?</a>"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
+msgstr "<a href=\"bridges.finding\">Hvordan kan jeg finne broer?</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 ""
+"Ingen nye broer er for tiden tilgjengelige. Du kan enten vente og prøve "
+"igjen, eller prøve en annen metode for å finne nye broer."
+
+msgctxt "NetworkPage"
+msgid "Click Help to see other methods of finding new bridges."
+msgstr "Trykk på Hjelp for å se andre metoder for å finne nye broer."
+
+msgctxt "Policy"
+msgid "accept"
+msgstr "aksepter"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "avslå"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Tilkoblet"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Dvalemodus"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Frakoblet"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Sted:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "IP-Adresse:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Plattform:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Båndbredde:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Oppetid:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Sist Oppdatert:"
+
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Kopier"
+
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
+msgstr "Dvalemodus"
+
+msgctxt "RouterInfoDialog"
+msgid "Online"
+msgstr "Tilkoblet"
+
+msgctxt "RouterInfoDialog"
+msgid "Offline"
+msgstr "Frakoblet"
+
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr "Ukjent"
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr "Relé Detaljer"
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr "Oversikt"
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr "Kallenavn:"
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr "Status:"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "Sted:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "IP Adresse:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "Plattform:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "Båndbredde:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "Oppetid:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "Kontakt Info:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "Sist Oppdatert:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr "Beskrivelse"
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Frakoblet"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Dvalemodus"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Relé"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "Zoom til relé"
+
+# "online" er et norsk ord etter
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 reléer online"
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Kopier"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "Kallenavn"
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "Fingeravtrykk"
+
+msgctxt "ServerPage"
+msgid "Bridge Support Unavailable"
+msgstr "Brostøtte mangler"
+
+msgctxt "ServerPage"
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgstr "Du har satt opp Tor til å være et bro-relé for sensurerte brukere, men din versjon av Tor støtter ikke broer."
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "Vennligst oppgrader din Tor programvare eller sett opp Tor som et vanlig relé."
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "Den bro-relé kjører ikke."
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "Du må spesifisere et kallenavn og en port."
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "Kjør kun som klient"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Videresend trafikk for Tor-nettverket (Relé)"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "Reléport:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "Aktiver for å speile relékatalogen"
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "Forsøk på automatisk konfigurere portordninger"
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "Test"
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "Vis hjelpemne om portordninger"
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Katalogport:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Katalogport Nummer"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Kontakt Info:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "Kallenavn på ditt relé"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "Port som andre brukere og reléer kan kommunisere med ditt relé på"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Kallenavn:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Grunnleggende Innstillinger"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Vennligst oppgi din opplastningshastighet her hvis du har rask nedlastningshastighet med treg opplastningshastighet."
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "Kabel/DSL 256 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "Kabel/DSL 512 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "Kabel/DSL 768 Kbps"
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/Kabel/DSL 1,5 Mbps"
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 1,5 Mbps"
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "Egendefinert"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Velg det som best stemmer overens med Internett-forbindelsen din"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Hvis hjelpeteksten for båndbreddebegrensning"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Gjennomsnittshastighet"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Gjennomsnittlig langvarig båndbreddebegrensning"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Maksimal Hastighet"
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "Begrensning for kortvarige båndbreddetopper"
+
+msgctxt "ServerPage"
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr ""
+"Din ratio på maksimal hastighet må være større eller like stor som din "
+"gjennomsnittlige hastighet. Begge verdiene må være minst 20 KB/s."
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Båndbreddebegrensinger"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Port 6660 - 6669 og 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internett Relay Chat (IRC)"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Port 110, 143, 993 og 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Motta E-Post (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Porter ikke angitt i andre avkryssningsbokser"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Diverse Andre Tjenester"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Port 706, 1863, 5050, 5190, 5222, 8300 og 8888"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "Lynmeldinger (IM)"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "Port 443"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "Sikre Nettsider (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Port 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Nettsider"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "Vis hjelpeteksten for tillatte utgående forbindelser"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr ""
+"Hvilke ressurser skal brukere av ditt relé kunne få tilgang til på "
+"internett?"
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr ""
+"Tor vil fortsatt blokkere utgående epost og fildelingsprogrammer med "
+"standardinstillinger for å redusere mengden søppelpost og andre misbruk."
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Regler for utgående trafikk"
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr "La andre bruke din bro ved å gi de denne linjen:"
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "Dette er identiteten til din bro som du kan gi til andre"
+
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr "Kopier din bros identitet til utklippstavlen"
+
+msgctxt "ServerPage"
+msgid "No Recent Usage"
+msgstr "Ingen nylig bruk"
+
+msgctxt "ServerPage"
+msgid "No clients have used your relay recently."
+msgstr "Ingen klienter har brukt din relé nylig."
+
+msgctxt "ServerPage"
+msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgstr ""
+"La din relé kjørende så klienter har større sjanse til å finne og bruke den."
+
+msgctxt "ServerPage"
+msgid "Bridge History"
+msgstr "Meldingshistorikk"
+
+msgctxt "ServerPage"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgstr "Vidalia klarte ikke å lagre dine %1 innstillinger."
+
+msgctxt "ServerPage"
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgstr ""
+"Tor returnerte en feilformatert respons når Vidalia sendte forespørsel om "
+"din bros historikk."
+
+msgctxt "ServerPage"
+msgid "The returned response was: %1"
+msgstr "Den returnerte responsen var: %1"
+
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network"
+msgstr "Hjelp sensurerte brukere å nå Tor nettverket (Tor 0.2.0.8-alpha eller nyere)"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Hvordan finner jeg en bro?</a>"
+
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory"
+msgstr "Speil relékatalogen"
+
+msgctxt "ServerPage"
+msgid "Email address at which you may be reached if there is a\n"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr ""
+"Epostadressen du kan bli nådd på hvis det skulle være et\n"
+"problem med din relé. Du kan også inkludere ditt PGP eller GPG "
+"fingeravtrykk."
+
+msgctxt "ServicePage"
+msgid "Error while trying to unpublish all services"
+msgstr "Feil mens forsøk på å upublisere alle tjenester"
+
+msgctxt "ServicePage"
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
+msgstr ""
+"Vennligst konfigurer minst en tjenestekatalog og en virituell port for hver "
+"tjeneste du vil lagre. Fjern de andre."
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Feil"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "Vennligst velg en tjeneste."
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "Velg tjenestekatalog"
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "Den virtuelle porten kan kun inneholde gyldige portnummer [1..65535]"
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "Målet kan kun inneholdet adresse:port, adresse, eller port."
+
+msgctxt "ServicePage"
+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"
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "Onion-adresse"
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "Virtuell port"
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "Mål"
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "Katalogsti"
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "Aktivert"
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "Legg ny tjeneste til listen"
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "Fjern valgte tjeneste fra listen"
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr "Kopier onion-adressen av valgte tjenester til utklipstavle"
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr "Bla i det lokale filsystemet og velg en katalog for valgte tjeneste"
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "Opprettet av Tor"
+
+msgctxt "Stream"
+msgid "New"
+msgstr "Ny"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Slår opp"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Tilknytter"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "Åpne"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Feilet"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Lukket"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Prøver igjen"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "Omfordelt"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Ukjent"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "Prosess %1 nektet å stoppe. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "Tor-tjenesten er ikke installert"
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "Kunne ikke starte Tor-tjeneren."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "Feil ved kryptering av kontrollpassord."
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "Vellykket"
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "Ingen UPnP-aktiverte enheter funnet"
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "Ingen gyldige UPnP-aktiverte basestasjoner for internett funnet"
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "WSAStartup feilet"
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "Feilet å legge til portkartlegging"
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "Feilet å motta portkartlegging"
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "Feilet å fjerne portkartlegging"
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "Ukjent feil"
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "Oppdager UPnP-aktiverte enheter"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "Oppdaterer katalogportkartlegging"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "Oppdaterer reléportkartlegging"
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "Test vellykket gjennomført!"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "Tester UPnP-støtte"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr "Tester Universal Plug & Play-støtte"
+
+msgctxt "UpdateProcess"
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgstr ""
+"Vidalia kunne ikke sjekke etter tilgjengelige oppdateringer fordi den kunne "
+"ikke finne '%1'"
+
+msgctxt "UpdateProcess"
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgstr ""
+"Vidalia kunne ikke sjekke etter tilgjengelige oppdateringer fordi Tor sin "
+"oppdateringsprosess ble uventet avbrutt."
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for available updates..."
+msgstr "Sjekker etter tilgjengelige oppdateringer..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Hide"
+msgstr "Skjul"
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr "Laster ned oppdateringer..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr "Innstallerer oppdatert programvare..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr "Ferdig! Din programvare er nå oppdatert."
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr "Programvareoppdateringer"
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr "Sjekker for oppdateringer..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr "Avbryt"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr "Tor-oppdatering tilgjengelig"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr "Minn meg på det senere"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr "Innstaller"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr "Følgende oppdaterte programvarepakker er klar for innstallasjon:"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr "Pakke"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr "Versjon"
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Avbryt"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Ja"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Nei"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Hjelp"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Prøv igjen"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Vis Logg"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Vis Innstillinger"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Fortsett"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Avslutt"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Bla"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Ugyldig Argument"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia kjører allerede"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Viser denne meldingen og avslutter."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "Tilbakestill ALLE lagrede innstillinger for Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Velger mappen Vidalia bruker for sine datafiler."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Gir navn og plassering av Vidalia sin pid-fil."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Gir navn og plassering av Vidalia sin loggfil."
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Velger hvor detaljert informasjon Vidalia skal logge."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Velger stil for Vidalia sitt brukergrensesnitt."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Velger Vidalia sitt språk."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Vidalia Bruksinformasjon"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "Kunne ikke åpne loggfil '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr "Ugyldig språkkode angitt:"
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr "Ugyldig GUI-stil angitt:"
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr "Ugyldig loggnivå angitt:"
+
+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 ""
+"Det er mulig en annen Vidalia-prosess kjører. Hvis du er sikker på at det "
+"ikke kjører andre Vidalia-prosesser, kan du velge å fortsette allikevel.\n"
+"\n"
+"Vil du fortsatt starte Vidalia?"
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr "%1 sek."
+
+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 dager"
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr "%1 timer"
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr "%1 minutter"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/nl/qt_nl.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/nl/qt_nl.po
new file mode 100644
index 0000000..ee78004
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/nl/qt_nl.po
@@ -0,0 +1,444 @@
+msgid ""
+msgstr ""
+"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-04-16 05:08-0600\n"
+"Last-Translator: Flabber <flabber at online.be>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "Activeer"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "Programma '%1' heeft Qt %2 nodig, Qt %3 is gevonden."
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "Fout : onverenigbare Qt bibliotheek."
+
+#: qapplication.cpp:2095
+#, fuzzy
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "QT_LAYOUT_DIRECTION"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "Activeert het hoofdscherm van het programma"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "OK"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "Opslaan"
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "Openen"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "Sluiten"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "Toepassen"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "Herstellen"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "Help"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "Niet opslaan"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "Afwijzen"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "&Ja"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "Ja op &alles"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "&Nee"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "N&ee op alles"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "Alles opslaan"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "Afbreken"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "Opnieuw"
+
+#: qdialogbuttonbox.cpp:578
+#, fuzzy
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "Ignoreren"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "Oorspronkelijke terugplaatsen"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "Sluiten zonder opslaan"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "&OK"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "Naam"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "Grootte"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "Soort"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "Type"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "Gewijzigd op"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "Alle bestanden (*)"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "Mappen"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "&Openen"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "Op&slaan"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "Openen"
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"%1 bestaat al.\n"
+"Wil U het vervangen?"
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+"%1\n"
+"Bestand niet gevonden.\n"
+"Controlleer of de bestandsnaam correct was."
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "Mijn computer"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "&Naam wijzigen"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "&Verwijderen"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "Verborgen bestanden &tonen"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "Terug"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "Bovenliggende map"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "Lijst"
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "Details"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "Bestanden van het type:"
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "Map:"
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+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.\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 ?"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "De map kon niet verwijderd worden."
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "Alle bestanden (*.*)"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "Opslaan als"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "Schijf"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "Bestand"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "Map zoeken"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "Tonen"
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "Verder"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "Nieuwe map"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "&Nieuwe map"
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "&Kies"
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "Bestands&naam:"
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "Zoek in:"
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "Nieuwe map aanmaken"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "Invalid filename"
+msgstr "Ongeldige bestandsnaam"
+
+#: 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>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"
+msgid "Name"
+msgstr "Naam"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "Grootte"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "Soort"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "Type"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "Gewijzigd op"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "Mijn computer"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "Computer"
+
+#: 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 bytes"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/nl/vidalia_nl.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/nl/vidalia_nl.po
new file mode 100644
index 0000000..5e06dd4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/nl/vidalia_nl.po
@@ -0,0 +1,3310 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2010-04-16 05:34-0600\n"
+"Last-Translator: Flabber <flabber at online.be>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Over Vidalia"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "Licentie"
+
+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 "AboutDialog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "Qt"
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr "versie"
+
+msgctxt "AdvancedPage"
+msgid "'%1' is not a valid IP address."
+msgstr "'%1' is geen geldig IP adres."
+
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+"U heeft voor paswoordauthenticatie gekozen maar geen paswoord opgegeven."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Tor configuratiebestand selecteren"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Bestand niet gevonden"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 bestaat niet. Wilt u het aanmaken?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Maken van bestand mislukt"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "Aanmaken %1 [%2] niet mogelijk"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Selecteer een map voor de gegevens van Tor"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Verwijderen Tor Service mislukt"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "Installeren Tor Service mislukt"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "Vidalia was niet in staat om de Tor service te installeren."
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Beheer Poort"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "Authenticatie:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Adres:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "geen"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Cookie"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "paswoord"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "willekeurig gegenereerd"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Tor configuratiebestand"
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "Start Tor met het gekozen configuratiebestand (torrc)"
+
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "Selecteer de map van het configuratiebestand"
+
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Bladeren"
+
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr "Gegevensmap"
+
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr "De gegevens van Tor in volgende map opslaan"
+
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr "Selecteer de map om de gegevens van Tor op te slaan"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+"Vidalia kon de Tor service niet verwijderen.\n"
+"\n"
+"De service moet misschien manueel verwijderd worden."
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Taal"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Kies de taal voor gebruik binnen Vidalia"
+
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Stijl"
+
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+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 "BandwidthGraph"
+msgid "Since:"
+msgstr "Sinds:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Instellingen verbergen"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Instellingen Weergeven"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Tor bandbreedte gebruik"
+
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "Reset"
+
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Ontvangstsnelheid"
+
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Verzendsnelheid"
+
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Altijd op de voorgrond"
+
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Stijl"
+
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Verandert de transparantie van de Bandbreedte Grafiek"
+
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% Ondoorzichtig"
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Opslaan"
+
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Annuleren"
+
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr "HTTPS bridge verzoek is gestart..."
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr "Verbinden met %1:%2..."
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr "Sturen van een HTTPS bridge-verzoek..."
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr "Laden van een lijst met bridges..."
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr "Laden van bridges"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr "Laden van bridges mislukt: %1"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr "Hernieuwen bridge-verzoek..."
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr "Land"
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr "# gebruikers"
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr "Gebruikers van de volgende landen hebben uw realy gebruikt sinds %1"
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr "Bridge gebruikssamenvatting"
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr "Gebruikersoverzicht"
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "Nieuw"
+
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Openen"
+
+msgctxt "Circuit"
+msgid "Building"
+msgstr "Opzetten"
+
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Mislukt"
+
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Gesloten"
+
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Onbekend"
+
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Pad Leeg>"
+
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Verbinding"
+
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "Status"
+
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Zoom in op circuit"
+
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "Circuit sluiten (del)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Stream sluiten (del)"
+
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "Algemeen"
+
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Netwerk"
+
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr "Delen"
+
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "Diensten"
+
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Uiterlijk"
+
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Geavanceerd"
+
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Help"
+
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Instellingen opslaan mislukt"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr "Opslaan van %1 instellingen mislukt"
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Instellingen toepassen mislukt"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Toepassen van %1 instellingen mislukt"
+
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Instellingen"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Vidalia kan geen verbinding maken met Tor. (%1)"
+
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "Control socket is niet verbonden."
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "Paswoord noodzakelijk"
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
+msgstr "Onthoud mijn paswoord"
+
+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 paswoord nodig heeft. Gelieve het paswoord op te geven: "
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "Control socket is niet verbonden."
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Fout bij het verzenden van het beheer commando. [%1]"
+
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr "Socket verbrak de verbinding bij poging tot het lezen van een regel met data."
+
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Ongeldig beheer antwoord. [%1]"
+
+msgctxt "CountryInfo"
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+msgctxt "CountryInfo"
+msgid "Andorra"
+msgstr "Andorra"
+
+msgctxt "CountryInfo"
+msgid "Angola"
+msgstr "Angola"
+
+msgctxt "CountryInfo"
+msgid "Antigua & Barbuda"
+msgstr "Antigua & Barbuda"
+
+msgctxt "CountryInfo"
+msgid "Argentina"
+msgstr "Argentinië"
+
+msgctxt "CountryInfo"
+msgid "Armenia"
+msgstr "Armenië"
+
+msgctxt "CountryInfo"
+msgid "Australia"
+msgstr "Australië"
+
+msgctxt "CountryInfo"
+msgid "Azerbaijan"
+msgstr "Azerbaijan"
+
+msgctxt "CountryInfo"
+msgid "Bahamas"
+msgstr "Bahamas"
+
+msgctxt "CountryInfo"
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+msgctxt "CountryInfo"
+msgid "Barbados"
+msgstr "Barbados"
+
+msgctxt "CountryInfo"
+msgid "Belarus"
+msgstr "Wit-Rusland"
+
+msgctxt "CountryInfo"
+msgid "Belgium"
+msgstr "België"
+
+msgctxt "CountryInfo"
+msgid "Belize"
+msgstr "Belize"
+
+msgctxt "CountryInfo"
+msgid "Bhutan"
+msgstr "Bhutan"
+
+msgctxt "CountryInfo"
+msgid "Bolivia"
+msgstr "Bolivië"
+
+msgctxt "CountryInfo"
+msgid "Bosnia & Herzegovina"
+msgstr "Bosnië & Herzegovina"
+
+msgctxt "CountryInfo"
+msgid "Botswana"
+msgstr "Botswana"
+
+msgctxt "CountryInfo"
+msgid "Brazil"
+msgstr "Brazilië"
+
+msgctxt "CountryInfo"
+msgid "Brunei Darussalam"
+msgstr "Brunei Darussalam"
+
+msgctxt "CountryInfo"
+msgid "Bulgaria"
+msgstr "Bulgarije"
+
+msgctxt "CountryInfo"
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+msgctxt "CountryInfo"
+msgid "Burundi"
+msgstr "Burundi"
+
+msgctxt "CountryInfo"
+msgid "Cambodia"
+msgstr "Cambodja"
+
+msgctxt "CountryInfo"
+msgid "Cameroon"
+msgstr "Kameroen"
+
+msgctxt "CountryInfo"
+msgid "Canada"
+msgstr "Canada"
+
+msgctxt "CountryInfo"
+msgid "Cape Verde"
+msgstr "Kaap Verdië"
+
+msgctxt "CountryInfo"
+msgid "Central African Republic"
+msgstr "Centraal Afrikaanse republiek"
+
+msgctxt "CountryInfo"
+msgid "Chad"
+msgstr "Tsjaad"
+
+msgctxt "CountryInfo"
+msgid "Chile"
+msgstr "Chili"
+
+msgctxt "CountryInfo"
+msgid "China"
+msgstr "China"
+
+msgctxt "CountryInfo"
+msgid "Colombia"
+msgstr "Colombia"
+
+msgctxt "CountryInfo"
+msgid "Comoros"
+msgstr "Comoren"
+
+msgctxt "CountryInfo"
+msgid "Congo, The Democratic Republic of the"
+msgstr "Democratische Republiek van Congo"
+
+msgctxt "CountryInfo"
+msgid "Congo"
+msgstr "Congo"
+
+msgctxt "CountryInfo"
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+msgctxt "CountryInfo"
+msgid "Cote d’Ivoire"
+msgstr "Ivoorkust"
+
+msgctxt "CountryInfo"
+msgid "Croatia"
+msgstr "Kroatië"
+
+msgctxt "CountryInfo"
+msgid "Cuba"
+msgstr "Cuba"
+
+msgctxt "CountryInfo"
+msgid "Cyprus"
+msgstr "Cyprus"
+
+msgctxt "CountryInfo"
+msgid "Czech Republic"
+msgstr "Tsjechië"
+
+msgctxt "CountryInfo"
+msgid "Denmark"
+msgstr "Denemarken"
+
+msgctxt "CountryInfo"
+msgid "Djibouti"
+msgstr "Djibouti"
+
+msgctxt "CountryInfo"
+msgid "Dominica"
+msgstr "Dominica"
+
+msgctxt "CountryInfo"
+msgid "Dominican Republic"
+msgstr "Dominikaanse Republiek"
+
+msgctxt "CountryInfo"
+msgid "Ecuador"
+msgstr "Ecuador"
+
+msgctxt "CountryInfo"
+msgid "Egypt"
+msgstr "Egypte"
+
+msgctxt "CountryInfo"
+msgid "El Salvador"
+msgstr "El Salvador"
+
+msgctxt "CountryInfo"
+msgid "Equatorial Guinea"
+msgstr "Equatoriaal Guinea"
+
+msgctxt "CountryInfo"
+msgid "Eritrea"
+msgstr "Eritrea"
+
+msgctxt "CountryInfo"
+msgid "Estonia"
+msgstr "Estland"
+
+msgctxt "CountryInfo"
+msgid "France"
+msgstr "Frankrijk"
+
+msgctxt "CountryInfo"
+msgid "Gabon"
+msgstr "Gabon"
+
+msgctxt "CountryInfo"
+msgid "Gambia"
+msgstr "Gambia"
+
+msgctxt "CountryInfo"
+msgid "Georgia"
+msgstr "Georgië"
+
+msgctxt "CountryInfo"
+msgid "Germany"
+msgstr "Duitsland"
+
+msgctxt "CountryInfo"
+msgid "Ghana"
+msgstr "Ghana"
+
+msgctxt "CountryInfo"
+msgid "Grenada"
+msgstr "Granada"
+
+msgctxt "CountryInfo"
+msgid "Guatemala"
+msgstr "Guatemala"
+
+msgctxt "CountryInfo"
+msgid "Guinea"
+msgstr "Guinea"
+
+msgctxt "CountryInfo"
+msgid "Guinea-Bissau"
+msgstr "Guinea-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 "Israël"
+
+msgctxt "CountryInfo"
+msgid "Italy"
+msgstr "Italië"
+
+msgctxt "CountryInfo"
+msgid "Jamaica"
+msgstr "Jamaica"
+
+msgctxt "CountryInfo"
+msgid "Japan"
+msgstr "Japan"
+
+msgctxt "CountryInfo"
+msgid "Jordan"
+msgstr "Jordanië"
+
+msgctxt "CountryInfo"
+msgid "Kazakhstan"
+msgstr "Kazakhstan"
+
+msgctxt "CountryInfo"
+msgid "Kenya"
+msgstr "Kenya"
+
+msgctxt "CountryInfo"
+msgid "Kiribati"
+msgstr "Kiribati"
+
+msgctxt "CountryInfo"
+msgid "Kuwait"
+msgstr "Koeweit"
+
+msgctxt "CountryInfo"
+msgid "Kyrgyzstan"
+msgstr "Kirgistan"
+
+msgctxt "CountryInfo"
+msgid "Laos"
+msgstr "Laos"
+
+msgctxt "CountryInfo"
+msgid "Latvia"
+msgstr "Letland"
+
+msgctxt "CountryInfo"
+msgid "Lebanon"
+msgstr "Libanon"
+
+msgctxt "CountryInfo"
+msgid "Lesotho"
+msgstr "Lesotho"
+
+msgctxt "CountryInfo"
+msgid "Liberia"
+msgstr "Liberia"
+
+msgctxt "CountryInfo"
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+msgctxt "CountryInfo"
+msgid "Lithuania"
+msgstr "Litouwen"
+
+msgctxt "CountryInfo"
+msgid "Luxembourg"
+msgstr "Luxemburg"
+
+msgctxt "CountryInfo"
+msgid "Macedonia"
+msgstr "Macedonië"
+
+msgctxt "CountryInfo"
+msgid "Madagascar"
+msgstr "Madagascar"
+
+msgctxt "CountryInfo"
+msgid "Malawi"
+msgstr "Malawi"
+
+msgctxt "CountryInfo"
+msgid "Malaysia"
+msgstr "Malaysië"
+
+msgctxt "CountryInfo"
+msgid "Mali"
+msgstr "Mali"
+
+msgctxt "CountryInfo"
+msgid "Malta"
+msgstr "Malta"
+
+msgctxt "CountryInfo"
+msgid "Marshall Islands"
+msgstr "Marshall Eilanden"
+
+msgctxt "CountryInfo"
+msgid "Mauritania"
+msgstr "Mauritanië"
+
+msgctxt "CountryInfo"
+msgid "Mauritius"
+msgstr "Mauritius"
+
+msgctxt "CountryInfo"
+msgid "Micronesia"
+msgstr "Micronesië"
+
+msgctxt "CountryInfo"
+msgid "Moldova"
+msgstr "Moldavië"
+
+msgctxt "CountryInfo"
+msgid "Monaco"
+msgstr "Monaco"
+
+msgctxt "CountryInfo"
+msgid "Mongolia"
+msgstr "Mongolië"
+
+msgctxt "CountryInfo"
+msgid "Montenegro"
+msgstr "Montenegro"
+
+msgctxt "CountryInfo"
+msgid "Morocco"
+msgstr "Marokko"
+
+msgctxt "CountryInfo"
+msgid "Mozambique"
+msgstr "Mozambique"
+
+msgctxt "CountryInfo"
+msgid "Namibia"
+msgstr "Namibië"
+
+msgctxt "CountryInfo"
+msgid "Nauru"
+msgstr "Nauru"
+
+msgctxt "CountryInfo"
+msgid "Nepal"
+msgstr "Nepal"
+
+msgctxt "CountryInfo"
+msgid "Netherlands"
+msgstr "Nederland"
+
+msgctxt "CountryInfo"
+msgid "New Zealand"
+msgstr "Nieuw Zeeland"
+
+msgctxt "CountryInfo"
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+msgctxt "CountryInfo"
+msgid "Niger"
+msgstr "Niger"
+
+msgctxt "CountryInfo"
+msgid "Nigeria"
+msgstr "Nigerië"
+
+msgctxt "CountryInfo"
+msgid "Norway"
+msgstr "Noorwegen"
+
+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 Nieuw Guinea"
+
+msgctxt "CountryInfo"
+msgid "Paraguay"
+msgstr "Paraguay"
+
+msgctxt "CountryInfo"
+msgid "Peru"
+msgstr "Peru"
+
+msgctxt "CountryInfo"
+msgid "Philippines"
+msgstr "Filipijnen"
+
+msgctxt "CountryInfo"
+msgid "Poland"
+msgstr "Polen"
+
+msgctxt "CountryInfo"
+msgid "Portugal"
+msgstr "Portugal"
+
+msgctxt "CountryInfo"
+msgid "Qatar"
+msgstr "Qatar"
+
+msgctxt "CountryInfo"
+msgid "Romania"
+msgstr "Roemenië"
+
+msgctxt "CountryInfo"
+msgid "Russia"
+msgstr "Rusland"
+
+msgctxt "CountryInfo"
+msgid "Rwanda"
+msgstr "Rwanda"
+
+msgctxt "CountryInfo"
+msgid "Saint Kitts & Nevis"
+msgstr "Sint Kitts & Nevis"
+
+msgctxt "CountryInfo"
+msgid "Saint Lucia"
+msgstr "Sint Lucia"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Saint Vincent & the Grenadines"
+msgstr "Sint 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 "Saudi Arabië"
+
+msgctxt "CountryInfo"
+msgid "Senegal"
+msgstr "Senegal"
+
+msgctxt "CountryInfo"
+msgid "Serbia"
+msgstr "Servië"
+
+msgctxt "CountryInfo"
+msgid "Seychelles"
+msgstr "Seychellen"
+
+msgctxt "CountryInfo"
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+msgctxt "CountryInfo"
+msgid "Singapore"
+msgstr "Singapore"
+
+msgctxt "CountryInfo"
+msgid "Slovakia"
+msgstr "Slovakije"
+
+msgctxt "CountryInfo"
+msgid "Slovenia"
+msgstr "Slovenië"
+
+msgctxt "CountryInfo"
+msgid "Solomon Islands"
+msgstr "Salomonseilanden"
+
+msgctxt "CountryInfo"
+msgid "Somalia"
+msgstr "Somalië"
+
+msgctxt "CountryInfo"
+msgid "South Africa"
+msgstr "Zuidafrika"
+
+msgctxt "CountryInfo"
+msgid "Spain"
+msgstr "Spanje"
+
+msgctxt "CountryInfo"
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+msgctxt "CountryInfo"
+msgid "Sudan"
+msgstr "Soedan"
+
+msgctxt "CountryInfo"
+msgid "Suriname"
+msgstr "Suriname"
+
+msgctxt "CountryInfo"
+msgid "Swaziland"
+msgstr "Swaziland"
+
+msgctxt "CountryInfo"
+msgid "Sweden"
+msgstr "Zweden"
+
+msgctxt "CountryInfo"
+msgid "Switzerland"
+msgstr "Zwitserland"
+
+msgctxt "CountryInfo"
+msgid "Syria"
+msgstr "Syrië"
+
+msgctxt "CountryInfo"
+msgid "Tajikistan"
+msgstr "Tadjikistan"
+
+msgctxt "CountryInfo"
+msgid "Tanzania"
+msgstr "Tanzania"
+
+msgctxt "CountryInfo"
+msgid "Thailand"
+msgstr "Thailand"
+
+msgctxt "CountryInfo"
+msgid "Timor-Leste (East Timor)"
+msgstr "Timor-Leste (Oosttimor)"
+
+msgctxt "CountryInfo"
+msgid "Togo"
+msgstr "Togo"
+
+msgctxt "CountryInfo"
+msgid "Tonga"
+msgstr "Tonga"
+
+msgctxt "CountryInfo"
+msgid "Trinidad & Tobago"
+msgstr "Trinidad & Tobago"
+
+msgctxt "CountryInfo"
+msgid "Tunisia"
+msgstr "Tunisië"
+
+msgctxt "CountryInfo"
+msgid "Turkey"
+msgstr "Turkije"
+
+msgctxt "CountryInfo"
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+msgctxt "CountryInfo"
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+msgctxt "CountryInfo"
+msgid "Uganda"
+msgstr "Oeganda"
+
+msgctxt "CountryInfo"
+msgid "Ukraine"
+msgstr "Oekraine"
+
+msgctxt "CountryInfo"
+msgid "United Arab Emirates"
+msgstr "Verenigde Arabische Emiraten"
+
+msgctxt "CountryInfo"
+msgid "United Kingdom"
+msgstr "Verenigd Koninkrijk"
+
+msgctxt "CountryInfo"
+msgid "United States"
+msgstr "Verenigde Staten"
+
+msgctxt "CountryInfo"
+msgid "Uruguay"
+msgstr "Uruguay"
+
+msgctxt "CountryInfo"
+msgid "Uzbekistan"
+msgstr "Oezbekistan"
+
+msgctxt "CountryInfo"
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+msgctxt "CountryInfo"
+msgid "Vatican"
+msgstr "Vatikaanstad"
+
+msgctxt "CountryInfo"
+msgid "Venezuela"
+msgstr "Venezuela"
+
+msgctxt "CountryInfo"
+msgid "Vietnam"
+msgstr "Vietnam"
+
+msgctxt "CountryInfo"
+msgid "Western Sahara"
+msgstr "Westelijke Sahara"
+
+msgctxt "CountryInfo"
+msgid "Yemen"
+msgstr "Jemen"
+
+msgctxt "CountryInfo"
+msgid "Zambia"
+msgstr "Zambië"
+
+msgctxt "CountryInfo"
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+msgctxt "CountryInfo"
+msgid "Albania"
+msgstr "Albanië"
+
+msgctxt "CountryInfo"
+msgid "Algeria"
+msgstr "Algerije"
+
+msgctxt "CountryInfo"
+msgid "Austria"
+msgstr "Oostenrijk"
+
+msgctxt "CountryInfo"
+msgid "Bahrain"
+msgstr "Bahrein"
+
+msgctxt "CountryInfo"
+msgid "Benin"
+msgstr "Benin"
+
+msgctxt "CountryInfo"
+msgid "Ethiopia"
+msgstr "Ethiopië"
+
+msgctxt "CountryInfo"
+msgid "Fiji"
+msgstr "Fiji"
+
+msgctxt "CountryInfo"
+msgid "Finland"
+msgstr "Finland"
+
+msgctxt "CountryInfo"
+msgid "Greece"
+msgstr "Griekenland"
+
+msgctxt "CountryInfo"
+msgid "Guam"
+msgstr "Guam"
+
+msgctxt "CountryInfo"
+msgid "Hungary"
+msgstr "Hongarije"
+
+msgctxt "CountryInfo"
+msgid "Iceland"
+msgstr "Ijsland"
+
+msgctxt "CountryInfo"
+msgid "India"
+msgstr "Indië"
+
+msgctxt "CountryInfo"
+msgid "Indonesia"
+msgstr "Indonesië"
+
+msgctxt "CountryInfo"
+msgid "Iran"
+msgstr "Iran"
+
+msgctxt "CountryInfo"
+msgid "Iraq"
+msgstr "Irak"
+
+msgctxt "CountryInfo"
+msgid "Ireland"
+msgstr "Ierland"
+
+msgctxt "CountryInfo"
+msgid "Korea, North"
+msgstr "Noord-Korea"
+
+msgctxt "CountryInfo"
+msgid "Korea, South"
+msgstr "Zuid-Korea"
+
+msgctxt "CountryInfo"
+msgid "Libya"
+msgstr "Libië"
+
+msgctxt "CountryInfo"
+msgid "Maldives"
+msgstr "Malediven"
+
+msgctxt "CountryInfo"
+msgid "Mexico"
+msgstr "Mexico"
+
+msgctxt "CountryInfo"
+msgid "Myanmar"
+msgstr "Myanmar"
+
+msgctxt "CountryInfo"
+msgid "Taiwan"
+msgstr "Taiwan"
+
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Toepassingen (*.exe)"
+
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Kies het Pad naar Tor"
+
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "Proxy-toepassing selecteren"
+
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr "Er moet een naam gekozen worden voor de tor-toepassing"
+
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr "De gespecifieerde proxy argumenten zijn niet in het juiste formaat"
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr "Vidalia starten als het systeem start"
+
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr "Bladeren"
+
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "De Tor toepassing starten als Vidalia start"
+
+msgctxt "GeneralPage"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr "Proxy toepassing (optioneel)"
+
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "De proxy toepassing starten als Tor start"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Proxy toepassingsargumenten:"
+
+msgctxt "GeneralPage"
+msgid "Software Updates"
+msgstr "Software Updates"
+
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
+msgstr "Automatisch nieuwe software updates controleren"
+
+msgctxt "GeneralPage"
+msgid "Check Now"
+msgstr "Nu controleren"
+
+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 "Ontv:"
+
+msgctxt "GraphFrame"
+msgid "Sent:"
+msgstr "Verz:"
+
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr "Geleverd XML bestand is geen geldig Contents document."
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "Zoeken heeft einde van document bereikt"
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "Zoeken heeft start van document bereikt"
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "Tekst niet gevonden in het document"
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "%1 resultaten gevonden"
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Vidalia Help"
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Vorige"
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Ga naar de vorige pagina (Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Verder"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Ga naar de volgende pagina (Shift+Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Thuis"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Ga naar de Thuispagina (Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Vind"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "Zoek naar een woord of uitdrukking op de huidige pagina (Ctrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "(Ctrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Sluiten"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Sluit Vidalia Help"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Vind:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Vind Vorige"
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Vind Volgende"
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "Hoofdlettergevoelig"
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Enkel volledige woorden"
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Help Onderwerpen"
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Inhoud"
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Zoek"
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Zoeken naar:"
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Gevonden Documenten"
+
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
+msgstr "Fout tijdens het laden van de helpinhoud"
+
+msgctxt "HelpTextBrowser"
+msgid "Opening External 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 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 ?"
+
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+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. De URL kan nog "
+"steeds gekopieerd worden en daarna geplakt worden in de browseradresbalk."
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr "Fout tijdens het openen van het helpbestand:"
+
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr "Licentieinformatie"
+
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "Licentie"
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr "Dank aan"
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "Debug"
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Info"
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Melding"
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Waarschuwing"
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Fout"
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Onbekend"
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "Tor starten"
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Sluiten"
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Bandbreedte Grafiek"
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Berichten Logboek"
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Netwerk Kaart"
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr "Control Panel"
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Instellingen"
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr "Over"
+
+msgctxt "MainWindow"
+msgid "Help"
+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"
+
+msgctxt "MainWindow"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia kon de geconfigureerde browser niet starten"
+
+msgctxt "MainWindow"
+msgid "Error starting 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-toepassing niet starten"
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Fout tijdens het start van de proxy server"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia kon de geconfigureerde proxy server niet starten"
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Verbinden met een verbindingslijst"
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "Maken van een versleutelde verbinding met de lijst"
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "Ontvangen van de netwerkstatus"
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "Laden van de netwerkstatus"
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "Laden van de authoriteitcertificaten"
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "Opvragen van verbindingsinformatie"
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "Laden van verbindingsinformatie"
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "Verbinden met het Tor netwerk"
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "Maken van een Tor circuit"
+
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr "Verbonden met het Tor netwerk!"
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Onbekende opstartstatus"
+
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr "willekeurig"
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "identiteitsfout"
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr "uitgevoerd"
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "verbinding geweigerd"
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "verbindingstimeout"
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "lees/schrijffout"
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "geen route naar de server"
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "onvoldoende resourcen"
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "onbekend"
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor is niet actief."
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "Tor is bezig met afsluiten."
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Tor nu stoppen"
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr "Tor stoppen"
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Opstarten Tor software"
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "Tor starten"
+
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Fout bij Starten 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 was niet in staat om Tor te starten. Raadpleeg uw instellingen om te zien of de naam en locatie van uw Tor executable juist is ingesteld."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "Verbinden met Tor"
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "Verbindingsfout"
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "Doorsturen is ingeschakeld"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "Fout tijdens afsluiten"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "Vidalia kon de Tor software niet afsluiten"
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "Overwachte fout"
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Aanmelden bij Tor"
+
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "Authenticatiecookie vereist"
+
+msgctxt "MainWindow"
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgstr ""
+"De Tor software verlangt van Vidalia om een authenticatiecookie te sturen "
+"maar Vidalia heeft er geen gevonden."
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "Wenst U zelf te zoeken naar het bestand 'control_auth_cookie'?"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Gegevensmap"
+
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Controlecookie (control_auth_cookie)"
+
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "Fout tijdens het registreren van gebeurtenissen"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr ""
+"Vidalia kon bepaalde gebeurtenissen niet registreren. Hierdoor zijn "
+"verschillende functies van Vidalia niet beschikbaar."
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Aanmeldfout"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia kon zich niet bij de Tor software aanmelden (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Controleer de beheerspoort aanmeldinstellingen."
+
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "Tor update beschikbaar"
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr ""
+"De huidige geïnstalleerde versie van Tor is verlopen en niet langer "
+"aangeraden. Bezoek de Tor website om de nieuwste versie te laden."
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Tor website: %1"
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "Alle eerstvolgende verbindingen zullen anders lijken dan uw oude verbindingen."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "Creëren van Nieuwe Identiteit Mislukt"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Vidalia Configuratiescherm"
+
+msgctxt "MainWindow"
+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 ""
+
+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 ""
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Bekijk de help documentatie"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Bekijk versie en licentie informatie"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Vidalia afsluiten"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Toon dit scherm bij het opstarten"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Verbergen"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Dit scherm niet tonen"
+
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, 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 "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 "Mislukt"
+
+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 "Vidalia was niet in staat om de Tor service te installeren."
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+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 ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "Over Vidalia"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Thuis"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+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 voor Tor's log meldingen."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+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 logboek bestand te openen."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Log Bestandsnaam Vereist"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "U dient een bestandsnaam op te geven om logberichten op te kunnen slaan in een bestand."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Selecteer Logboek Bestand"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Logboek Berichten Opslaan"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Tekstbestanden (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Vind in Berichten Logboek"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Vind:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Niet Gevonden"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "Zoekopdracht heeft niets gevonden."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Berichten Logboek"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Berichten Filters..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Stel berichten filters in"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Geschiedenis Grootte..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Stel het maximum aantal weer te geven berichten in"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Wissen"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Wis alle berichten van het Berichten Logboek (Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Kopiëren"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Kopieër de geselecteerde berichten naar het klembord (Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Selecteer Alles"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Selecteer alle berichten (Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Alles Opslaan"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Sla alle berichten op naar een bestand"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Selectie Opslaan"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Sla de geselecteerde berichten op in een bestand"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Instellingen"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Verander Berichten Logboek Instellingen"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Help"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Toon de help browser"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Sluiten"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Sluit het Berichten Logboek"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Vind"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Vind alle berichten die de zoektekst bevatten (Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Tijd"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Soort"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Bericht"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Slaat de huidige Berichten Logboek instellingen op"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Instellingen Opslaan"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Maakt veranderingen in de instellingen ongedaan"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Annuleren"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Berichten Filter"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Fout"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Waarschuwing"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Melding"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Info"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Debug"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "Berichten Log Geschiedenis"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Aantal berichten dat tegelijk wordt weergeven in berichtenlog scherm"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "berichten"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Altijd Nieuwe Log Berichten Opslaan"
+
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "Bladeren"
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr "Schakel automatisch opslaan van nieuwe log berichten naar bestand in"
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "Automatisch nieuwe log berichten opslaan naar bestand"
+
+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."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Ververs"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Help"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Toon de netwerk kaart help"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Toon netwerk kaart help"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Sluiten"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Sluit de netwerk kaart"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Zoom In"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Zoom in op de netwerk kaart"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Zoom Uit"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Zoom uit op de netwerk kaart"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Maak Passend"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Zoomt om alle huidig weergeven circuits passend in beeld te brengen"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "Bestand Niet Gevonden"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "Onbekend"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+msgctxt "NetworkPage"
+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."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+msgctxt "NetworkPage"
+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 ""
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+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 ""
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+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 ""
+
+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 "Policy"
+msgid "accept"
+msgstr "toestaan"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "weigeren"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Online"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Slapend"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Offline"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Locatie:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "IP Adres:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Platform:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Bandbreedte:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Uptime:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Laatst Bijgewerkt:"
+
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Kopiëren"
+
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
+msgstr "Slapend"
+
+msgctxt "RouterInfoDialog"
+msgid "Online"
+msgstr "Online"
+
+msgctxt "RouterInfoDialog"
+msgid "Offline"
+msgstr "Offline"
+
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr "Onbekend"
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr "Bijnaam:"
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr "Status"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "Locatie:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "IP Adres:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "Platform:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "Bandbreedte:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "Uptime:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "Contact Info:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "Laatst Bijgewerkt:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Offline"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Slapend"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Kopiëren"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr ""
+
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Verwerk verkeer van het Tor netwerk"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Directory Poort:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Directory Poort Nummer"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Contact Info:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Bijnaam:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Standaard Instellingen"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Voor internetverbindingen met een snelle download, maar langzame upload snelheid, stel hier alstublieft de upload snelheid in."
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "Kabel/DSL 256 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "Kabel/DSL 512 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "Kabel/DSL 768 Kbps"
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/Kabel/DSL 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "Aangepast"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Kies de optie die het best gelijkt op uw Internetverbinding"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Toon het helponderwerp over bandbreedte ratio begrenzing"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Gemiddelde Ratio"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Gemiddelde bandbreedte op de lange termijn"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Maximale Ratio"
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "Piek bandbreedte ratio grens"
+
+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 dan of gelijk aan uw gemiddelde bandbreedte te zijn. Beide waarden dienen tenminste 20 KB/s te zijn."
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Bandbreedte Instellingen"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Poorten 6660 - 6669 en 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Poorten 110, 143, 993 en 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Ophalen E-mail (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Poorten die niet zijn opgegeven door andere aanvinkvakjes"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Overige Andere Diensten"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Poorten 706, 1863, 5050, 5190, 5222, 8300 en 8888 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "Instant Messaging (IM)"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "Poort 443"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "Beveiligde Websites (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Poort 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Websites"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "Laat het helponderwerp zien over uitgaand beleid"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Uitgaand Beleid"
+
+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 "Berichten Log Geschiedenis"
+
+msgctxt "ServerPage"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgstr "Vidalia was niet in staat zich aan te melden voor Tor's log meldingen."
+
+msgctxt "ServerPage"
+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 ""
+
+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 "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 ""
+
+msgctxt "ServicePage"
+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."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Fout"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+msgctxt "Stream"
+msgid "New"
+msgstr "Nieuw"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Herleiden"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Verbinden"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "Open"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Mislukt"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Gesloten"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Opnieuw"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Onbekend"
+
+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."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "Starten Tor service mislukt."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+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 "Verbergen"
+
+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 "OK"
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr "Annuleren"
+
+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 "Backspace"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Annuleren"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Ja"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Nee"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Help"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Opnieuw"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Toon Logboek"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Instellingen Weergeven"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Verder"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Afsluiten"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Bladeren"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Ongeldige Waarde"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia is reeds actief"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Toont dit bericht en sluit af."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "Herstelt ALLE opgeslagen Vidalia instellingen."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Stelt de map in die Vidalia gebruikt voor data bestanden."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Stelt de naam en locatie in van Vidalia's pid-bestand."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Stelt de naam en locatie in van Vidalia's logbestand."
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Stelt de uitgebreidheid in van Vidalia's loggedrag."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Stelt Vidalia's uiterlijke stijl in."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Stelt Vidalia's taal in."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Vidalia Gebruiks Informatie"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "Openen mislukt van log bestand '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr "%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 ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pa/qt_pa.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pa/qt_pa.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pa/qt_pa.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pa/vidalia_pa.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pa/vidalia_pa.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pa/vidalia_pa.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pl/qt_pl.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pl/qt_pl.po
new file mode 100644
index 0000000..e5893e1
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pl/qt_pl.po
@@ -0,0 +1,443 @@
+msgid ""
+msgstr ""
+"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: 2009-09-06 14:20+0000\n"
+"Last-Translator: Lukasz Kieres <zeewolf16 at gmail.com>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "Uaktywnij"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "Program '%1' wymaga do uruchomienia Qt %2, znaleziono Qt %3."
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "Niekompatybilność biblioteki Qt"
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "LTR"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "Uaktywnia główne okno programu"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "OK"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "Zachowaj"
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "Otwórz"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "Zamknij"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "Zastosuj"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "Resetuj"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "Pomoc"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "Nie zachowuj"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "Odrzuć"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "&Tak"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "Ta&k dla wszystkich"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "&Nie"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "Ni&e dla wszystkich"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "Zachowaj wszystko"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "Przerwij"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "Ponów"
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "Zignoruj"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "Przywróć ustawienia"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "Zamknij bez zapisywania"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "&OK"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "Nazwa"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "Rozmiar"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "Typ"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "Rodzaj"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "Data modyfikacji"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "Wszystkie pliki (*)"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "Katalogi"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "&Otwórz"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "&Zachowaj"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "Otwórz"
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"%1 już istnieje.\n"
+"Czy chcesz go zamienić?"
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+"%1\n"
+"Plik nie znaleziony.\n"
+"Proszę o sprawdzenie podanej nazwy pliku."
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "Mój komputer"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "&Zmień nazwę"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "&Skasuj"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "Pokaż &ukryte pliki"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "Powrót"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "Katalog wyżej"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "Lista"
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "Szczegóły"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "Pliki rodzaju:"
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "Katalog:"
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+"%1\n"
+"Katalog nie znaleziony.\n"
+"Sprawdź podaną nazwę katalogu."
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+"'%1' jest zabezpieczony przed zapisem.\n"
+"Czy na pewno chcesz go skasować?"
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "Czy na pewno chcesz skasować '%1'?"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "Nie można skasować katalogu."
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "Wszystkie pliki (*.*)"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "Zachowaj jako"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "Urządzenie"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "Plik"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "Nieznany"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "Znajdź katalog"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "Pokaż "
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "Do przodu"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "Nowy katalog"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "&Nowy katalog"
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "&Wybierz"
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "Usuń"
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "Nazwa &pliku:"
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "Szukaj w:"
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "Utwórz nowy katalog"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "Invalid filename"
+msgstr "Niepoprawna nazwa pliku"
+
+#: 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>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"
+msgid "Name"
+msgstr "Nazwa"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "Rozmiar"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "Typ"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "Rodzaj"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "Data modyfikacji"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "Mój komputer"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "Komputer"
+
+#: 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 b"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pl/vidalia_pl.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pl/vidalia_pl.po
new file mode 100644
index 0000000..289e9de
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pl/vidalia_pl.po
@@ -0,0 +1,3342 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2009-09-06 14:20+0000\n"
+"Last-Translator: Lukasz Kieres <zeewolf16 at gmail.com>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "O Vidalii"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "Licencja"
+
+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 "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 "wersja"
+
+msgctxt "AdvancedPage"
+msgid "'%1' is not a valid IP address."
+msgstr "'%1' nie jest poprawnym adresem IP."
+
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "Wybrałeś uwierzytelnianie na 'Hasło', lecz go nie ustaliłeś."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Wybierz plik konfiguracyjny Tora"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Pliku nie znaleziono"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 nie istnieje. Czy chcesz go utworzyć?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Nie udało się utworzyć pliku"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "Utworzenie %1 [%2] jest niemożliwe"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Wybierz katalog w którym Tor będzie przechowywał swoje dane"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Usunięcie usługi Tora nie powiodło się"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "Instalacja usługi Tora nie powiodła się"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "Vidalia nie mogła zainstalować usługi Tor"
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Port sterujący"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "Autentykacja:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Adres:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "Brak"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Ciasteczko"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Hasło"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "Wybierane losowo"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Plik konfiguracyjny Tora"
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "Uruchom oprogramowanie Tora używając wybranego pliku konfiguracyjnego (torrc)"
+
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "Wybierz ścieżkę do Twojego pliku konfiguracyjnego"
+
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Przeglądaj"
+
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr "Katalog Danych"
+
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr "Zapisuje dane aplikacji Tor we wskazanym katalogu"
+
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr "Wybierz katalog używany do zapisu danych przez Tora"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+"Vidalia nie mogła usunąć usługi Tor.\n"
+"\n"
+"Będziesz musiał usunąć ją ręcznie."
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Język"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Wybierz język aplikacji"
+
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Styl"
+
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Wybierz styl interfejsu"
+
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr "Vidalia nie mogła wczytać wybranego języka."
+
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr "Wykres od:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Ukryj ustawienia"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Pokaż ustawienia"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Użycie Łącza"
+
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "Resetuj"
+
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Pokaż ściąganie"
+
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Pokaż wysyłanie"
+
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Na wierzchu"
+
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Styl"
+
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Zmienia przezroczystość okna"
+
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% Nieprzejrzyste"
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Zapisz"
+
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Anuluj"
+
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr "Wysyłanie żądania HTTPS do mostu..."
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr "Łączenie z %1:%2..."
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr "Wysyłanie żądania HTTPS dla mostów..."
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr "Pobieranie listy mostów"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr "Pobieranie mostów"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr "Nie można pobrać mostów: %1"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr "Ponawianie żądania..."
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr "Państwo"
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr "# Klientów"
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr "Klienci z następujących państw używali Twojego węzła od %1"
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr "Podsumowanie użycia Mostu"
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr "Podsumowanie klienta"
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "Nowe"
+
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Aktywne"
+
+msgctxt "Circuit"
+msgid "Building"
+msgstr "Łączenie"
+
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Nie powiodło się"
+
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Zakończone"
+
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Nieznane"
+
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Ścieżka pusta>"
+
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Połączenie"
+
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "Status"
+
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Zbliż na połączenie"
+
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "Zamknij połączenie"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Zamknij strumień (Del)"
+
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "Ogólne"
+
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Sieć"
+
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr "Współdzielenie"
+
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "Usługi"
+
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Wygląd"
+
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Zaawansowane"
+
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Pomoc"
+
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Błąd zapisu ustawień"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr "Vidalia nie mogła zapisać ustawień %1."
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Błąd aplikowania ustawień"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia nie mogła zastosować Twoich ustawień %1."
+
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Ustawienia"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Viadalia nie mogła się połączyć z Torem. (%1)"
+
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "Gniazdo sterujące nie jest podłączone."
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "Wymagane hasło"
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
+msgstr "Zapamiętaj hasło"
+
+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:"
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "Gniazdo sterujące nie jest podłączone."
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Błąd przy przy wysyłaniu polecenia sterującego. [%1]"
+
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr "Przy próbie odczytu danych gniazdo rozłączyło się."
+
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Nieprawidłowy kod odpowiedzi. [%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 "Argentyna"
+
+msgctxt "CountryInfo"
+msgid "Armenia"
+msgstr "Armenia"
+
+msgctxt "CountryInfo"
+msgid "Australia"
+msgstr "Australia"
+
+msgctxt "CountryInfo"
+msgid "Azerbaijan"
+msgstr "Azerbejdżan "
+
+msgctxt "CountryInfo"
+msgid "Bahamas"
+msgstr "Bahama "
+
+msgctxt "CountryInfo"
+msgid "Bangladesh"
+msgstr "Bangladesz"
+
+msgctxt "CountryInfo"
+msgid "Barbados"
+msgstr "Barbados"
+
+msgctxt "CountryInfo"
+msgid "Belarus"
+msgstr "Białoruś"
+
+msgctxt "CountryInfo"
+msgid "Belgium"
+msgstr "Belgia"
+
+msgctxt "CountryInfo"
+msgid "Belize"
+msgstr "Belize"
+
+msgctxt "CountryInfo"
+msgid "Bhutan"
+msgstr "Butan"
+
+msgctxt "CountryInfo"
+msgid "Bolivia"
+msgstr "Boliwia"
+
+msgctxt "CountryInfo"
+msgid "Bosnia & Herzegovina"
+msgstr "Bośnia i Hercegowina"
+
+msgctxt "CountryInfo"
+msgid "Botswana"
+msgstr "Bośnia i Hercegowina"
+
+msgctxt "CountryInfo"
+msgid "Brazil"
+msgstr "Brazylia"
+
+msgctxt "CountryInfo"
+msgid "Brunei Darussalam"
+msgstr "Brunei"
+
+msgctxt "CountryInfo"
+msgid "Bulgaria"
+msgstr "Bułgaria"
+
+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 "Republika Środkowoafrykańska"
+
+msgctxt "CountryInfo"
+msgid "Chad"
+msgstr "Czad"
+
+msgctxt "CountryInfo"
+msgid "Chile"
+msgstr "Czile"
+
+msgctxt "CountryInfo"
+msgid "China"
+msgstr "Chiny"
+
+msgctxt "CountryInfo"
+msgid "Colombia"
+msgstr "Kolumbia"
+
+msgctxt "CountryInfo"
+msgid "Comoros"
+msgstr "Komoros"
+
+msgctxt "CountryInfo"
+msgid "Congo, The Democratic Republic of the"
+msgstr "Demokratyczna Republika Kongo"
+
+msgctxt "CountryInfo"
+msgid "Congo"
+msgstr "Kongo"
+
+msgctxt "CountryInfo"
+msgid "Costa Rica"
+msgstr "Kostaryka"
+
+msgctxt "CountryInfo"
+msgid "Cote d’Ivoire"
+msgstr "Wybrzeże Kości Słoniowej"
+
+msgctxt "CountryInfo"
+msgid "Croatia"
+msgstr "Chorwacja"
+
+msgctxt "CountryInfo"
+msgid "Cuba"
+msgstr "Kuba"
+
+msgctxt "CountryInfo"
+msgid "Cyprus"
+msgstr "Cypr"
+
+msgctxt "CountryInfo"
+msgid "Czech Republic"
+msgstr "Republika Czeska"
+
+msgctxt "CountryInfo"
+msgid "Denmark"
+msgstr "Dania"
+
+msgctxt "CountryInfo"
+msgid "Djibouti"
+msgstr "Dżibuti"
+
+msgctxt "CountryInfo"
+msgid "Dominica"
+msgstr "Dominika"
+
+msgctxt "CountryInfo"
+msgid "Dominican Republic"
+msgstr "Republika Dominikańska"
+
+msgctxt "CountryInfo"
+msgid "Ecuador"
+msgstr "Ekwador"
+
+msgctxt "CountryInfo"
+msgid "Egypt"
+msgstr "Egipt"
+
+msgctxt "CountryInfo"
+msgid "El Salvador"
+msgstr "El Salvador"
+
+msgctxt "CountryInfo"
+msgid "Equatorial Guinea"
+msgstr "Gwinea Równikowa"
+
+msgctxt "CountryInfo"
+msgid "Eritrea"
+msgstr "Erytrea"
+
+msgctxt "CountryInfo"
+msgid "Estonia"
+msgstr "Estonia"
+
+msgctxt "CountryInfo"
+msgid "France"
+msgstr "Francja"
+
+msgctxt "CountryInfo"
+msgid "Gabon"
+msgstr "Republika Gabońska"
+
+msgctxt "CountryInfo"
+msgid "Gambia"
+msgstr "Republika Gambii"
+
+msgctxt "CountryInfo"
+msgid "Georgia"
+msgstr "Georgia"
+
+msgctxt "CountryInfo"
+msgid "Germany"
+msgstr "Niemcy"
+
+msgctxt "CountryInfo"
+msgid "Ghana"
+msgstr "Republika Ghany"
+
+msgctxt "CountryInfo"
+msgid "Grenada"
+msgstr "Grenada"
+
+msgctxt "CountryInfo"
+msgid "Guatemala"
+msgstr "Gwatemala"
+
+msgctxt "CountryInfo"
+msgid "Guinea"
+msgstr "Gwinea"
+
+msgctxt "CountryInfo"
+msgid "Guinea-Bissau"
+msgstr "Gwinea Bissau"
+
+msgctxt "CountryInfo"
+msgid "Guyana"
+msgstr "Gujana"
+
+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 "Włochy"
+
+msgctxt "CountryInfo"
+msgid "Jamaica"
+msgstr "Jamajka"
+
+msgctxt "CountryInfo"
+msgid "Japan"
+msgstr "Japonia"
+
+msgctxt "CountryInfo"
+msgid "Jordan"
+msgstr "Jordania"
+
+msgctxt "CountryInfo"
+msgid "Kazakhstan"
+msgstr "Kazachstan"
+
+msgctxt "CountryInfo"
+msgid "Kenya"
+msgstr "Kenia"
+
+msgctxt "CountryInfo"
+msgid "Kiribati"
+msgstr "Republika Kiribati"
+
+msgctxt "CountryInfo"
+msgid "Kuwait"
+msgstr "Kuwejt"
+
+msgctxt "CountryInfo"
+msgid "Kyrgyzstan"
+msgstr "Kirgistan"
+
+msgctxt "CountryInfo"
+msgid "Laos"
+msgstr "Laos"
+
+msgctxt "CountryInfo"
+msgid "Latvia"
+msgstr "Łotwa"
+
+msgctxt "CountryInfo"
+msgid "Lebanon"
+msgstr "Liban"
+
+msgctxt "CountryInfo"
+msgid "Lesotho"
+msgstr "Lesoto"
+
+msgctxt "CountryInfo"
+msgid "Liberia"
+msgstr "Republika Liberii"
+
+msgctxt "CountryInfo"
+msgid "Liechtenstein"
+msgstr "Lichtenstein"
+
+msgctxt "CountryInfo"
+msgid "Lithuania"
+msgstr "Litwa"
+
+msgctxt "CountryInfo"
+msgid "Luxembourg"
+msgstr "Luxemburg"
+
+msgctxt "CountryInfo"
+msgid "Macedonia"
+msgstr "Macedonia"
+
+msgctxt "CountryInfo"
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+msgctxt "CountryInfo"
+msgid "Malawi"
+msgstr "Malawia"
+
+msgctxt "CountryInfo"
+msgid "Malaysia"
+msgstr "Malezja"
+
+msgctxt "CountryInfo"
+msgid "Mali"
+msgstr "Mali"
+
+msgctxt "CountryInfo"
+msgid "Malta"
+msgstr "Malta"
+
+msgctxt "CountryInfo"
+msgid "Marshall Islands"
+msgstr "Wyspy Marshalla"
+
+msgctxt "CountryInfo"
+msgid "Mauritania"
+msgstr "Mauretania"
+
+msgctxt "CountryInfo"
+msgid "Mauritius"
+msgstr "Mauritius"
+
+msgctxt "CountryInfo"
+msgid "Micronesia"
+msgstr "Mikronezja"
+
+msgctxt "CountryInfo"
+msgid "Moldova"
+msgstr "Mołdawia"
+
+msgctxt "CountryInfo"
+msgid "Monaco"
+msgstr "Monako"
+
+msgctxt "CountryInfo"
+msgid "Mongolia"
+msgstr "Mongolia"
+
+msgctxt "CountryInfo"
+msgid "Montenegro"
+msgstr "Czarnogóra"
+
+msgctxt "CountryInfo"
+msgid "Morocco"
+msgstr "Maroko"
+
+msgctxt "CountryInfo"
+msgid "Mozambique"
+msgstr "Mozambik"
+
+msgctxt "CountryInfo"
+msgid "Namibia"
+msgstr "Namibia"
+
+msgctxt "CountryInfo"
+msgid "Nauru"
+msgstr "Nauru"
+
+msgctxt "CountryInfo"
+msgid "Nepal"
+msgstr "Nepal"
+
+msgctxt "CountryInfo"
+msgid "Netherlands"
+msgstr "Holandia"
+
+msgctxt "CountryInfo"
+msgid "New Zealand"
+msgstr "Nowa Zelandia"
+
+msgctxt "CountryInfo"
+msgid "Nicaragua"
+msgstr "Nikaragua"
+
+msgctxt "CountryInfo"
+msgid "Niger"
+msgstr "Niger"
+
+msgctxt "CountryInfo"
+msgid "Nigeria"
+msgstr "Nigeria"
+
+msgctxt "CountryInfo"
+msgid "Norway"
+msgstr "Norwegia"
+
+msgctxt "CountryInfo"
+msgid "Oman"
+msgstr "Oman"
+
+msgctxt "CountryInfo"
+msgid "Pakistan"
+msgstr "Pakistan"
+
+msgctxt "CountryInfo"
+msgid "Palau"
+msgstr "Palau"
+
+msgctxt "CountryInfo"
+msgid "Palestine"
+msgstr "Palestyna"
+
+msgctxt "CountryInfo"
+msgid "Panama"
+msgstr "Panama"
+
+msgctxt "CountryInfo"
+msgid "Papua New Guinea"
+msgstr "Papua Nowa Gwinea"
+
+msgctxt "CountryInfo"
+msgid "Paraguay"
+msgstr "Paragwaj"
+
+msgctxt "CountryInfo"
+msgid "Peru"
+msgstr "Peru"
+
+msgctxt "CountryInfo"
+msgid "Philippines"
+msgstr "Filipiny"
+
+msgctxt "CountryInfo"
+msgid "Poland"
+msgstr "Polska"
+
+msgctxt "CountryInfo"
+msgid "Portugal"
+msgstr "Portugalia"
+
+msgctxt "CountryInfo"
+msgid "Qatar"
+msgstr "Katar"
+
+msgctxt "CountryInfo"
+msgid "Romania"
+msgstr "Rumunia"
+
+msgctxt "CountryInfo"
+msgid "Russia"
+msgstr "Rosja"
+
+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 i Grenadyny"
+
+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 "Arabia Saudyjska"
+
+msgctxt "CountryInfo"
+msgid "Senegal"
+msgstr "Senegal"
+
+msgctxt "CountryInfo"
+msgid "Serbia"
+msgstr "Serbia"
+
+msgctxt "CountryInfo"
+msgid "Seychelles"
+msgstr "Seszele"
+
+msgctxt "CountryInfo"
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+msgctxt "CountryInfo"
+msgid "Singapore"
+msgstr "Singapur"
+
+msgctxt "CountryInfo"
+msgid "Slovakia"
+msgstr "Słowacja"
+
+msgctxt "CountryInfo"
+msgid "Slovenia"
+msgstr "Słowenia"
+
+msgctxt "CountryInfo"
+msgid "Solomon Islands"
+msgstr "Wyspy Salomona"
+
+msgctxt "CountryInfo"
+msgid "Somalia"
+msgstr "Somalia"
+
+msgctxt "CountryInfo"
+msgid "South Africa"
+msgstr "Afryka Południowa"
+
+msgctxt "CountryInfo"
+msgid "Spain"
+msgstr "Hiszpania"
+
+msgctxt "CountryInfo"
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+msgctxt "CountryInfo"
+msgid "Sudan"
+msgstr "Sudan"
+
+msgctxt "CountryInfo"
+msgid "Suriname"
+msgstr "Surinam"
+
+msgctxt "CountryInfo"
+msgid "Swaziland"
+msgstr "Suazi"
+
+msgctxt "CountryInfo"
+msgid "Sweden"
+msgstr "Szwecja"
+
+msgctxt "CountryInfo"
+msgid "Switzerland"
+msgstr "Szwajcaria"
+
+msgctxt "CountryInfo"
+msgid "Syria"
+msgstr "Syria"
+
+msgctxt "CountryInfo"
+msgid "Tajikistan"
+msgstr "Tadżykistan"
+
+msgctxt "CountryInfo"
+msgid "Tanzania"
+msgstr "Tanzania"
+
+msgctxt "CountryInfo"
+msgid "Thailand"
+msgstr "Tajlandia"
+
+msgctxt "CountryInfo"
+msgid "Timor-Leste (East Timor)"
+msgstr "Timor Wschodni"
+
+msgctxt "CountryInfo"
+msgid "Togo"
+msgstr "Togo"
+
+msgctxt "CountryInfo"
+msgid "Tonga"
+msgstr "Tonga"
+
+msgctxt "CountryInfo"
+msgid "Trinidad & Tobago"
+msgstr "Trynidad i Tobago"
+
+msgctxt "CountryInfo"
+msgid "Tunisia"
+msgstr "Tunezja"
+
+msgctxt "CountryInfo"
+msgid "Turkey"
+msgstr "Turcja"
+
+msgctxt "CountryInfo"
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+msgctxt "CountryInfo"
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+msgctxt "CountryInfo"
+msgid "Uganda"
+msgstr "Uganda"
+
+msgctxt "CountryInfo"
+msgid "Ukraine"
+msgstr "Ukraina"
+
+msgctxt "CountryInfo"
+msgid "United Arab Emirates"
+msgstr "Zjednoczone Emiraty Arabskie"
+
+msgctxt "CountryInfo"
+msgid "United Kingdom"
+msgstr "Wielka Brytania"
+
+msgctxt "CountryInfo"
+msgid "United States"
+msgstr "Stany Zjednoczone"
+
+msgctxt "CountryInfo"
+msgid "Uruguay"
+msgstr "Urugwaj"
+
+msgctxt "CountryInfo"
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+msgctxt "CountryInfo"
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+msgctxt "CountryInfo"
+msgid "Vatican"
+msgstr "Watykan"
+
+msgctxt "CountryInfo"
+msgid "Venezuela"
+msgstr "Wenezuela"
+
+msgctxt "CountryInfo"
+msgid "Vietnam"
+msgstr "Wietnam"
+
+msgctxt "CountryInfo"
+msgid "Western Sahara"
+msgstr "Zachodnia Sahara"
+
+msgctxt "CountryInfo"
+msgid "Yemen"
+msgstr "Jemen"
+
+msgctxt "CountryInfo"
+msgid "Zambia"
+msgstr "Zambia"
+
+msgctxt "CountryInfo"
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+msgctxt "CountryInfo"
+msgid "Albania"
+msgstr "Albania"
+
+msgctxt "CountryInfo"
+msgid "Algeria"
+msgstr "Algieria"
+
+msgctxt "CountryInfo"
+msgid "Austria"
+msgstr "Austria"
+
+msgctxt "CountryInfo"
+msgid "Bahrain"
+msgstr "Bahrajn"
+
+msgctxt "CountryInfo"
+msgid "Benin"
+msgstr "Benin"
+
+msgctxt "CountryInfo"
+msgid "Ethiopia"
+msgstr "Etiopia"
+
+msgctxt "CountryInfo"
+msgid "Fiji"
+msgstr "Fidżi"
+
+msgctxt "CountryInfo"
+msgid "Finland"
+msgstr "Finlandia"
+
+msgctxt "CountryInfo"
+msgid "Greece"
+msgstr "Grecja"
+
+msgctxt "CountryInfo"
+msgid "Guam"
+msgstr "Guam"
+
+msgctxt "CountryInfo"
+msgid "Hungary"
+msgstr "Węgry"
+
+msgctxt "CountryInfo"
+msgid "Iceland"
+msgstr "Islandia"
+
+msgctxt "CountryInfo"
+msgid "India"
+msgstr "Indie"
+
+msgctxt "CountryInfo"
+msgid "Indonesia"
+msgstr "Indonezja"
+
+msgctxt "CountryInfo"
+msgid "Iran"
+msgstr "Iran"
+
+msgctxt "CountryInfo"
+msgid "Iraq"
+msgstr "Irak"
+
+msgctxt "CountryInfo"
+msgid "Ireland"
+msgstr "Irlandia"
+
+msgctxt "CountryInfo"
+msgid "Korea, North"
+msgstr "Północna Korea"
+
+msgctxt "CountryInfo"
+msgid "Korea, South"
+msgstr "Południowa Korea"
+
+msgctxt "CountryInfo"
+msgid "Libya"
+msgstr "Libia"
+
+msgctxt "CountryInfo"
+msgid "Maldives"
+msgstr "Malediwy"
+
+msgctxt "CountryInfo"
+msgid "Mexico"
+msgstr "Meksyk"
+
+msgctxt "CountryInfo"
+msgid "Myanmar"
+msgstr "Birma"
+
+msgctxt "CountryInfo"
+msgid "Taiwan"
+msgstr "Tajwan"
+
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Pliki wykonywalne (.exe)"
+
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Wybierz ścieżkę do Tora"
+
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "Wybierz plik wykonywalny Proxy"
+
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr "Musisz określić nazwę pliku wykonywalnego Tora."
+
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr "Argumenty dla proxy nie są w niewłaściwym formacie."
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr "Uruchamiaj Vidalię gdy startuje mój system"
+
+msgctxt "GeneralPage"
+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"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr "Aplikacja proxy (opcjonalnie)"
+
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "Uruchamiaj aplikację proxy gdy Tor startuje"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Parametry aplikacji proxy:"
+
+msgctxt "GeneralPage"
+msgid "Software Updates"
+msgstr "Uaktualnienia oprogramowania"
+
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
+msgstr "Automatycznie sprawdzaj dostępność aktualizacji oprogramowania"
+
+msgctxt "GeneralPage"
+msgid "Check Now"
+msgstr "Sprawdź teraz"
+
+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 "Odbr:"
+
+msgctxt "GraphFrame"
+msgid "Sent:"
+msgstr "Wysł:"
+
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr "Plik XML nie jest prawidłowym plikiem dokumentu Zawartości."
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "Wyszukiwanie dotarło do końca dokumentu"
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "Wyszukiwanie dotarło do początku dokumentu"
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "Nie znaleziono tekstu w dokumencie"
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "Znaleziono %1 wynik(i/ów)"
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Pomoc Vidalii"
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Cofnij"
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Przejdź do poprzedniej strony (Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "W przód"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Przejdź do następnej strony (Shift+Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Główna"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Przejdź do strony głównej (Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Znajdź"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "Szukaj słowa lub słów na bieżącej stronie (Ctrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Zamknij"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Zamknij pomoc Vidalii"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Znajdź:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Znajdź poprzednie"
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Znajdź następne"
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "Ważna wielkość liter"
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Tylko całe słowa"
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Tematy pomocy"
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Zawartość"
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Szukaj"
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Szukanie:"
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Znalezione dokumenty"
+
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
+msgstr "Błąd wczytywania zawartości pomocy:"
+
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr "Otwieranie zewnętrznego łącza"
+
+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 otworzyć wskazany link w domyślnej przeglądarce. Jeśli Twoja przeglądarka nie jest skonfigurowana na używanie sieci Tor, żądanie nie będzie anonimowe."
+
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr "Czy chcesz otworzyć link w Twojej przeglądarce ?"
+
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr "Otwarcie linku nie powiodło się"
+
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr "Vidalia nie mogła otworzyć linku w Twojej przeglądarce. Jednakże możesz skopiować adres URL i wkleić bezpośrednio do przeglądarki."
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr "Błąd otwierania pliku pomocy:"
+
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr "Informacje o licencji"
+
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "Licencja"
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr "Autorzy"
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "Debug"
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Informacja"
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Powiadomienie"
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Ostrzeżenie"
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Błąd"
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Nieznany"
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "Uruchom Tora"
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Wyjdź"
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Zużycie Łącza"
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Dziennik Logów"
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Mapa Sieci"
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr "Panel Kontrolny"
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Ustawienia"
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr "Informacje"
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr "Pomoc"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia nie mogła uruchomić wskazanej przeglądarki internetowej"
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "Błąd uruchamiania klienta IM"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "Vidalia nie mogła uruchomić ustalonego klienta IM."
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Wystąpił błąd przy uruchamianiu serwera proxy"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia nie mogła uruchomić wskazanego serwera proxy"
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Podłączanie do katalogu węzłów"
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "Ustanawianie szyfrowanego połączenia z katalogiem"
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "Odczytywanie stanu sieci"
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "Wczytywanie stanu sieci"
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "Wczytywanie certyfikatów"
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "Żądanie informacji o węźle"
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "Wczytywanie informacji o węźle"
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "Podłączanie do sieci Tor"
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "Ustanawianie ścieżki Tora"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "niezgodność tożsamości"
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr "zrobione"
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "połączenie odrzucone"
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "upłynął czas połączenia"
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "błąd zapisu/odczytu"
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "brak trasy do hosta"
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "niewystarczające zasoby"
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "nieznany"
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor nie jest uruchomiony"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Uruchamianie oprogramowania Tor"
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "Uruchamianie Tora"
+
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Błąd uruchamiania 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 nie mogła uruchomić Tora. Proszę sprawdzić ustawienia, aby upewnić się co do ścieżki dostępu do pliku wykonywalnego Tora."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "Podłączanie do Tora"
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "Błąd połączenia"
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "Przekazywanie połączeń Aktywne."
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "Błąd wyłączania serwera"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "Vidalia nie mogła zatrzymać Tora."
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "Nieoczekiwany błąd"
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Uwierzytelnianie z Torem"
+
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "Wymagana autentykacja poprzez ciasteczko"
+
+msgctxt "MainWindow"
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgstr "Oprogramowanie Tor wymaga od Vidalii wysłania zawartości ciasteczka uwierzytelniającego, jednakże Vidalia nie znalazła żadnego."
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "Czy chciałbyś obejrzeć zawartosć pliku 'control_auth_cookie' ?"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Katalog danych"
+
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Ciasteczko sterujące (control_auth_cookie)"
+
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "Błąd rejestracji przy odbiorze Zdarzeń."
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr "Vidalia nie mogła zarejestrować się w systemie do obsługi zdarzeń. Wiele funkcji może być niedostępnych."
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Błąd uwierzytelnienia"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia nie zdołała uwierzytelnić się oprogramowaniu Tor."
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Proszę sprawdzić port sterujący autentykacją."
+
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "Aktualizacja Tora jest dostępna"
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr "Zainstalowana obecnie wersja Tora jest przestarzała lub nie polecana. Proszę odwiedzić stronę Tora i ściągnąć najnowszą wersję."
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Strona Tora: %1"
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "Wszystkie następne połączenia będą inne niż Twoje obecne."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "Tworzenie nowej tożsamości nie powiodło się."
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "Przekierowanie portu zawiodło"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "Vidalia nie zdołała automatycznie skonfigurować przekierowania portów."
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Panel Kontrolny Vidalii"
+
+msgctxt "MainWindow"
+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ę."
+
+msgctxt "MainWindow"
+msgid "Would you like to check if a newer package is available for installation?"
+msgstr "Czy chcesz sprawdzić dostępność nowszej wersji do instalacji?"
+
+msgctxt "MainWindow"
+msgid "Potentially Unsafe Connection"
+msgstr "Potencjalnie niebezpieczne połączenie"
+
+msgctxt "MainWindow"
+msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
+msgstr ""
+"Jedna z Twoich aplikacji%1wykonuje potencjalnie niebezpieczne i "
+"niezaszyfrowane połączenia na porcie %2. Wszystko wysyłane tym połączeniem "
+"może być monitorowane. Proszę sprawdzić konfigurację tej aplikacji i używać "
+"tylko szyfrowanych protokołów, takich jak SSL, jeśli to możliwe."
+
+msgctxt "MainWindow"
+msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgstr ""
+"Tor automatycznie zamknął Twoje połączenie, aby chronić Twoją anonimowość."
+
+msgctxt "MainWindow"
+msgid "Update Failed"
+msgstr "Aktualizacja Tora jest dostępna"
+
+msgctxt "MainWindow"
+msgid "Your software is up to date"
+msgstr "Twoje oprogramowanie jest w najnowszej wersji"
+
+msgctxt "MainWindow"
+msgid "There are no new Tor software packages available for your computer at this time."
+msgstr "W tej chwili nie ma dostępnych nowszych wersji oprogramowania Tor."
+
+msgctxt "MainWindow"
+msgid "Installation Failed"
+msgstr "Instalacja nie powiodła się"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to install your software updates."
+msgstr "Vidalia nie mogła zainstalować uaktualnień oprogramowania."
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr "Wystąpił następujący błąd:"
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "nie powiodło się (%1)"
+
+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 "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgstr ""
+"Posiadasz uruchomiony węzeł Tora. Wyłączenie węzła przerwie wszystkie "
+"otwarte połączenia z klientami.\n"
+"\n"
+"Czy chciałbyś uprzedzić ich o tym fakcie i dać czas na znalezienie nowego "
+"serwera?"
+
+msgctxt "MainWindow"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr ""
+"Vidalia wykryła, że Tor nieoczekiwanie zakończył działanie.\n"
+"\n"
+"Proszę sprawdzić logi w celu poznania przyczyny."
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", prawdopodobnie Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", prawdopodobnie klient e-mail,"
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr "Plik"
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "O Vidalii"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Główna"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr "Sprawdź aktualizacje"
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Błąd ustawiania filtru"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia nie mogła zarejestrować się jako odbiorca logów Tora."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "Błąd otwierania pliku logów"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia nie mogła otworzyć wskazanego pliku Logów."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Wymagana nazwa pliku loga"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "Musisz wpisać nazwę pliku, aby móc zapisywać wiadomości do pliku."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Wybierz plik z Logami"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Zapisz Logi"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Pliki tekstowe (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Wyszukaj wiadomość"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Znajdź:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Nie znaleziono"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "Znaleziono 0 pasujących."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Dziennik Logów"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Filtry wiadomości..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Ustawia filtrowanie wiadomości"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Rozmiar historii..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Ustawia maksymalną liczbę wyświetlanych wiadomości"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Wyczyść"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Czyści wszystkie wiadomości z Dziennika Logów (Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Kopiuj"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Kopiuje zaznaczone wiadomości do schowka (Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Zaznacz wszystkie"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Zaznacza wszystkie wiadomości (Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Zapisz wszystkie"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Zapisuje wszystkie wiadomości do pliku"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Zapisz wybrane"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Zapisuje zaznaczone wiadomości do pliku"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Ustawienia"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Zmienia ustawienia Logów"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Pomoc"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Pokazuje przeglądarkę Pomocy"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Zamknij"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Zamyka Dziennik Logów"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Znajdź"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Znajduje wszystkie wiadomości zawierające szukany tekst (Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Czas"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Typ"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Wiadomość"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Zapisuje bieżące ustawienia Dziennika Logów"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Anuluje zmiany dokonane w ustawieniach"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Anuluj"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Filtr wiadomości"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Błąd"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Ostrzeżenie"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Powiadomienie"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Informacja"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Systemowe"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "Historia Logów"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Liczba wiadomości wyświetlanych w oknie logów"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "wiadomości"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Zawsze zapisuj nowe wiadomości"
+
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "Przeglądaj"
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr "Włącz automatyczne zapisywanie wszystkich nowych wiadomości do pliku"
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "Automatycznie zapisuj wiadomości do pliku"
+
+msgctxt "MessageLog"
+msgid "Messages that appear when something has \n"
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+"Wiadomości, które pojawiają się, gdy \n"
+"pojawił się poważny błąd i Tor nie mógł kontynuować."
+
+msgctxt "MessageLog"
+msgid "Messages that only appear when \n"
+"something has gone wrong with Tor."
+msgstr ""
+"Wiadomości, które pojawiają się, gdy\n"
+"coś poszło źle z Torem."
+
+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 ""
+"Wiadomości, które pojawiają się rzadko \n"
+"podczas normalnej pracy i nie są uważane za błędy,\n"
+"ale mogą Cię zainteresować."
+
+msgctxt "MessageLog"
+msgid "Messages that appear frequently \n"
+"during normal Tor operation."
+msgstr ""
+"Wiadomości, które często pojawiają się \n"
+"podczas normalnej pracy Tora."
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+"Bardzo szczegółowe wiadomości, będące\n"
+"zainteresowaniem programistów Tora."
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+"Nie można zapisywać do pliku %1\n"
+"\n"
+"%2."
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Mapa Sieci"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Odśwież"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "Odśwież listę węzłów Tora i połączeń"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Pomoc"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Pokazuje pomoc dla Widoku Sieci"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Pokazuje pomoc dla Widoku Sieci"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Zamknij"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Zamyka Widok Sieci"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Zbliżenie"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Powiększa widok na mapie"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Oddalenie"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Pomniejsza widok na mapie"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Pokaż całość"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Ustaw powiększenie tak, aby objąć wszystkie połączenia"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "Pliku nie znaleziono"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr "Brak detali o wybranym węźle."
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "Nieznane"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr "Pełny ekran"
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr "Pokazuj mapę sieci na pełnym ekranie"
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "Niepoprawny Węzeł-Most"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "Określony identyfikator Węzła-Mostu nie jest poprawny."
+
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr "Kopiuj (Ctrl+C)"
+
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr "Musisz określić adres IP lub nazwę hosta oraz numer portu, aby Tor mógł używać serwera proxy w dostępie do Internetu."
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "Musisz określić jeden lub kilka portów, na których Twój firewall akceptuje przychodzące połączenia."
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' nie jest poprawnym numerem portu."
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr "Sprawdź czy Twoja sieć lokalna wymaga proxy w dostępie do Internetu"
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "Używam proxy w dostępie do Internetu"
+
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr "Ustawienia Proxy"
+
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "HTTP Proxy:"
+
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr "Użytkownik:"
+
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "Użyj tego proxy również dla połączeń HTTPS"
+
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr "Hasło:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "Port"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr "Zaznacz, aby łączyć się do węzłów używając portów dozwolonych w Twoim firewallu"
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "Mój firewall pozwala mi na połączenia tylko na niektórych portach"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "Ustawienia Firewalla"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "Dozwolone porty:"
+
+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 "Zaznacz aby zaszyfrować żądania dostępu do katalogu i, opcjonalnie, używać węzłów-mostów w dostępie do sieci Tor"
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "Mój dostawca internetu blokuje połączenia do sieci Tor"
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr "Ustawienia Mostu"
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr "Oprogramowanie Tor, które jest aktualnie uruchomione nie wspiera mostów. <br>Połączenia do katalogów pomimo tego będą szyfrowane."
+
+msgctxt "NetworkPage"
+msgid "Add a Bridge:"
+msgstr "Dodaj Węzeł-Most:"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Jak mam znaleźć węzeł-most?</a>"
+
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr "Usuń wybrane węzły-mosty z listy"
+
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr "Kopiuj wybrane węzły-mosty do schowka"
+
+msgctxt "NetworkPage"
+msgid "Find Bridges Now"
+msgstr "Znajdź węzeł-most"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
+msgstr "<a href=\\\"bridges.finding\\\">Jak jeszcze mogę znaleźć węzły-mosty?</a>"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
+msgstr "<a href=\\\"bridges.finding\\\">Jak mogę znaleźć węzły-mosty?</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 ""
+"Nowe węzły-mosty nie są dostępne. Możesz poczekać i spróbować ponownie, albo "
+"użyć innej metody znalezienia nowych węzłów-mostów."
+
+msgctxt "NetworkPage"
+msgid "Click Help to see other methods of finding new bridges."
+msgstr "Kliknij Pomoc, aby zobaczyć inne metody znajdywania węzłów-mostów."
+
+msgctxt "Policy"
+msgid "accept"
+msgstr "akceptuj"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "odrzuć"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Aktywny"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Uśpiony"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Wyłączony"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Lokalizacja:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "Adres IP:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Platforma:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Przepustowość:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Działa:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Aktualizacja:"
+
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Kopiuj"
+
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
+msgstr "Uśpiony"
+
+msgctxt "RouterInfoDialog"
+msgid "Online"
+msgstr "Aktywny"
+
+msgctxt "RouterInfoDialog"
+msgid "Offline"
+msgstr "Wyłączony"
+
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr "Nieznane"
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr "Szczegóły węzła"
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr "Podsumowanie"
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr "Nazwa:"
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr "Status"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "Lokalizacja:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "Adres IP:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "Platforma:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "Przepustowość:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "Działa:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "Kontakt:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "Aktualizacja:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr "Deskryptor"
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Wyłączony"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Uśpiony"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Węzeł"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "Zbliż do węzła"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 węzłów aktywnych"
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Kopiuj"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "Pseudonim"
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "Odcisk palca"
+
+msgctxt "ServerPage"
+msgid "Bridge Support Unavailable"
+msgstr "Wsparcie dla węzłów-mostów niedostępne"
+
+msgctxt "ServerPage"
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgstr "Skonfigurowałeś swojego Tora jako węzeł-most dla zablokowanych użytkowników, ale Twoja wersja Tora nie obsługuje tej funkcji."
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "Uaktualnij Tora bądź skonfiguruj go do pracy jako zwykły węzeł."
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "Twój węzeł-most nie jest uruchomiony."
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "Musisz podać przynajmniej nazwę węzła oraz port."
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "Działaj tylko jako klient"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Udostępnij moje łącze dla sieci Tor"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "Port węzła:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "Włącz buforowanie katalogu serwerów"
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "Próbuje automatycznie skonfigurować przekierowanie portu"
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "Testuj"
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "Pokazuje pomoc dotyczącą przekierowania portów"
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Port Listy:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Numer portu Katalogu Węzłów"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Kontakt:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "Nazwa Twojego węzła"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "Port na którym użytkownicy i inne węzły komunikują się z Twoim węzłem"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Ksywa:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Ustawienia podstawowe"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Dla połączeń o wysokiej prędkości ściągania a niskiej wysyłania, proszę wybrać typ o zbliżonej prędkości wysyłania."
+
+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 "Inny"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Wybierz typ najdokładniej opisujący Twoje połączenie Internetowe"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Pokazuje pomoc na temat limitów przepustowości"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Średnia przepustowość"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Długookresowa średnia przepustowość Twojego łącza"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Maksymalna przepustowość"
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "Szczytowa przepustowość Twojego łącza"
+
+msgctxt "ServerPage"
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr "Twoja maksymalna przepustowość musi być większa lub równa średniej przepustowości. Obie wartości muszą wynosić co najmniej 20 KB/s."
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Limity przepustowości"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Porty 6660 - 6669 i 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Usługa IRC"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Porty 110, 143, 993 i 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Odbieranie maili (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Pozostałe niewymienione porty"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Inne usługi"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Porty 706, 1863, 5050, 5190, 5222, 8300 i 8888"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "Komunikatory internetowe"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "Port 443"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "Bezpieczne witryny (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Port 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Strony WWW"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "Pokazuje pomoc dotyczącą reguł"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr "Jakie zasoby Internetu będą dostępne dla użytkowników korzystających z twojego serwera ?"
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr "Tor będzie domyślnie blokował niektóre wychodzące połączenia poczty elektronicznej i aplikacji p2p, aby zredukować liczbę spamu i innych nadużyć."
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Polityka połączeń"
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr "Pozwalaj innym na dostęp do Twojego mostu poprzez użycie następującej linii:"
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "To jest tożsamość Twojego węzła-mostu który możesz udostępniać innym"
+
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr "Skopiuj tożsamość Twojego węzła-mostu do schowka systemowego"
+
+msgctxt "ServerPage"
+msgid "No Recent Usage"
+msgstr "Brak aktywności"
+
+msgctxt "ServerPage"
+msgid "No clients have used your relay recently."
+msgstr "Ostatnio żaden klient nie korzystał z Twojego węzła."
+
+msgctxt "ServerPage"
+msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgstr "Pozostaw Twój węzeł uruchomiony, aby klienci mogli z niego korzystać."
+
+msgctxt "ServerPage"
+msgid "Bridge History"
+msgstr "Ustawienia Mostu"
+
+msgctxt "ServerPage"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgstr "Vidalia nie mogła zapisać ustawień %1."
+
+msgctxt "ServerPage"
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgstr ""
+"Tor zwrócił odpowiedź w niepoprawnym formacie, gdy Vidalia poprosiła o "
+"historię użycia Twojego węzła."
+
+msgctxt "ServerPage"
+msgid "The returned response was: %1"
+msgstr "Zwrócona odpowiedź: %1"
+
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network"
+msgstr "Pomóż użytkownikom z ograniczeniami uzyskać dostęp do sieci Tor (Tor 0.2.0.8-alpha i nowsze)"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Jak mam znaleźć węzeł-most?</a>"
+
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory"
+msgstr "Przechowuj kopię Katalogu Węzłów"
+
+msgctxt "ServerPage"
+msgid "Email address at which you may be reached if there is a\n"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr ""
+"Adres e-mail, pod którym jesteś dostępny w przypadku\n"
+"problemów z działaniem Twojego węzła. Możesz również zamieścić sygnatury PGP "
+"lub GPG."
+
+msgctxt "ServicePage"
+msgid "Error while trying to unpublish all services"
+msgstr "Wystąpił błąd podczas dezaktywacji wszystkich usług"
+
+msgctxt "ServicePage"
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
+msgstr "Proszę skonfigurować przynajmniej katalog usług oraz wirtualny port dla każdej usługi. Inne proszę usunąć."
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Błąd"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "Proszę wybrać usługę."
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "Wybierz katalog usług"
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "Wirtualny port może zawierać tylko poprawne numery portów [1..65535]."
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "Cel może tylko zawierać adres:port, adres lub port."
+
+msgctxt "ServicePage"
+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"
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "Adres Onion"
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "Port wirtualny"
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "Cel"
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "Ścieżka do katalogu"
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "Włączony"
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "Dodaj nową usługę do listy"
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "Usuń zaznaczoną usługę z listy"
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr "Skopiuj adres Onion wybranej usługi do schowka"
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr "Przeglądaj lokalny system plików i wskaż katalog dla wybranej usługi"
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "Utworzone przez Tora"
+
+msgctxt "Stream"
+msgid "New"
+msgstr "Nowe"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Analizowanie"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Łączenie"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "Otwarte"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Błąd"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Zamknięte"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Powtórna próba"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "Przemapowane"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Nieznane"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "Nieudana próba zatrzymania procesu %1. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "Usługa Tora nie jest zainstalowana."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "Uruchomienie usługi Tor nie powiodło się."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "Haszowanie hasła sterującego nie powiodło się."
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "Sukces"
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "Nie znaleziono urządzeń ze wsparciem UPnP"
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "Nie znaleziono bramek internetowych ze wsparciem UPnP"
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "WSAStartup zawiodło"
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "Nieudane dodanie mapowania portów"
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "Nieudana próba otrzymania mapowania portów"
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "Nieudana próba usunięcia mapowania portów"
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "Nieznany błąd"
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "Wykrywanie urządzeń wspierających UPnP"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "Uaktualnianie mapowania portów katalogu"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "Uaktualnianie mapowania portów serwera"
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "Test zakończony sukcesem!"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "Testuję wsparcie UPnP"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr "Testuję wsparcie dla Universal Plug & Play"
+
+msgctxt "UpdateProcess"
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgstr ""
+"Vidalia nie mogła sprawdzić dostępności nowej wersji oprogramowania ponieważ "
+"nie znalazła '%1'."
+
+msgctxt "UpdateProcess"
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgstr ""
+"Vidalia nie mogła sprawdzić dostępności nowej wersji oprogramowania, "
+"ponieważ składnik Tora nieoczekiwanie zakończył działanie."
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for available updates..."
+msgstr "Sprawdzanie dostępności aktualizacji oprogramowania..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Hide"
+msgstr "Ukryj"
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr "Pobieranie aktualizacji..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr "Uruchamianie oprogramowania Tor"
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr "Zakończono! Twoje oprogramowanie jest teraz w najnowszej wersji"
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr "Aktualizacje oprogramowania"
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr "Sprawdzanie aktualizacji..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr "Anuluj"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr "Aktualizacja Tora jest dostępna"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr "Przypomnij później"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr "Zainstaluj"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr "Następujące składniki oprogramowania są gotowe do instalacji:"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr "Backspace"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr "wersja"
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Anuluj"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Tak"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Nie"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Pomoc"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Ponów"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Pokaż log"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Pokaż ustawienia"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Kontynuuj"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Wyjdź"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Przeglądaj"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Błędny parametr."
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia jest już uruchomiona"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Wyświetla tę wiadomość i wychodzi."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "Czyści WSZYSTKIE ustawienia Vidalii."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Ustawia katalog, którego Vidalia używa do zapisu danych."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Ustawia nazwę i położenie pliku pidfile."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Ustawia nazwę i położenie pliku logów Vidalii."
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Ustawia szczegółowość logowania Vidalii."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Ustawia styl interfejsu Vidalii."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Ustawia język Vidalii."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Informacja o użytkowaniu Vidalii."
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "Nie udało się otworzyć pliku logu '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr "Niepoprawny kod języka:"
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr "Niepoprawny styl GUI:"
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr "Niepoprawny poziom logowania:"
+
+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 ""
+"Inny proces Vidalii jest prawdopodobnie już uruchomiony. Jeśli jesteś pewien "
+"że nie, możesz kontynuować.\n"
+"\n"
+"Czy chcesz kontynuować uruchamianie Vidalii?"
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr "%1 sekund"
+
+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 dni"
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr "%1 godzin"
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr "%1 minut"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pt/qt_pt.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pt/qt_pt.po
new file mode 100644
index 0000000..118a575
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pt/qt_pt.po
@@ -0,0 +1,442 @@
+msgid ""
+msgstr ""
+"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: 2009-12-14 02:47-0700\n"
+"Last-Translator: Tiago Faria <gouki at goukihq.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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "Activar"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "O executável '%1' requere Qt %2, Qt %3 encontrado."
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "Erro de Incompatibilidade da Biblioteca Qt"
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "QT_LAYOUT_DIRECTION"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "Activa a janela principal do programa"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "OK"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "Salvar"
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "Abrir"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "Fechar"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "Aplicar"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "Restaurar"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "Ajuda"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "Não Salvar"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "Descartar"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "&Sim"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "Sim para &Todos"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "&Não"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "N&ão para Todos"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "Salvar Todos"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "Abortar"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "Tentar Novamente"
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "Restaurar Predefinições"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "Fechar sem Salvar"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "&OK"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "Nome"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "Tamanho"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "Tipo"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "Tipo"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "Data de Modificação"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "Todos os Arquivos (*)"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "Pastas"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "&Abrir"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "&Salvar"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "Abrir"
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"%1 já existe.\n"
+"Deseja substituir?"
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+"%1\n"
+"Ficheiro não encontrado.\n"
+"Por favor verifique o nome do ficheiro."
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "O Meu Computador"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "&Renomear"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "&Apagar"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "Mostrar ficheiros &escondidos"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "Recuar"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "Pasta Principal"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "Vista em Lista"
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "Vista Detalhada"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "Ficheiros do tipo:"
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "Pasta:"
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+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.\n"
+"Deseja apagar mesmo assim?"
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "Deseja mesmo apagar '%1'?"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "Não foi possível apagar a pasta."
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "Todos os Ficheiros (*.*)"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "Gravar Como"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "Unidade"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "Ficheiro"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "Procurar Pasta"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "Mostrar "
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "Seguinte"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "Nova Pasta"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "&Nova Pasta"
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "&Escolher"
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "Remover"
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "&Nome do Arquivo:"
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "Ver em:"
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "Criar Nova Pasta"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "Invalid filename"
+msgstr "Nome do ficheiro inválido"
+
+#: 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>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"
+msgid "Name"
+msgstr "Nome"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "Tamanho"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "Tipo"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "Tipo"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "Data de Modificação"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "O Meu Computador"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "Computador"
+
+#: 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 bytes"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pt/vidalia_pt.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pt/vidalia_pt.po
new file mode 100644
index 0000000..8991c2e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pt/vidalia_pt.po
@@ -0,0 +1,3321 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2010-04-23 17:45-0600\n"
+"Last-Translator: Tiago Faria <gouki at goukihq.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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Sobre o Vidalia"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "Licença"
+
+msgctxt "AboutDialog"
+msgid "Vidalia 0.2.0"
+msgstr "Vidalia"
+
+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 "AboutDialog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "Qt"
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr "versão"
+
+msgctxt "AdvancedPage"
+msgid "'%1' is not a valid IP address."
+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 'Password' para autenticação, mas não especificou uma "
+"senha."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Escolha o ficheiro de configuração do Tor"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Ficheiro Não Encontrado"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 não existe. Deseja criá-lo?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Erro na Criação do Ficheiro"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "Não foi possível criar %1 [%2]"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Seleccione um directório para armazenamento dos dados do Tor"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Não foi possível remover o serviço do Tor"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "Não foi possível instalar o serviço do Tor"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "O Vidalia não conseguiu instalar o serviço do Tor."
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Porto de Controle"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "Autenticação:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Endereço:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "Nenhum"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Cookie"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Senha"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "Gerar Aleatoriamente"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Ficheiro de Configuração do Tor"
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+"Iniciar o software Tor com o ficheiro de configuração especificado (torrc)"
+
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "Seleccione o caminho para o seu ficheiro de configuração"
+
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Navegar"
+
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr "Directório de Dados"
+
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr "Guardar dados do software Tor no seguinte directório"
+
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr "Seleccione o directório usado para guardar os do software Tor"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+"O Vidalia falhou na remoção do serviço Tor.\n"
+"\n"
+"Pode ter que o remover manualmente."
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Idioma"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Escolha o idioma utilizado no Vidalia"
+
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Estilo"
+
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Escolha o estilo de interface do Vidalia"
+
+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 "BandwidthGraph"
+msgid "Since:"
+msgstr "Desde:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Ocultar Configurações"
+
+msgctxt "BandwidthGraph"
+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"
+
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Velocidade de Recebimento"
+
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Velocidade de Envio"
+
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Manter Sempre em Primeiro Plano"
+
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Estilo"
+
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Altera a transparência do Gráfico de Largura de Banda"
+
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% Opacidade"
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Guardar"
+
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr "A iniciar o pedido de bridge HTTPS..."
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr "A estabelecer ligação com %1:%2..."
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr "A enviar o pedido de bridges HTTPS..."
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr "A descarregar a lista de bridges..."
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr "A descarregar as Bridges"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr "Impossível descarregar as bridges: %1"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr "A tentar novamente o pedido de bridge..."
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr "País"
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr "# Clientes"
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr "Clientes dos seguintes países tem utilizado o seu relay desde %1"
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr "Relatório de utilização da Bridge"
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr "Relatório de utilização do Cliente"
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "Novo"
+
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Abrir"
+
+msgctxt "Circuit"
+msgid "Building"
+msgstr "A construir ligação"
+
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Falhou"
+
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Encerrado"
+
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Desconhecido"
+
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Directório Vazio>"
+
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Ligação"
+
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "Estado"
+
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Zoom ao Circuito"
+
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "Fechar Circuito (Del)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Fechar Transmissão (Del)"
+
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "Geral"
+
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Rede"
+
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr "Partilha"
+
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "Serviços"
+
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Aparência"
+
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Avançado"
+
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Ajuda"
+
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Erro ao salvar as configurações"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr "O Vidalia não conseguiu salvar as suas configurações de %1."
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Erro ao aplicar configurações "
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "O Vidalia não conseguiu aplicar as configurações %1 ao Tor."
+
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Configurações"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "O Vidalia não conseguiu estabelecer uma ligação ao Tor. (%1)"
+
+msgctxt "ControlConnection"
+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"
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
+msgstr "Memorizar a minha palavra-passe"
+
+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:"
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "O socket de controle não está conectado."
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Erro ao enviar comando de controle. [%1]"
+
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr "Socket perdeu a ligação enquanto tentava ler uma linha de dados."
+
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Resposta de controle Inválida. [%1]"
+
+msgctxt "CountryInfo"
+msgid "Afghanistan"
+msgstr "Afeganistão"
+
+msgctxt "CountryInfo"
+msgid "Andorra"
+msgstr "Andorra"
+
+msgctxt "CountryInfo"
+msgid "Angola"
+msgstr "Angola"
+
+msgctxt "CountryInfo"
+msgid "Antigua & Barbuda"
+msgstr "Antigua e Barbuda"
+
+msgctxt "CountryInfo"
+msgid "Argentina"
+msgstr "Argentina"
+
+msgctxt "CountryInfo"
+msgid "Armenia"
+msgstr "Arménia"
+
+msgctxt "CountryInfo"
+msgid "Australia"
+msgstr "Austrália"
+
+msgctxt "CountryInfo"
+msgid "Azerbaijan"
+msgstr "Azerbaijão "
+
+msgctxt "CountryInfo"
+msgid "Bahamas"
+msgstr "Bahamas"
+
+msgctxt "CountryInfo"
+msgid "Bangladesh"
+msgstr "Bangladeche "
+
+msgctxt "CountryInfo"
+msgid "Barbados"
+msgstr "Barbados"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Belarus"
+msgstr "Belarus"
+
+msgctxt "CountryInfo"
+msgid "Belgium"
+msgstr "Bélgica"
+
+msgctxt "CountryInfo"
+msgid "Belize"
+msgstr "Belize"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Bhutan"
+msgstr "Bhutan"
+
+msgctxt "CountryInfo"
+msgid "Bolivia"
+msgstr "Bolívia"
+
+msgctxt "CountryInfo"
+msgid "Bosnia & Herzegovina"
+msgstr "Bósnia & Herzegovina"
+
+msgctxt "CountryInfo"
+msgid "Botswana"
+msgstr "Botswana"
+
+msgctxt "CountryInfo"
+msgid "Brazil"
+msgstr "Brasil"
+
+msgctxt "CountryInfo"
+msgid "Brunei Darussalam"
+msgstr "Brunei Darussalam"
+
+msgctxt "CountryInfo"
+msgid "Bulgaria"
+msgstr "Bulgária"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+msgctxt "CountryInfo"
+msgid "Burundi"
+msgstr "Burúndi "
+
+msgctxt "CountryInfo"
+msgid "Cambodia"
+msgstr "Cambodja "
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Cameroon"
+msgstr "Cameroon"
+
+msgctxt "CountryInfo"
+msgid "Canada"
+msgstr "Canadá"
+
+msgctxt "CountryInfo"
+msgid "Cape Verde"
+msgstr "Cabo Verde"
+
+msgctxt "CountryInfo"
+msgid "Central African Republic"
+msgstr "República central Africana"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Chad"
+msgstr "Chad"
+
+msgctxt "CountryInfo"
+msgid "Chile"
+msgstr "Chile"
+
+msgctxt "CountryInfo"
+msgid "China"
+msgstr "China"
+
+msgctxt "CountryInfo"
+msgid "Colombia"
+msgstr "Colômbia"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Comoros"
+msgstr "Comoros"
+
+msgctxt "CountryInfo"
+msgid "Congo, The Democratic Republic of the"
+msgstr "Congo, A República Democrática de"
+
+msgctxt "CountryInfo"
+msgid "Congo"
+msgstr "Congo"
+
+msgctxt "CountryInfo"
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Cote d’Ivoire"
+msgstr "Cote dâ Ivoire"
+
+msgctxt "CountryInfo"
+msgid "Croatia"
+msgstr "Croácia"
+
+msgctxt "CountryInfo"
+msgid "Cuba"
+msgstr "Cuba"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Cyprus"
+msgstr "Cyprus"
+
+msgctxt "CountryInfo"
+msgid "Czech Republic"
+msgstr "República Checa"
+
+msgctxt "CountryInfo"
+msgid "Denmark"
+msgstr "Dinamarca"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Djibouti"
+msgstr "Djibouti"
+
+msgctxt "CountryInfo"
+msgid "Dominica"
+msgstr "Domínica"
+
+msgctxt "CountryInfo"
+msgid "Dominican Republic"
+msgstr "República Dominicana"
+
+msgctxt "CountryInfo"
+msgid "Ecuador"
+msgstr "Equador"
+
+msgctxt "CountryInfo"
+msgid "Egypt"
+msgstr "Egipto "
+
+msgctxt "CountryInfo"
+msgid "El Salvador"
+msgstr "El Salvador"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Equatorial Guinea"
+msgstr "Equatorial Guinea"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Eritrea"
+msgstr "Eritrea"
+
+msgctxt "CountryInfo"
+msgid "Estonia"
+msgstr "Estónia"
+
+msgctxt "CountryInfo"
+msgid "France"
+msgstr "França"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Gabon"
+msgstr "Gabon"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Gambia"
+msgstr "Gambia"
+
+msgctxt "CountryInfo"
+msgid "Georgia"
+msgstr "Geórgia "
+
+msgctxt "CountryInfo"
+msgid "Germany"
+msgstr "Alemanha"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Ghana"
+msgstr "Ghana"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Grenada"
+msgstr "Grenada"
+
+msgctxt "CountryInfo"
+msgid "Guatemala"
+msgstr "Guatemala"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Guinea"
+msgstr "Guinea"
+
+msgctxt "CountryInfo"
+msgid "Guinea-Bissau"
+msgstr "Guiné-Bissau"
+
+#, fuzzy
+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 "Israel"
+
+msgctxt "CountryInfo"
+msgid "Italy"
+msgstr "Itália"
+
+msgctxt "CountryInfo"
+msgid "Jamaica"
+msgstr "Jamaica"
+
+msgctxt "CountryInfo"
+msgid "Japan"
+msgstr "Japão"
+
+msgctxt "CountryInfo"
+msgid "Jordan"
+msgstr "Jordânia"
+
+msgctxt "CountryInfo"
+msgid "Kazakhstan"
+msgstr "Cazaquistão"
+
+msgctxt "CountryInfo"
+msgid "Kenya"
+msgstr "Quénia"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Kiribati"
+msgstr "Kiribati"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Kuwait"
+msgstr "Kuwait"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Kyrgyzstan"
+msgstr "Kyrgyzstan"
+
+#, fuzzy
+msgctxt "CountryInfo"
+msgid "Laos"
+msgstr "Laos"
+
+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 "Licença"
+
+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 "Prosseguir"
+
+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 "Geral"
+
+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 "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 "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Executáveis (*.exe)"
+
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Selecione o Diretório para o Tor"
+
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr "Navegar"
+
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Tor"
+msgstr "Tor"
+
+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 "%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 "O Arquivo XML de Conteúdo fornecido não é válido."
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "A Busca chegou ao final do documento"
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "A Busca chegou ao início do documento"
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "Texto não encontrado no documento"
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "Encontrado(s) %1 resultado(s)"
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Ajuda do Vidalia"
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Voltar"
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Ir para a página anterior (Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Prosseguir"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Ir para a próxima página (Shift+Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Início"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Ir para a Página Inicial (Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Procurar"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "Procurar por uma palavra ou frase nesta página (Ctrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Fechar"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Fechar a Ajuda do Vidalia"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Procurar:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Encontrar Anterior"
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Encontrar Próximo"
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "Sensível a Caixa Alta/Baixa"
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Somente palavras inteiras"
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Tópicos de Ajuda"
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Conteúdo"
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Busca"
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Procurando por:"
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Documento Encontrados"
+
+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 "Licença"
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "Depuração"
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Info"
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Nota"
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Aviso"
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Erro"
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Desconhecido"
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Sair"
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Gráfico de Largura de Banda"
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Log de Mensagens"
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Mapa da Rede"
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Configurações"
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr "Sobre"
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr "Ajuda"
+
+msgctxt "MainWindow"
+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 ""
+
+msgctxt "MainWindow"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "MainWindow"
+msgid "View"
+msgstr "Visualizar"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Ajuda do Vidalia"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Erro ao Iniciar o 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 "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"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Diretório de Dados"
+
+msgctxt "MainWindow"
+msgid "Control 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."
+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 ""
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "As novas conexões irão parecer diferentes das conexões antigas."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "Falha ao Criar Nova Identidade"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "Estado"
+
+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 ""
+
+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 "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 "Falhou"
+
+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 "O Vidalia não conseguiu instalar o serviço do Tor."
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+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 ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "Sobre o Vidalia"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Início"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Erro na Definição do Filtro"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "O Vidalia foi incapaz de registrar os eventos de log do Tor."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+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 especificado."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+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 "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 Log"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Salve as Mensagens do Log"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Arquivos Texto (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Procurar no Log de Mensagens"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Procurar:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Não Encontrado"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "A procura encontrou 0 ocorrências."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Log de Mensagens"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Filtros de Mensagens..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Definir filtros de mensagens"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Tamanho do Histórico..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Definir o número máximo de mensagens a serem visualizadas"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Limpar"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Limpar todas as mensagens do Log de Mensagens (Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Copiar"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Copiar as mensagens selecionadas para a área de transferência (Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Selecionar Todos"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Selecionar todas as mensagens (Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Salvar Todas"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Salvar todas as mensagens para um arquivo"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Salvar as Selecionadas"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Salvar as mensagens selecionadas para um arquivo"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Configurações"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Ajustar a Configuração do Log de Mensagens"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Ajuda"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Mostrar o Navegador da Ajuda"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Fechar"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Fechar o Log de Mensagens"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Procurar"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Procurar todas as mensagens contendo o texto (Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Hora"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Tipo"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Mensagem"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Salvar a configuração do Log de Mensagens corrente"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Salvar as Configurações"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Cancela as mudanças efetuadas na configuração"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Filtro de Mensagens"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Erro"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Aviso"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Nota"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Info"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Depuração"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+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 de mensagens do log"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "mensagens"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Sempre Salvar Novas Mensagens de Log"
+
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "Navegar"
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr "Habilitar o salvamento automatico de todas as mensagens de log para arquivo"
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "Salvar automaticamente as novas mensagens de log para arquivo"
+
+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."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Atualizar"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Ajuda"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Mostrar a ajuda do mapa da rede"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Mostrar a ajuda do mapa da rede"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Fechar"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Fechar o mapa da rede"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Mais Zoom"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Mais Zoom no mapa da rede"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Menos Zoom"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Menos Zoom no mapa da rede"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Ajustar o Zoom"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Ajustar o Zoom para conter todos os circuitos mostrados"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "Arquivo Não Encontrado"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "Desconhecido"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+msgctxt "NetworkPage"
+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."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+msgctxt "NetworkPage"
+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 ""
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+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 ""
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+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 ""
+
+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 "Policy"
+msgid "accept"
+msgstr "Aceitar"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "Rejeitar"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Ativo"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Hibernando"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Inativo"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Localização:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "Endereço IP:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Plataforma:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Largura de Banda:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Ativo a:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Última Atualização:"
+
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Copiar"
+
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
+msgstr "Hibernando"
+
+msgctxt "RouterInfoDialog"
+msgid "Online"
+msgstr "Ativo"
+
+msgctxt "RouterInfoDialog"
+msgid "Offline"
+msgstr "Inativo"
+
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr "Desconhecido"
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr "Apelido:"
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr "Estado"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "Localização:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "Endereço IP:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "Plataforma:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "Largura de Banda:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "Ativo a:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "Informações de contato:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "Última Atualização:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Inativo"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Hibernando"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Copiar"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr ""
+
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Retransmitir o tráfego recebido pela rede Tor"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Porta do Diretório:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Número da Porta do Diretório"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Informações de contato:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Apelido:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Configurações Básicas"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Para conexões de internet de alta velocidade de download mas baixa de upload, por favor liste sua velocidade de upload aqui."
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "Cabo/DSL 256 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "Cabo/DSL 512 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "Cabo/DSL 768 Kbps"
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/Cabo/DSL 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "Personalizada"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Selecione a opção que seja mais adequada a sua conexão de Internet"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Mostrar o tópico de ajuda sobre os limites de largura de banda"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Taxa Média"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Limite médio de longo prazo de largura de banda"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Taxa Máxima"
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "Teto máximo da taxa de largura de banda"
+
+msgctxt "ServerPage"
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Limites de Largura de Banda"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Portas 6660 - 6669 e 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Sala de bate-papo (IRC)"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Portas 110, 143, 993 e 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Recuperar E-mail (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Portas não especificadas nas outras opções"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Misc Outros Serviços"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Portas 706, 1863, 5050, 5190, 5222, 8300 e 8888 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "Mensageiros Instantâneos (IM)"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "Porta 443"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "Sítios Web Seguras (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Porta 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Sítios Web"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "Mostrar tópicos de ajuda sobre as políticas de saída"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Polìticas de Saída"
+
+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 "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 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 ""
+
+msgctxt "ServerPage"
+msgid "The returned response was: %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 ""
+
+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 ""
+
+msgctxt "ServicePage"
+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."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Erro"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+msgctxt "Stream"
+msgid "New"
+msgstr "Novo"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Resolvendo"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Conectando"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "Conectado"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Falhou"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Desconectado"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Tentando novamente"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Desconhecido"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "O Processo %1 não pôde ser encerrado. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "O serviço do Tor não está instalado."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+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 "OK"
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr "Cancelar"
+
+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 "Backspace"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr "versão"
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Sim"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Não"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Ajuda"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Tentar Novamente"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Mostrar o Log"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Mostrar Configurações"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Navegar"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "O Vidalia já se encontra em execução"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "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 logs do Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Selecionar estilo da interface do Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Selecionar Idioma do Vidalia."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Informação de Uso do Vidalia"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "Não foi possível abrir o arquivo de log '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr "%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 ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pt_BR/qt_pt_BR.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pt_BR/qt_pt_BR.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pt_BR/qt_pt_BR.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pt_BR/vidalia_pt_BR.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pt_BR/vidalia_pt_BR.po
new file mode 100644
index 0000000..28f95c9
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/pt_BR/vidalia_pt_BR.po
@@ -0,0 +1,2765 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: 2010-02-02 17:19-0700\n"
+"Last-Translator: Aníbal Deboni Neto <anibaldeboni 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"
+"X-Generator: Pootle 1.1.0\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Sobre o Vidalia"
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "Qt"
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Tor"
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr "Indisponível"
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr "Não está em execução"
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr "0.2.0"
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr "0.2.0.31-alpha-dev (r123456)"
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr "4.4.2"
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "Licença"
+
+#: aboutdialog.ui:163
+msgctxt "AboutDialog"
+msgid "version"
+msgstr "versão"
+
+#: advancedpage.cpp:109
+msgctxt "AdvancedPage"
+msgid "'%1' is not a valid IP address."
+msgstr "'%1' não é um endereço IP válido."
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "Você selecionou autenticação com senha, mas não informou a senha."
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Escolha o arquivo de configuração do Tor"
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Arquivo não encontrado"
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 não existe. Gostaria de criá-lo?"
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Falha ao criar arquivo"
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "Incapaz de criar %1 [%2]"
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Selecione um diretório para os dados do Tor"
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Incapaz de remover o serviço Tor"
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+"Vidalia não conseguiu remover o serviço Tor. Você precisa remover "
+"manualmente."
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "Incapaz de instalar o serviço Tor"
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "Vidalia foi incapaz de instalar o serviço Tor"
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Porta de controle"
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "Autenticação:"
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Endereço:"
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "Nada"
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Cookie"
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Senha"
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "Gerado aleatoriamente"
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Arquivo de configuração do Tor"
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+"Inicie o aplicativo Tor com o arquivo de configuração específico (torrc)"
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "Selecione o caminho para seu arquivo de configuração"
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Procurar"
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr "Diretório de dados"
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr "Salve dados para o programa TOR no seguinte diretório"
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr "Selecione o direitório usado pra salvar dados para o programa TOR"
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Idioma"
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Escolha o idioma usado no Vidalia"
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Estilo"
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Selecione a aparência do Vidalia"
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr "Vidalia foi incapaz de carregar a tradução selecionada"
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr "Desde:"
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Esconder parâmetros"
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Exibir parâmetros"
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Largura de banda usada pelo Tor"
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "Reset"
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Taxa de recebimento"
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Taxa de envio"
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Sempre no topo"
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Estilo"
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Muda a transparência do gráfico de consumo de banda"
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% Opaco"
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Salvar"
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr "Novo"
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Abrir"
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr "Montando"
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Falhou"
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Fechado"
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Caminho Vazio>"
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Conexão"
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "Status"
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Zoom no circuito"
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "Fechar circuito (Del)"
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Fechar fluxo (Del)"
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "Geral"
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Rede"
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr "Compartilhando"
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "Serviços"
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Aparência"
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Avançado"
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Ajuda"
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Erro ao salvar configurações"
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr "Vidalia foi incapaz de salvar o parâmetro %1 as configurações."
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Erro ao aplicar as configurações"
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia foi incapaz de aplicar o parâmetro %1 ao Tor"
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Configurações"
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Vidalia foi incapaz de se conectar ao Tor. (%1)"
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "Conexão de controle não estabelecida."
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "Senha requerida"
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+msgstr ""
+"Vidalia se conectou a um processo Tor que necessita de senha. Por favor "
+"informe sua senha de controle: "
+
+#: controlpasswordinputdialog.ui:99
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
+msgstr "Lembrar senha"
+
+#: controlsocket.cpp:70
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "Conexão de controle não estabelecida."
+
+#: controlsocket.cpp:80
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Erro ao enviar comando de controle. [%1]"
+
+#: controlsocket.cpp:117
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr "Conexão finalizada enquanto tentava receber dados."
+
+#: controlsocket.cpp:156
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Resposta de controle invalida. [%1]"
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Executáveis (*.exe)"
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Selecionar caminho para o Tor"
+
+#: generalpage.cpp:85
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "Selecionar executável de proxy"
+
+#: generalpage.cpp:98
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr "Você deve especificar o nome do executável Tor."
+
+#: generalpage.cpp:106
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr "Os parâmetros definidos para proxy não estão adequadamente formatados."
+
+#: generalpage.ui:28
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr "Iniciar Vidalia junto com o sistema"
+
+#: generalpage.ui:121
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr "Procurar"
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Iniciar Tor e Vidalia juntos"
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "Tor"
+msgstr "Tor"
+
+#: generalpage.ui:93
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr "Aplicativo de Proxy (opcional)"
+
+#: generalpage.ui:99
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "Iniciar um aplicativo de proxy junto com o Tor"
+
+#: generalpage.ui:135
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Parâmetros do aplicativo de proxy:"
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr "Rec: "
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr "%1 kb/s"
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+msgid "Sent: "
+msgstr "Env:"
+
+#: graphframe.cpp:259
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr "%1 kb"
+
+#: graphframe.cpp:262
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr "%1 mb"
+
+#: graphframe.cpp:265
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr "%1 gb"
+
+#: helpbrowser.cpp:135
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents: "
+msgstr "Erro ao carregar conteúdo da ajuda: "
+
+#: helpbrowser.cpp:147
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr "O arquivo XML informado não é um documento válido."
+
+#: helpbrowser.cpp:396
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "A pesquisa alcançou o final do documento"
+
+#: helpbrowser.cpp:398
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "A pesquisa alcançou o inicio do documento"
+
+#: helpbrowser.cpp:400
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "Texto não encontrado"
+
+#: helpbrowser.cpp:445
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "Encontrado(s) %1 resultado(s)"
+
+#: helpbrowser.ui:33
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Ajuda do Vidalia"
+
+#: helpbrowser.ui:484
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Voltar"
+
+#: helpbrowser.ui:487
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Ir para página anterior (Backspace)"
+
+#: helpbrowser.ui:490
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Backspace"
+
+#: helpbrowser.ui:498
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Adiante"
+
+#: helpbrowser.ui:501
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Ir para próxima página (Shift+Backspace)"
+
+#: helpbrowser.ui:504
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+#: helpbrowser.ui:512
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Inicio"
+
+#: helpbrowser.ui:515
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Ir para o começo (Ctrl+H)"
+
+#: helpbrowser.ui:518
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+#: helpbrowser.ui:535
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Pesquisar"
+
+#: helpbrowser.ui:538
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "Pesquisar por uma frase ou palavra na página atual (Ctrl+F)"
+
+#: helpbrowser.ui:541
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+#: helpbrowser.ui:549
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Fechar"
+
+#: helpbrowser.ui:552
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Fechar Ajuda do Vidalia"
+
+#: helpbrowser.ui:555
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+#: helpbrowser.ui:152
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Procurar:"
+
+#: helpbrowser.ui:174
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Procurar anterior"
+
+#: helpbrowser.ui:187
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Procurar próximo"
+
+#: helpbrowser.ui:221
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "Considerar a capitalização (maiúsculas e minúsculas)"
+
+#: helpbrowser.ui:231
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Somente palavras inteiras"
+
+#: helpbrowser.ui:305
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Tópicos da Ajuda"
+
+#: helpbrowser.ui:260
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Conteúdo"
+
+#: helpbrowser.ui:350
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Busca"
+
+#: helpbrowser.ui:362
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Buscando por:"
+
+#: helpbrowser.ui:405
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Documentos encontrados"
+
+#: helptextbrowser.cpp:54
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file: "
+msgstr "Erro ao abrir arquivo de ajuda:"
+
+#: helptextbrowser.cpp:72
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr "Abrindo link externo"
+
+#: 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 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."
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr "Você deseja que o Vidalia abre este link no seu navegador?"
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr "Incapaz de abrir o link"
+
+#: 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 ""
+"Vidalia foi incapaz de abrir o link selecionado. Alternativamente você pode "
+"copiar o link e colar na barra de endereços do seu navegador."
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr "Informações de licenciamento"
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "Licença"
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr "Créditos"
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "Debug"
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Info"
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Noticias"
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Avisos"
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Erro"
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: mainwindow.ui:233
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "Iniciar Tor"
+
+#: mainwindow.ui:443
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Sair"
+
+#: mainwindow.ui:304
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Gráfico de banda"
+
+#: mainwindow.ui:317
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Mensagem de registro"
+
+#: mainwindow.cpp:348
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Mapa da rede"
+
+#: mainwindow.cpp:354
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr "Painel de controle"
+
+#: mainwindow.ui:380
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Configurações"
+
+#: mainwindow.ui:430
+msgctxt "MainWindow"
+msgid "About"
+msgstr "Sobre"
+
+#: mainwindow.ui:367
+msgctxt "MainWindow"
+msgid "Help"
+msgstr "Ajuda"
+
+#: mainwindow.cpp:1391
+msgctxt "MainWindow"
+msgid "New Identity"
+msgstr "Nova identidade"
+
+#: mainwindow.cpp:437
+msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+#: mainwindow.cpp:438
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+#: mainwindow.cpp:439
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+#: mainwindow.cpp:440
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+#: mainwindow.cpp:441
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+#: mainwindow.cpp:442
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+#: mainwindow.cpp:443
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: mainwindow.cpp:463
+msgctxt "MainWindow"
+msgid "Tor"
+msgstr "Tor"
+
+#: mainwindow.cpp:468
+msgctxt "MainWindow"
+msgid "View"
+msgstr "Ver"
+
+#: mainwindow.cpp:476
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Ajuda do Vidalia"
+
+#: mainwindow.cpp:527
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "Erro ao iniciar navegador de internet"
+
+#: mainwindow.cpp:528
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia foi incapaz de iniciar o navegador de internet configurado"
+
+#: mainwindow.cpp:540
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "Erro ao iniciar cliente de mensagens instantâneas"
+
+#: mainwindow.cpp:541
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr ""
+"Vidalia foi incapaz de iniciar o cliente de mensagens instantâneas "
+"configurado"
+
+#: mainwindow.cpp:562
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Erro ao iniciar servidor de proxy"
+
+#: mainwindow.cpp:563
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia foi incapaz de iniciar o servidor de proxy"
+
+#: mainwindow.cpp:579
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Conectando a um diretório de servidores"
+
+#: mainwindow.cpp:583
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "Estabelecendo conexão de diretório criptografado"
+
+#: mainwindow.cpp:586
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "Recebendo estado da rede"
+
+#: mainwindow.cpp:589
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "Carregando estado da rede"
+
+#: mainwindow.cpp:592
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "Carregando certificados de autoridade"
+
+#: mainwindow.cpp:595
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "Requisitando informações de servidor"
+
+#: mainwindow.cpp:598
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "Carregando informações de servidor"
+
+#: mainwindow.cpp:1132
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "Conectando a rede Tor"
+
+#: mainwindow.cpp:605
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "Estabelecendo circuito Tor"
+
+#: mainwindow.cpp:1297
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr "Conectado a rede Tor!"
+
+#: mainwindow.cpp:612
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Estado de inicio não reconhecido"
+
+#: mainwindow.cpp:619
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr "variados"
+
+#: mainwindow.cpp:622
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "identidade conflitante"
+
+#: mainwindow.cpp:625
+msgctxt "MainWindow"
+msgid "done"
+msgstr "pronto"
+
+#: mainwindow.cpp:628
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "conexão recusada"
+
+#: mainwindow.cpp:631
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "tempo limite da conexão excedido"
+
+#: mainwindow.cpp:634
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "erro de leitura/escrita"
+
+#: mainwindow.cpp:637
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "sem rota para o host"
+
+#: mainwindow.cpp:640
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "recursos insuficientes"
+
+#: mainwindow.cpp:643
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "desconhecido"
+
+#: mainwindow.cpp:645
+msgctxt "MainWindow"
+msgid " failed (%1)"
+msgstr " falhou (%1)"
+
+#: mainwindow.ui:168
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor não está em execução"
+
+#: mainwindow.cpp:686
+msgctxt "MainWindow"
+msgid "Your relay is shutting down."
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+"Seu servidor está desligando. Clique em 'Parar' novamente para finaliza-lo "
+"agora."
+
+#: mainwindow.cpp:688
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "Encerrando Tor"
+
+#: mainwindow.cpp:693
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Parar o Tor agora"
+
+#: mainwindow.cpp:695
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr "Parar Tor"
+
+#: mainwindow.cpp:711
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Iniciando o aplicativo Tor"
+
+#: mainwindow.ui:75
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "Iniciando Tor"
+
+#: mainwindow.cpp:859
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Erro ao iniciar o Tor"
+
+#: 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 foi incapaz de iniciar o Tor. Verifique suas configurações para "
+"assegurar-se de que o nome e a localização do aplicativo Tor foram "
+"apropriadamente ajustadas."
+
+#: mainwindow.cpp:896
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "Conectando ao Tor"
+
+#: mainwindow.cpp:906
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "Erro de conexão"
+
+#: mainwindow.cpp:938
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "O servidor está funcionando"
+
+#: 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 ""
+"Você esta executando um servidor. Finaliza-lo agora interromperá quaisquer "
+"conexões dos clientes conectados. Você gostaria de encerra-lo "
+"harmoniosamente, dando tempo aos clientes para que encontrem novos "
+"servidores?"
+
+#: mainwindow.cpp:965
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "Erro ao desligar"
+
+#: mainwindow.cpp:966
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "Vidalia foi incapaz de finalizar o aplicativo Tor."
+
+#: mainwindow.cpp:997
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "Erro inesperado"
+
+#: 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 ""
+"Vidalia detectou que o aplicativo Tor encerrou inesperadamente. Por favor "
+"verifique a mensagem de registro por avisos recentes ou mensagens de erro"
+
+#: mainwindow.cpp:1055
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Autenticando no Tor"
+
+#: mainwindow.cpp:1075
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "Autenticação de cookie necessária"
+
+#: 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 ""
+"O aplicativo Tor necessita que o Vidalia envie um cookie de autenticação, no "
+"entanto ele foi incapaz de encontra-lo."
+
+#: mainwindow.cpp:1080
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "Você gostaria de procurar o arquivo 'control_auth_cookie' manualmente?"
+
+#: mainwindow.cpp:1087
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Diretório de dados"
+
+#: mainwindow.cpp:1089
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Cookie de controle (control_auth_cookie)"
+
+#: mainwindow.cpp:1141
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "Erro ao registrar evento"
+
+#: mainwindow.cpp:1143
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr ""
+"Vidalia foi incapaz de registrar alguns eventos. Dessa forma, muitas de suas "
+"funções ficarão indisponíveis."
+
+#: mainwindow.cpp:1222
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Erro de autenticação"
+
+#: mainwindow.cpp:1224
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia foi incapaz de autenticar-se no aplicativo Tor. (%1)"
+
+#: mainwindow.cpp:1226
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Por favor, verifique suas configurações da porta de controle"
+
+#: mainwindow.cpp:1330
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "Atualização disponível para o Tor"
+
+#: 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 ""
+"A versão atualmente instalada do Tor está desatualizada ou não é mais "
+"recomendada. Por favor visite a página do Tor para obter a versão mais "
+"recente."
+
+#: mainwindow.cpp:1333
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Página do Tor: %1"
+
+#: mainwindow.cpp:1394
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "Todas as conexões subsequentes serão diferentes das antigas."
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "Falha ao criar nova identidade"
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "Falha ao encaminhar porta"
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+"Vidalia foi incapaz de configurar o encaminhamento de portas "
+"automaticamente."
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Painel de controle do Vidalia"
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "Estado"
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Atalhos do Vidalia"
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Configurar servidor"
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Configure um servidor e ajude no crescimento da rede"
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Visualizar rede"
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Exibir mapa da rede Tor"
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Usar nova identidade"
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Fazer conexões subsequentes parecerem novas"
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Ver utilização recente de banda"
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Ver histórico das mensagens de registro"
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Ver documentação de ajuda"
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Configurar Vidalia"
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Obter versão e informações de licenciamento"
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Fechar Vidalia"
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Mostrar esta janela no inicio"
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Esconder"
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Esconder esta janela"
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr "Falha ao restabelecer senha"
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+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."
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+"Mensagens que aparecem quando algo dá muito errado e o Tor não pode "
+"continuar."
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr "Mensagens que só aparecem quando há algo de errado com o Tor."
+
+#: 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 ""
+"Mensagens que normalmente não ocorrem durante o funcionamento normal do Tor "
+"e não são consideradas erros, mas que você deve se importar com elas."
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr "Mensagens que normalmente ocorrem durante a execução do Tor."
+
+#: messagelog.cpp:136
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of "
+"interest to Tor developers."
+msgstr ""
+"Mensagens Hyper-verbose primariamente de interesse dos desenvolvedores do "
+"Tor."
+
+#: messagelog.cpp:189
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Erro ao configurar filtro"
+
+#: messagelog.cpp:190
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia foi incapaz de escrever no registro de eventos do Tor."
+
+#: messagelog.cpp:205
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "Erro ao abrir arquivo de registro"
+
+#: messagelog.cpp:206
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia foi incapaz de abrir o arquivo de registro especificado."
+
+#: messagelog.cpp:227
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Necessário nome do arquivo de registro"
+
+#: messagelog.cpp:229
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr ""
+"Você precisa informar um nome de arquivo onde as mensagens de registro serão "
+"salvas."
+
+#: messagelog.cpp:280
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Selecionar arquivo de registro"
+
+#: messagelog.cpp:297
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Salvar mensagens de registro"
+
+#: messagelog.cpp:300
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Arquivos Texto (*.txt)"
+
+#: messagelog.cpp:309
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+#: messagelog.cpp:310
+msgctxt "MessageLog"
+msgid "Cannot write file %1"
+""
+"%2."
+msgstr "Incapaz de escrever no arquivo %1%2."
+
+#: messagelog.cpp:360
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Procurar no arquivo de registro"
+
+#: messagelog.cpp:361
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Procurar:"
+
+#: messagelog.cpp:367
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Não encontrado"
+
+#: messagelog.cpp:368
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "A pesquisa retornou 0 resultados."
+
+#: messagelog.ui:19
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Mensagem de registro"
+
+#: messagelog.ui:452
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Filtros de mensagem..."
+
+#: messagelog.ui:455
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Selecionar filtros de mensagem"
+
+#: messagelog.ui:463
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Tamanho do histórico..."
+
+#: messagelog.ui:466
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Selecione o número máximo de mensagem a exibir"
+
+#: messagelog.ui:477
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Limpar"
+
+#: messagelog.ui:480
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Limpar todas as mensagens do registro (Ctrl+E)"
+
+#: messagelog.ui:483
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+#: messagelog.ui:497
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Copiar"
+
+#: messagelog.ui:500
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Copiar mensagem selecionada para área de transferência (Ctrl+C)"
+
+#: messagelog.ui:503
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+#: messagelog.ui:514
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Selecionar tudo"
+
+#: messagelog.ui:517
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Selecionar todas as mensagens (Ctrl+A)"
+
+#: messagelog.ui:520
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+#: messagelog.ui:528
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Salvar tudo"
+
+#: messagelog.ui:531
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Salvar tudo para um arquivo"
+
+#: messagelog.ui:539
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Salvar selecionados"
+
+#: messagelog.ui:542
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Salvar selecionados para um arquivo"
+
+#: messagelog.ui:553
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Configurações"
+
+#: messagelog.ui:556
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Ajustar configurações da mensagens de registro"
+
+#: messagelog.ui:559
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+#: messagelog.ui:567
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Ajuda"
+
+#: messagelog.ui:570
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Mostrar navegador da ajuda"
+
+#: messagelog.ui:573
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+#: messagelog.ui:581
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Fechar"
+
+#: messagelog.ui:584
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Fechar mensagens de registro"
+
+#: messagelog.ui:587
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+#: messagelog.ui:598
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Procurar"
+
+#: messagelog.ui:601
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Procurar todas as mensagens que contenham o texto (Ctrl+F)"
+
+#: messagelog.ui:604
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+#: messagelog.ui:66
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Hora"
+
+#: messagelog.ui:71
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Tipo"
+
+#: messagelog.ui:76
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Mensagem"
+
+#: messagelog.ui:160
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Salvar configurações atuais"
+
+#: messagelog.ui:163
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Salvar configurações"
+
+#: messagelog.ui:179
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Cancela mudanças feitas a configuração"
+
+#: messagelog.ui:182
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: messagelog.ui:196
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Filtro de mensagem"
+
+#: messagelog.ui:217
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Erro"
+
+#: messagelog.ui:233
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Aviso"
+
+#: messagelog.ui:249
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Noticia"
+
+#: messagelog.ui:265
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Info"
+
+#: messagelog.ui:281
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Debug"
+
+#: messagelog.ui:297
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "Histórico das mensagens de registro"
+
+#: messagelog.ui:318
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Número de mensagem a exibir na janela de registros"
+
+#: messagelog.ui:337
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "Mensagens"
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Sempre salvar novas mensagens de registro"
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "Procurar"
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+"Habilitar salvamento automático de novas mensagens de registro para um "
+"arquivo"
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "Salvar, automaticamente, novas mensagens de registro para um arquivo"
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Mapa da rede Tor"
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Atualizar"
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "Atualizar lista de conexões e servidores Tor"
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Ajuda"
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Mostrar ajuda sobre o mapa da rede"
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Mostrar ajuda sobre o mapa da rede"
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Fechar"
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Fechar o mapa da rede"
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Mais zoom"
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Zoom no mapa da rede"
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Menos zoom"
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Diminui o zoom no mapa da rede"
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Ajustar zoom a janela"
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Ajusta o zoom de modo a mostrar o circuito atual"
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "Ponte inválida"
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "A ponte especificada é invalida."
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr "Copiar (Ctrl+C)"
+
+#: 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 ""
+"Você deve especificar um IP, um host e uma porta para configurar o acesso "
+"via proxy do Tor a internet."
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+"Você deve especificar uma ou mais portas liberadas no seu firewall para "
+"conexão."
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' não um número de porta válido."
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr "Verifique se sua rede local utiliza uma proxy para acessar a internet"
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "Eu utilizo uma proxy para acessar a internet"
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr "Configurações de proxy"
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "Proxy HTTP:"
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr "Usuário:"
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "Também utilize esta proxy para HTTPS"
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr "Senha:"
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "Porta:"
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+"Certifique-se de somente conectar a servidores utilizando portas permitidas "
+"pelo seu firewall"
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "Meu firewall só permite conexão a determinadas portas"
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "Configurações de firewall"
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "Portas permitidas:"
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr "80, 443"
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+"Certifique-se de criptografar requisições de diretório e, opcionalmente, "
+"utilize servidores ponte para acessar a rede Tor"
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "Meu PSI bloqueia conexões à rede Tor"
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr "Configurações de Ponte"
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+"O aplicativo Tor que você está executando não suporta pontes. <br>Conexões "
+"de diretório ainda serão criptografadas."
+
+#: networkpage.ui:295
+msgctxt "NetworkPage"
+msgid "Add a Bridge:"
+msgstr "Adicionar ponte:"
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Como encontro uma ponte?</a>"
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr "Remover ponte selecionada da lista"
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr "Copiar ponte selecionada para área de transferência"
+
+#: policy.cpp:167
+msgctxt "Policy"
+msgid "accept"
+msgstr "aceitar"
+
+#: policy.cpp:167
+msgctxt "Policy"
+msgid "reject"
+msgstr "rejeitar"
+
+#: routerdescriptor.cpp:76
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Disponível"
+
+#: routerdescriptor.cpp:78
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Hibernando"
+
+#: routerdescriptor.cpp:80
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Indisponível"
+
+#: routerdescriptorview.cpp:139
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Localização:"
+
+#: routerdescriptorview.cpp:143
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "Endereço IP:"
+
+#: routerdescriptorview.cpp:144
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Plataforma:"
+
+#: routerdescriptorview.cpp:148
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Banda"
+
+#: routerdescriptorview.cpp:150
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Tempo ligado:"
+
+#: routerdescriptorview.cpp:156
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Ultima atualização:"
+
+#: routerdescriptorview.cpp:100
+msgctxt "RouterDescriptorView"
+msgid "%1 days "
+msgstr "%1 dias "
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr "%1 horas "
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr "%1 mins "
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr "%1 segs"
+
+#: routerdescriptorview.cpp:48
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Copiar"
+
+#: routerlistitem.cpp:67
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Indisponível"
+
+#: routerlistitem.cpp:71
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Hibernando"
+
+#: routerlistitem.cpp:83
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 kb/s"
+
+#: routerlistwidget.cpp:49
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Servidor"
+
+#: routerlistwidget.cpp:74
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "Zoom no servidor"
+
+#: routerlistwidget.cpp:220
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 servidores disponíveis"
+
+#: routerlistwidget.cpp:67
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Copiar"
+
+#: routerlistwidget.cpp:68
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "Apelido"
+
+#: routerlistwidget.cpp:71
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "Fingerprint"
+
+#: serverpage.cpp:140
+msgctxt "ServerPage"
+msgid "Bridge Support Unavailable"
+msgstr "Suporte a pontes indisponível"
+
+#: 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 ""
+"Você configurou o Tor para funcionar como um servidor ponte para usuários "
+"sob censura, mas a sua versão do aplicativo na suporta esta função."
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr ""
+"Por favor, atualize seu aplicativo Tor ou configure-o para funcionar como um "
+"servidor normal."
+
+#: serverpage.cpp:199
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "Seu servidor ponte não está funcionando."
+
+#: serverpage.cpp:263
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr ""
+"Você deve, pelo menos, especificar uma porta e um apelido para o servidor."
+
+#: serverpage.ui:25
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "Executar somente como cliente"
+
+#: serverpage.ui:32
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Encaminhar tráfego para rede Tor"
+
+#: serverpage.ui:39
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
+msgstr ""
+"Ajude usuários sob censura a acessar a rede Tor (Tor 0.2.0.8-alpha ou mais "
+"novo)"
+
+#: serverpage.ui:91
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "Porta do servidor:"
+
+#: serverpage.ui:110
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "Selecione para espelhar o diretório de servidores"
+
+#: serverpage.ui:113
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory "
+msgstr "Espelhar o diretório de servidores"
+
+#: serverpage.ui:139
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "Tentar configurar encaminhamento de porta automaticamente"
+
+#: serverpage.ui:154
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "Testar"
+
+#: serverpage.ui:164
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "Exibir tópicos de ajuda para encaminhamento de portas"
+
+#: 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 ""
+"Endereço de email pelo qual você poderá ser contatado caso haja algum "
+"problema com o seu servidor. Você deve também fornecer sua PGP ou PGP "
+"fingerprint."
+
+#: serverpage.ui:234
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Porta Diretório:"
+
+#: serverpage.ui:267
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Número da porta diretório"
+
+#: serverpage.ui:279
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Informação de contato:"
+
+#: serverpage.ui:337
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "Nome do seu servidor"
+
+#: serverpage.ui:370
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "Porta pela qual usuário e outros servidores se comunicarão com o seu"
+
+#: serverpage.ui:380
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Apelido:"
+
+#: serverpage.ui:76
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Configurações básicas"
+
+#: serverpage.ui:435
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr ""
+"Para conexões de internet com altas taxas de download mas baixo upload, por "
+"favor selecione sua taxa de upload aqui."
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "Cabo/DSL 256 kbps"
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "Cabo/DSL 512 kbps"
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "Cabo/DSL 768 kbps"
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/Cabo/DSL 1.5 mbps"
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 1.5 mbps"
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "Personalizado"
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Escolha um valor que mais se aproxima da sua velocidade de conexão"
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Exibir ajuda para taxa de limite de transferência"
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Taxa média"
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Média geral do limite de banda"
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "kb/s"
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Taxa máxima"
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "Pico do limite de banda"
+
+#: 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 ""
+"Sua banda máxima deve ser maior ou igual a sua taxa média de banda. Ambos "
+"devem ser de pelo menos 20 kb/s"
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Limite de banda"
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Portas 6660 - 6669 e 6697"
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Portas 110, 143, 993 e 995"
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Recebimento de e-mail (POP, IMAP)"
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Portas não especificadas previamente"
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Outros serviços"
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Portas 706, 1863, 5050, 5190, 5222, 5223, 8300 e 8888"
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "Mensagens Instantâneas (MI)"
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "Porta 443"
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "Conexão segura (SSL)"
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Porta 80"
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Websites"
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "Exibir ajuda para as regras de saída"
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr ""
+"Que tipo de recursos da internet os usuários poderão acessar a partir de seu "
+"servidor?"
+
+#: 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 ""
+"O Tor bloqueará a saída de email e aplicativos de compartilhamento de "
+"arquivos, a fim de evitar spam e outros abusos."
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Regras de saída"
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr "Permite que outros usuários acessem sua ponte dando-lhes esta linha:"
+
+#: serverpage.ui:1039
+#, fuzzy
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+"Esta é a identidade do seu servidor ponte que pode ser dado a outras pessoas"
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr "Copiar identidade do seu servidor ponte para área de transferência"
+
+#: servicepage.cpp:116
+msgctxt "ServicePage"
+msgid "Error while trying to unpublish all services"
+msgstr "Erro ao tentar esconder todos os serviços"
+
+#: 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 ""
+"Por favor, configure ao menos um diretório de serviço e uma porta virtual "
+"para cada serviço que você deseja gravar. Remova os demais."
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Erro"
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "Por favor, selecione um serviço."
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "Selecionar diretório de serviço"
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+"A porta virtual deve conter apenas números de portas validas [1..65535]."
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "O alvo deve conter apenas endereço:porta, endereço ou porta."
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr "Diretório já em uso por outro serviço."
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "Form"
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr "Serviços ocultos oferecidos"
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "Endereço Onion"
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "Porta virtual"
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "Alvo"
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "Caminho do diretório"
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "Ligado"
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "Adicionar novo serviço a lista"
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "Remover da lista serviço selecionado"
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr "Copiar endereço onion do serviço seleciona para área de transferência"
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+"Procure e defina no sistema de arquivos local um diretório para o serviço "
+"escolhido"
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "Criado pelo Tor"
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr "Novo"
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Resolvendo"
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Conectando"
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr "Aberto"
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Falhou"
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Fechado"
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Tentando novamente"
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "Remapeado"
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "Falha ao interromper o processo %1. [%2]"
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "O serviço Tor não está instalado."
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "Incapaz de iniciar o serviço Tor."
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "Falha ao determinar a senha de controle."
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "Sucesso"
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "Nenhum dispositivo UPnP-compatível foi encontrado"
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "Nenhum dispositivo de acesso a internet UPnP-compativel foi encontrado"
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "WSAStartup falhou"
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "Falha ao adicionar mapeamento de porta"
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "Falha ao solicitar mapeamento de porta"
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "Falha ao remover mapeamento de porta"
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "Erro desconhecido"
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "Procurando dispositivos UPnP-compatível"
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "Atualizando diretório de mapeamento de portas"
+
+#: upnptestdialog.cpp:122
+#, fuzzy
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "Atualizando servidor de porta mapeada"
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "Teste realizado com sucesso!"
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "Verificando suporte UPnP"
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr "Verificando suporte Universal Plug & Play"
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "OK"
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Sim"
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Não"
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Ajuda"
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Tentar novamente"
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Exibir registro"
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Exibir configurações"
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Continuar"
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Sair"
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Procurar"
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Argumento invalido"
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia já está em execução"
+
+#: 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 ""
+"Provavelmente outra instância do Vidalia está em execução. Se realmente não "
+"há outra instância, você pode continuar esta ação. Gostaria de continuar a "
+"execução do Vidalia?"
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Mostra esta mensagem de utilização e sai."
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "Restabelece TODAS as configurações salvas do Vidalia."
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Ajusta o diretório que o Vidalia usa para os arquivos de dados."
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Ajusta o nome e a localização do arquivo pid do Vidalia."
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Ajusta o nome e a localização do arquivo de registro do Vidalia."
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Ajusta o detalhamento de registro do Vidalia."
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Ajusta a estilo da interface do Vidalia."
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Ajusta o idioma do Vidalia."
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Informações de utilização do Vidalia."
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr "Código de idioma inválido: "
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr "Estilo da GUI inválido: "
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr "Nível de registro inválido: "
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "Incapaz de abrir o arquivo de registro '%1': %2"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ro/qt_ro.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ro/qt_ro.po
new file mode 100644
index 0000000..10c033c
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ro/qt_ro.po
@@ -0,0 +1,443 @@
+msgid ""
+msgstr ""
+"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: 2009-05-11 08:26+0000\n"
+"Last-Translator: Top Quality Software <tqsoftware 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"
+"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"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "Activează"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "Executabilul '%1' are nevoie de Qt %2, a fost găsit Qt %3."
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "Eroare, biblioteca Qt este incompatibilă"
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "LTR"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "Activează fereastra principală a programului"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "OK"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "Salvează"
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "Deschide"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "Revocare"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "Închide"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "Aplică"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "Reiniţializează"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "Ajutor"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "Nu salva"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "Renunţă"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "&Da"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "Da la &toate"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "&Nu"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "N&u la toate"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "Salvează pe toate"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "Renunţă"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "Încearcă din nou"
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "Ignoră"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "Setări implicite"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "Închide fără a salva"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "&OK"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "Nume"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "Mărime"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "Categorie"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "Tip"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "Data ultimei modificări"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "Toate fişierele (*)"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "Directoare"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "&Deschide"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "&Salvează"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "Deschide"
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"%1 există deja.\n"
+"Doriţi să-l înlocuiţi?"
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+"%1\n"
+"Fişierul nu a fost găsit.\n"
+"Verificaţi numele fişierului şi încercaţi din nou."
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "Computerul meu"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "&Redenumeşte"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "&Şterge"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "Arată &fişierele ascunse"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "Înapoi"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "Directorul superior"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "Vizualizare listă"
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "Vizualizare detaliată"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "Fişiere de tipul:"
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "Director:"
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+"%1\n"
+"Directorul nu a fost găsit.\n"
+"Verificaţi numele directorului şi încercaţi din nou."
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+"'%1' e protejat la scriere.\n"
+"Doriţi să-l ştergeţi oricum?"
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "Sunteţi sigur că doriţi să ştergeţi '%1'?"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "Directorul nu a putut fi şters."
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "Toate fişierele (*.*)"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "Salvează ca"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "Partiţie"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "Fişier"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "Necunoscut"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "Găseşte director"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "Arată "
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "Înainte"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "Director nou"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "&Director nou"
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "&Alege"
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "Şterge"
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "Nume &fişier:"
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "Vezi în:"
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "Creează director nou"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "Invalid filename"
+msgstr "Nume de fişier invalid"
+
+#: 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>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"
+msgid "Name"
+msgstr "Nume"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "Mărime"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "Categorie"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "Tip"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "Data ultimei modificări"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "Computerul meu"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "Computer"
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr "%1 TO"
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr "%1 GO"
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr "%1 MO"
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr "%1 KO"
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr "%1 octeţi"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ro/vidalia_ro.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ro/vidalia_ro.po
new file mode 100644
index 0000000..b472a54
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ro/vidalia_ro.po
@@ -0,0 +1,3334 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2010-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"
+"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"
+msgstr "Despre Vidalia"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "Licenţă"
+
+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 "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."
+msgstr "Aţi ales autentificarea prin parolă, însă nu aţi specificat o parolă."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Alege fişierul de configurare Tor"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Fişierul nu a fost găsit"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 nu există. Doriţi ca acest element să fie creat?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Fişierul nu a putut fi creat"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "%1 nu a putut fi creat. [%2]"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Alegeţi un director pe care Tor să-l folosească pentru date"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Serviciul Tor nu a putut fi eliminat"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "Serviciul Tor nu a putut fi instalat"
+
+msgctxt "AdvancedPage"
+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:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Adresă:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "Fără autentificare"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Cookie:"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Parolă:"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "Generează aleator"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Fişierul de configurare Tor"
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "Tor foloseşte acest fişier de configurare (torrc) atunci când este lansat"
+
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "Introduceţi calea către fişierul dumneavoastră de configurare"
+
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Răsfoieşte"
+
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr "Directorul de date"
+
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr "Stochează datele pentru programul Tor în acest director"
+
+msgctxt "AdvancedPage"
+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 "Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+"Vidalia nu poate șterge serviciul Tor.\n"
+"\n"
+"Va trebui să-l ștergeți în mod manual. "
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Limbă"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Alege limba folosită de Vidalia"
+
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Înfăţişare"
+
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Alege o înfăţişare pentru Vidalia"
+
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr "Vidalia nu a putut încărca traducerea în limba selectată."
+
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr "Se contorizează din:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Ascunde setările"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Arată setările"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Statistici trafic Tor"
+
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "Reiniţializare"
+
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Rata de primire"
+
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Rata de transmitere"
+
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Întotdeauna deasupra"
+
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Înfăţişare"
+
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Modifică nivelul de transparenţă al graficului"
+
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% opac"
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Salvează"
+
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Revocare"
+
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr "Incepe cererea pentru HTTP bridge..."
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr "Conectare la %1:%2..."
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr "Se trimite o cerere pentru HTTP bridges..."
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr "Se descarcă o listă cu bridges..."
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr "Se descarcă Bridges"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr "Nu s-au putut downloada bridges: %1"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr "Se repeta cererea bridge..."
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr "Ţară"
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr "# Clienţi"
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr "Clienţi din următoarele ţări au folosit nodul tău din %1"
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr "Sumar folosire Bridge"
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr "Sumar client"
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "Nou"
+
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Deschis"
+
+msgctxt "Circuit"
+msgid "Building"
+msgstr "Se construieşte"
+
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Eşuat"
+
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Închis"
+
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Necunoscut"
+
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Cale vidă>"
+
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Conexiune"
+
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "Stare"
+
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Zoom pe circuit"
+
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "Închide circuitul (Del)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Închide fluxul (Del)"
+
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "General"
+
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Reţea"
+
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr "Partajare"
+
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "Servicii"
+
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Aspect"
+
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Avansat"
+
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Ajutor"
+
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Setările nu au putut fi salvate"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr "Vidalia nu a putut salva setările dumneavoastră de %1."
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Eroare la aplicarea setărilor"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia nu a putut aplica Tor setările de %1."
+
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Setări"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Vidalia nu s-a putut conecta la Tor. (%1)"
+
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "Socketul de control nu este conectat."
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "Parolă necesară"
+
+msgctxt "ControlPasswordInputDialog"
+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:"
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "Socketul de control nu este conectat."
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Eroare la trimiterea comenzii de control. [%1]"
+
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr "Socketul a fost deconectat în timp ce se încerca citirea unor date."
+
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Replică de control invalidă. [%1]"
+
+msgctxt "CountryInfo"
+msgid "Afghanistan"
+msgstr "Afganistan"
+
+msgctxt "CountryInfo"
+msgid "Andorra"
+msgstr "Andorra"
+
+msgctxt "CountryInfo"
+msgid "Angola"
+msgstr "Angola"
+
+msgctxt "CountryInfo"
+msgid "Antigua & Barbuda"
+msgstr "Antigua şi Barbuda"
+
+msgctxt "CountryInfo"
+msgid "Argentina"
+msgstr "Argentina"
+
+msgctxt "CountryInfo"
+msgid "Armenia"
+msgstr "Armenia"
+
+msgctxt "CountryInfo"
+msgid "Australia"
+msgstr "Australia"
+
+msgctxt "CountryInfo"
+msgid "Azerbaijan"
+msgstr "Azerbaidjan"
+
+msgctxt "CountryInfo"
+msgid "Bahamas"
+msgstr "Bahamas"
+
+msgctxt "CountryInfo"
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+msgctxt "CountryInfo"
+msgid "Barbados"
+msgstr "Barbados"
+
+msgctxt "CountryInfo"
+msgid "Belarus"
+msgstr "Belarus"
+
+msgctxt "CountryInfo"
+msgid "Belgium"
+msgstr "Belgia"
+
+msgctxt "CountryInfo"
+msgid "Belize"
+msgstr "Belize"
+
+msgctxt "CountryInfo"
+msgid "Bhutan"
+msgstr "Bhutan"
+
+msgctxt "CountryInfo"
+msgid "Bolivia"
+msgstr "Bolivia"
+
+msgctxt "CountryInfo"
+msgid "Bosnia & Herzegovina"
+msgstr "Bosnia şi Herţegovina"
+
+msgctxt "CountryInfo"
+msgid "Botswana"
+msgstr "Botswana"
+
+msgctxt "CountryInfo"
+msgid "Brazil"
+msgstr "Brazilia"
+
+msgctxt "CountryInfo"
+msgid "Brunei Darussalam"
+msgstr "Brunei Darussalam"
+
+msgctxt "CountryInfo"
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+msgctxt "CountryInfo"
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+msgctxt "CountryInfo"
+msgid "Burundi"
+msgstr "Burundi"
+
+msgctxt "CountryInfo"
+msgid "Cambodia"
+msgstr "Cambodgia"
+
+msgctxt "CountryInfo"
+msgid "Cameroon"
+msgstr "Camerun"
+
+msgctxt "CountryInfo"
+msgid "Canada"
+msgstr "Canada"
+
+msgctxt "CountryInfo"
+msgid "Cape Verde"
+msgstr "Cabo Verde"
+
+msgctxt "CountryInfo"
+msgid "Central African Republic"
+msgstr "Republica Central-Africană"
+
+msgctxt "CountryInfo"
+msgid "Chad"
+msgstr "Ciad"
+
+msgctxt "CountryInfo"
+msgid "Chile"
+msgstr "Chile"
+
+msgctxt "CountryInfo"
+msgid "China"
+msgstr "China"
+
+msgctxt "CountryInfo"
+msgid "Colombia"
+msgstr "Columbia"
+
+msgctxt "CountryInfo"
+msgid "Comoros"
+msgstr "Insulele Comore"
+
+msgctxt "CountryInfo"
+msgid "Congo, The Democratic Republic of the"
+msgstr "Republica Democrată Congo"
+
+msgctxt "CountryInfo"
+msgid "Congo"
+msgstr "Congo"
+
+msgctxt "CountryInfo"
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+msgctxt "CountryInfo"
+msgid "Cote d’Ivoire"
+msgstr "Côte d'Ivore"
+
+msgctxt "CountryInfo"
+msgid "Croatia"
+msgstr "Croaţia"
+
+msgctxt "CountryInfo"
+msgid "Cuba"
+msgstr "Cuba"
+
+msgctxt "CountryInfo"
+msgid "Cyprus"
+msgstr "Cipru"
+
+msgctxt "CountryInfo"
+msgid "Czech Republic"
+msgstr "Republica Cehă"
+
+msgctxt "CountryInfo"
+msgid "Denmark"
+msgstr "Danemarca"
+
+msgctxt "CountryInfo"
+msgid "Djibouti"
+msgstr "Djibouti"
+
+msgctxt "CountryInfo"
+msgid "Dominica"
+msgstr "Dominica"
+
+msgctxt "CountryInfo"
+msgid "Dominican Republic"
+msgstr "Republica Dominicană"
+
+msgctxt "CountryInfo"
+msgid "Ecuador"
+msgstr "Ecuador"
+
+msgctxt "CountryInfo"
+msgid "Egypt"
+msgstr "Egipt"
+
+msgctxt "CountryInfo"
+msgid "El Salvador"
+msgstr "El Salvador"
+
+msgctxt "CountryInfo"
+msgid "Equatorial Guinea"
+msgstr "Guineea Ecuatorială"
+
+msgctxt "CountryInfo"
+msgid "Eritrea"
+msgstr "Eritreea"
+
+msgctxt "CountryInfo"
+msgid "Estonia"
+msgstr "Estonia"
+
+msgctxt "CountryInfo"
+msgid "France"
+msgstr "Franţa"
+
+msgctxt "CountryInfo"
+msgid "Gabon"
+msgstr "Gabon"
+
+msgctxt "CountryInfo"
+msgid "Gambia"
+msgstr "Gambia"
+
+msgctxt "CountryInfo"
+msgid "Georgia"
+msgstr "Georgia"
+
+msgctxt "CountryInfo"
+msgid "Germany"
+msgstr "Germania"
+
+msgctxt "CountryInfo"
+msgid "Ghana"
+msgstr "Ghana"
+
+msgctxt "CountryInfo"
+msgid "Grenada"
+msgstr "Grenada"
+
+msgctxt "CountryInfo"
+msgid "Guatemala"
+msgstr "Guatemala"
+
+msgctxt "CountryInfo"
+msgid "Guinea"
+msgstr "Guineea"
+
+msgctxt "CountryInfo"
+msgid "Guinea-Bissau"
+msgstr "Guineea-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 "Israel"
+
+msgctxt "CountryInfo"
+msgid "Italy"
+msgstr "Italia"
+
+msgctxt "CountryInfo"
+msgid "Jamaica"
+msgstr "Jamaica"
+
+msgctxt "CountryInfo"
+msgid "Japan"
+msgstr "Japonia"
+
+msgctxt "CountryInfo"
+msgid "Jordan"
+msgstr "Iordania"
+
+msgctxt "CountryInfo"
+msgid "Kazakhstan"
+msgstr "Kazahstan"
+
+msgctxt "CountryInfo"
+msgid "Kenya"
+msgstr "Kenya"
+
+msgctxt "CountryInfo"
+msgid "Kiribati"
+msgstr "Kiribati"
+
+msgctxt "CountryInfo"
+msgid "Kuwait"
+msgstr "Kuweit"
+
+msgctxt "CountryInfo"
+msgid "Kyrgyzstan"
+msgstr "Kârgâzstan"
+
+msgctxt "CountryInfo"
+msgid "Laos"
+msgstr "Laos"
+
+msgctxt "CountryInfo"
+msgid "Latvia"
+msgstr "Letonia"
+
+msgctxt "CountryInfo"
+msgid "Lebanon"
+msgstr "Liban"
+
+msgctxt "CountryInfo"
+msgid "Lesotho"
+msgstr "Lesotho"
+
+msgctxt "CountryInfo"
+msgid "Liberia"
+msgstr "Liberia"
+
+msgctxt "CountryInfo"
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+msgctxt "CountryInfo"
+msgid "Lithuania"
+msgstr "Lituania"
+
+msgctxt "CountryInfo"
+msgid "Luxembourg"
+msgstr "Luxemburg"
+
+msgctxt "CountryInfo"
+msgid "Macedonia"
+msgstr "Macedonia"
+
+msgctxt "CountryInfo"
+msgid "Madagascar"
+msgstr "Madagascar"
+
+msgctxt "CountryInfo"
+msgid "Malawi"
+msgstr "Malawi"
+
+msgctxt "CountryInfo"
+msgid "Malaysia"
+msgstr "Malaezia"
+
+msgctxt "CountryInfo"
+msgid "Mali"
+msgstr "Mali"
+
+msgctxt "CountryInfo"
+msgid "Malta"
+msgstr "Malta"
+
+msgctxt "CountryInfo"
+msgid "Marshall Islands"
+msgstr "Insulele Marshall"
+
+msgctxt "CountryInfo"
+msgid "Mauritania"
+msgstr "Mauritania"
+
+msgctxt "CountryInfo"
+msgid "Mauritius"
+msgstr "Mauritius"
+
+msgctxt "CountryInfo"
+msgid "Micronesia"
+msgstr "Micronezia"
+
+msgctxt "CountryInfo"
+msgid "Moldova"
+msgstr "Moldova"
+
+msgctxt "CountryInfo"
+msgid "Monaco"
+msgstr "Monaco"
+
+msgctxt "CountryInfo"
+msgid "Mongolia"
+msgstr "Mongolia"
+
+msgctxt "CountryInfo"
+msgid "Montenegro"
+msgstr "Muntenegru"
+
+msgctxt "CountryInfo"
+msgid "Morocco"
+msgstr "Maroc"
+
+msgctxt "CountryInfo"
+msgid "Mozambique"
+msgstr "Mozambic"
+
+msgctxt "CountryInfo"
+msgid "Namibia"
+msgstr "Namibia"
+
+msgctxt "CountryInfo"
+msgid "Nauru"
+msgstr "Nauru"
+
+msgctxt "CountryInfo"
+msgid "Nepal"
+msgstr "Nepal"
+
+msgctxt "CountryInfo"
+msgid "Netherlands"
+msgstr "Olanda"
+
+msgctxt "CountryInfo"
+msgid "New Zealand"
+msgstr "Noua Zeelandă"
+
+msgctxt "CountryInfo"
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+msgctxt "CountryInfo"
+msgid "Niger"
+msgstr "Niger"
+
+msgctxt "CountryInfo"
+msgid "Nigeria"
+msgstr "Nigeria"
+
+msgctxt "CountryInfo"
+msgid "Norway"
+msgstr "Norvegia"
+
+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 Noua Guinee"
+
+msgctxt "CountryInfo"
+msgid "Paraguay"
+msgstr "Paraguay"
+
+msgctxt "CountryInfo"
+msgid "Peru"
+msgstr "Peru"
+
+msgctxt "CountryInfo"
+msgid "Philippines"
+msgstr "Filipine"
+
+msgctxt "CountryInfo"
+msgid "Poland"
+msgstr "Polonia"
+
+msgctxt "CountryInfo"
+msgid "Portugal"
+msgstr "Portugalia"
+
+msgctxt "CountryInfo"
+msgid "Qatar"
+msgstr "Qatar"
+
+msgctxt "CountryInfo"
+msgid "Romania"
+msgstr "Romania"
+
+msgctxt "CountryInfo"
+msgid "Russia"
+msgstr "Rusia"
+
+msgctxt "CountryInfo"
+msgid "Rwanda"
+msgstr "Rwanda"
+
+msgctxt "CountryInfo"
+msgid "Saint Kitts & Nevis"
+msgstr "Sfântul Kitts şi Nevis"
+
+msgctxt "CountryInfo"
+msgid "Saint Lucia"
+msgstr "Sfânta Lucia"
+
+msgctxt "CountryInfo"
+msgid "Saint Vincent & the Grenadines"
+msgstr "Sfântul Vincent şi Grenadinele"
+
+msgctxt "CountryInfo"
+msgid "Samoa"
+msgstr "Samoa"
+
+msgctxt "CountryInfo"
+msgid "San Marino"
+msgstr "San Marino"
+
+msgctxt "CountryInfo"
+msgid "Sao Tome & Principe"
+msgstr "São Tomé şi Príncipe"
+
+msgctxt "CountryInfo"
+msgid "Saudi Arabia"
+msgstr "Arabia Saudită"
+
+msgctxt "CountryInfo"
+msgid "Senegal"
+msgstr "Senegal"
+
+msgctxt "CountryInfo"
+msgid "Serbia"
+msgstr "Serbia"
+
+msgctxt "CountryInfo"
+msgid "Seychelles"
+msgstr "Seychelles"
+
+msgctxt "CountryInfo"
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+msgctxt "CountryInfo"
+msgid "Singapore"
+msgstr "Singapore"
+
+msgctxt "CountryInfo"
+msgid "Slovakia"
+msgstr "Slovacia"
+
+msgctxt "CountryInfo"
+msgid "Slovenia"
+msgstr "Slovenia"
+
+msgctxt "CountryInfo"
+msgid "Solomon Islands"
+msgstr "Insulele Solomon"
+
+msgctxt "CountryInfo"
+msgid "Somalia"
+msgstr "Somalia"
+
+msgctxt "CountryInfo"
+msgid "South Africa"
+msgstr "Africa de Sud"
+
+msgctxt "CountryInfo"
+msgid "Spain"
+msgstr "Spania"
+
+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 "Suedia"
+
+msgctxt "CountryInfo"
+msgid "Switzerland"
+msgstr "Elveţia"
+
+msgctxt "CountryInfo"
+msgid "Syria"
+msgstr "Siria"
+
+msgctxt "CountryInfo"
+msgid "Tajikistan"
+msgstr "Tadjikistan"
+
+msgctxt "CountryInfo"
+msgid "Tanzania"
+msgstr "Tanzania"
+
+msgctxt "CountryInfo"
+msgid "Thailand"
+msgstr "Thailanda"
+
+msgctxt "CountryInfo"
+msgid "Timor-Leste (East Timor)"
+msgstr "Timorul de Est"
+
+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 "Tunisia"
+
+msgctxt "CountryInfo"
+msgid "Turkey"
+msgstr "Turcia"
+
+msgctxt "CountryInfo"
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+msgctxt "CountryInfo"
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+msgctxt "CountryInfo"
+msgid "Uganda"
+msgstr "Uganda"
+
+msgctxt "CountryInfo"
+msgid "Ukraine"
+msgstr "Ucraina"
+
+msgctxt "CountryInfo"
+msgid "United Arab Emirates"
+msgstr "Emiratele Arabe Unite"
+
+msgctxt "CountryInfo"
+msgid "United Kingdom"
+msgstr "Marea Britanie"
+
+msgctxt "CountryInfo"
+msgid "United States"
+msgstr "Statele Unite"
+
+msgctxt "CountryInfo"
+msgid "Uruguay"
+msgstr "Uruguay"
+
+msgctxt "CountryInfo"
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+msgctxt "CountryInfo"
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+msgctxt "CountryInfo"
+msgid "Vatican"
+msgstr "Vatican"
+
+msgctxt "CountryInfo"
+msgid "Venezuela"
+msgstr "Venezuela"
+
+msgctxt "CountryInfo"
+msgid "Vietnam"
+msgstr "Vietnam"
+
+msgctxt "CountryInfo"
+msgid "Western Sahara"
+msgstr "Sahara Occidentală"
+
+msgctxt "CountryInfo"
+msgid "Yemen"
+msgstr "Yemen"
+
+msgctxt "CountryInfo"
+msgid "Zambia"
+msgstr "Zambia"
+
+msgctxt "CountryInfo"
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+msgctxt "CountryInfo"
+msgid "Albania"
+msgstr "Albania"
+
+msgctxt "CountryInfo"
+msgid "Algeria"
+msgstr "Algeria"
+
+msgctxt "CountryInfo"
+msgid "Austria"
+msgstr "Austria"
+
+msgctxt "CountryInfo"
+msgid "Bahrain"
+msgstr "Bahrain"
+
+msgctxt "CountryInfo"
+msgid "Benin"
+msgstr "Benin"
+
+msgctxt "CountryInfo"
+msgid "Ethiopia"
+msgstr "Etiopia"
+
+msgctxt "CountryInfo"
+msgid "Fiji"
+msgstr "Fiji"
+
+msgctxt "CountryInfo"
+msgid "Finland"
+msgstr "Finlanda"
+
+msgctxt "CountryInfo"
+msgid "Greece"
+msgstr "Grecia"
+
+msgctxt "CountryInfo"
+msgid "Guam"
+msgstr "Guam"
+
+msgctxt "CountryInfo"
+msgid "Hungary"
+msgstr "Ungaria"
+
+msgctxt "CountryInfo"
+msgid "Iceland"
+msgstr "Islanda"
+
+msgctxt "CountryInfo"
+msgid "India"
+msgstr "India"
+
+msgctxt "CountryInfo"
+msgid "Indonesia"
+msgstr "Indonesia"
+
+msgctxt "CountryInfo"
+msgid "Iran"
+msgstr "Iran"
+
+msgctxt "CountryInfo"
+msgid "Iraq"
+msgstr "Irak"
+
+msgctxt "CountryInfo"
+msgid "Ireland"
+msgstr "Irlanda"
+
+msgctxt "CountryInfo"
+msgid "Korea, North"
+msgstr "Coreea de Nord"
+
+msgctxt "CountryInfo"
+msgid "Korea, South"
+msgstr "Coreea de Sud"
+
+msgctxt "CountryInfo"
+msgid "Libya"
+msgstr "Libia"
+
+msgctxt "CountryInfo"
+msgid "Maldives"
+msgstr "Maldive"
+
+msgctxt "CountryInfo"
+msgid "Mexico"
+msgstr "Mexic"
+
+msgctxt "CountryInfo"
+msgid "Myanmar"
+msgstr "Myanmar"
+
+msgctxt "CountryInfo"
+msgid "Taiwan"
+msgstr "Taiwan"
+
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Fişiere executabile (*.exe)"
+
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Alege calea către Tor"
+
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "Alegeţi fişierul executabil al proxy-ului"
+
+msgctxt "GeneralPage"
+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"
+
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr "Răsfoieşte"
+
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Porneşte Tor odată cu Vidalia"
+
+msgctxt "GeneralPage"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr "Aplicaţie Proxy (opţional)"
+
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "Porneşte o aplicaţie proxy odată cu Tor"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Argumente aplicaţie proxy:"
+
+msgctxt "GeneralPage"
+msgid "Software Updates"
+msgstr "Actualizări software"
+
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
+msgstr "Verifică automat actualizări de software"
+
+msgctxt "GeneralPage"
+msgid "Check Now"
+msgstr "Verifică acum"
+
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr "%1 KO/s"
+
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr "%1 KO"
+
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr "%1 MO"
+
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr "%1 GO"
+
+msgctxt "GraphFrame"
+msgid "Recv:"
+msgstr "Primit:"
+
+msgctxt "GraphFrame"
+msgid "Sent:"
+msgstr "Trimis:"
+
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr "Fişierul furnizat nu este un fişier valid XML de cuprins."
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "Căutarea a ajuns la sfârşitul documentului"
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "Căutarea a ajuns la începutul documentului"
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "Textul nu a fost găsit în document"
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "S-au găsit %1 rezultate"
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Documentaţie Vidalia"
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Înapoi"
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Către pagina precedentă (Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Înainte"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Către pagina următoare (Shift+Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Pagina de start"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Către pagina de start (Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Căutare"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "Caută un cuvânt sau mai multe în pagina curentă (Ctrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Închide"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Închide centrul de asistenţă Vidalia"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Caută:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Căutare înapoi"
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Căutare înainte"
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "Cu majuscule semnificative"
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Numai cuvinte întregi"
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Categorii"
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Cuprins"
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Caută"
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Introduceţi un termen sau mai mulţi:"
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Documente găsite"
+
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
+msgstr "Eroare la incărcarea documentelor Help:"
+
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr "Se deschide legătură externă"
+
+msgctxt "HelpTextBrowser"
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgstr "Vidalia poate deschide legătura pe care aţi ales-o cu navigatorul dumneavoastră web implicit. Dacă navigatorul dumneavoastră nu este configurat pentru a folosi Tor, atunci cererea nu va fi anonimă."
+
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr "Doriţi ca Vidalia să deschidă legătura cu navigatorul dumneavoastră web?"
+
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr "Legătura nu a putut fi deschisă"
+
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr "Vidalia nu a putut deschide adresa aleasă. Puteţi copia şi apoi lipi adresa direct în navigatorul web."
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr "Eroare la deschiderea fisierului help:"
+
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr "Informaţii licenţă"
+
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "Licenţă"
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr "Credite"
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "Depanare"
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Detalii"
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Înştiinţare"
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Atenţionare"
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Eroare"
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Necunoscut"
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "Porneşte Tor"
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Ieşire"
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Informaţii trafic"
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Jurnal"
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Harta reţelei"
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr "Panou de control"
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Setări"
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr "Despre"
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr "Asistenţă"
+
+msgctxt "MainWindow"
+msgid "New Identity"
+msgstr "Identitate nouă"
+
+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 "Mod afişare"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Asistenţă Vidalia"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "Eroare la pornirea navigatorului web"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia nu a putut porni navigatorul web specificat în setări"
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "Eroare la pornirea clientului de mesagerie instantanee"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "Vidalia nu a putut porni clientul de mesagerie instantanee specificat în setări"
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Eroare la pornirea serverului proxy"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia nu a putut porni serverul proxy specificat în setări"
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Conectare la un director relay"
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "Se stabileşte o conexiune criptată la director"
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "Se obţin informaţii despre starea reţelei"
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "Se încarcă informaţiile despre starea reţelei"
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "Se încarcă certificatele de autoritate"
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "Se cer informaţii despre relay"
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "Se încarcă informaţiile despre relay"
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "Conctare la reţeaua Tor"
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "Se stabileşte un circuit Tor"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "identităţile nu se potrivesc"
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr "efectuat"
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "conexiune refuzată"
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "timpul alocat pentru conexiune a expirat (timeout)"
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "eroare la scriere/citire"
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "nici o rută către gazdă"
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "resurse insuficiente"
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "necunoscut"
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor nu rulează"
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "Se închide Tor"
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Opriţi Tor acum"
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr "Opriţi Tor"
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Se lansează Tor"
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "Tor se iniţializează"
+
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Eroare la iniţializarea Tor"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgstr "Vidalia nu a putut porni Tor. Verificaţi setările pentru a vă asigura că numele şi locaţia fişierului executabil Tor sunt corect specificate."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "Conectare la Tor"
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "Eroare de conexiune"
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "Modul relay este activat"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "Eroare la închidere"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "Vidalia nu a putut opri Tor."
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "Eroare inopinată"
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Autentificare faţă de Tor"
+
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "Impune autentificare prin cookie"
+
+msgctxt "MainWindow"
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgstr "Tor cere Vidalia transmiterea unui cookie de autentificare, dar Vidalia nu a putut găsi unul."
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "Doriţi să căutaţi manual fişierul 'control_auth_cookie'?"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Directorul pentru date"
+
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Cookie de control (control_auth_cookie)"
+
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "Eroare la înregistrarea evenimentelor"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr "Vidalia nu a putut înregistra anumite evenimente. O parte din caracteristicile Vidalia pot fi indisponibile."
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Eroare la autentificare"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Tor nu a putut fi autentificat de către Vidalia. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Verificaţi setările de autentificare ale portului de control."
+
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "O nouă versiune Tor este disponibilă"
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr "Versiunea curentă Tor este depăşită şi nu mai este recomandată. Vizitaţi site-ul Tor pentru a descărca cea mai recentă versiune."
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Site-ul Tor: %1"
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "Toate conexiunile noi vor apare ca fiind diferite faţă de cele vechi."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "Nu s-a putut obţine o identitate nouă"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "Operaţiunea de port forwarding a eşuat"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "Vidalia nu a putut configura automat port forwarding."
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Panoul de control Vidalia"
+
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "Stare"
+
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Comenzi rapide Vidalia"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Setări pentru relay"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Menţineţi un relay şi ajutaţi astfel reţeaua să crească"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Vizualizare reţea"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Vizualizează harta reţelei Tor"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Foloseşte o nouă identitate"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Fă ca toate conexiunile următoare să apară ca fiind noi"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Istoricul recent al traficului"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Vizualizare jurnal"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Documentaţie şi asistenţă"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Configurează Vidalia"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Versiune şi informaţii despre licenţă"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Închide Vidalia"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Arată această fereastră la pornire"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Ascunde"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Ascunde această fereastră"
+
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr "Resetarea parolei a eşuat"
+
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia a încercat să reiniţializeze parola de control pentru Tor, dar nu a reuşit să repornească Tor. Vă rugăm să verificaţi Task Manager pentru a vă asigura ca nu există alte procese Tor care rulează."
+
+msgctxt "MainWindow"
+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?"
+msgstr "Vrei să verifici dacă este disponibil un nou pachet pentru instalare?"
+
+msgctxt "MainWindow"
+msgid "Potentially Unsafe Connection"
+msgstr "Conexiune potenţial nesigură"
+
+msgctxt "MainWindow"
+msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
+msgstr "Una dintre aplicaţiile dumneavoastră %1 se pare că face o potenţială conexiune necriptată şi nesigură către portul %2. Orice lucru trimis pe această conexiune poate să fie monitorizată. Vă rugăm să verificaţi configuraţia aplicaţiei şi să folosiţi numai protocale criptate, cum ar fi SLL, dacă este posibil."
+
+msgctxt "MainWindow"
+msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgstr "Tor a închis automat conexiunea dumneavoastră pentru a vă proteja anonimitatea."
+
+msgctxt "MainWindow"
+msgid "Update Failed"
+msgstr "Actualizare eşuată"
+
+msgctxt "MainWindow"
+msgid "Your software is up to date"
+msgstr "Software-ul dumneavostră este actualizat"
+
+msgctxt "MainWindow"
+msgid "There are no new Tor software packages available for your computer at this time."
+msgstr "Nu sunt disponibile noi pachete software Tor pentru calculatorul dumneavoastră în acest moment."
+
+msgctxt "MainWindow"
+msgid "Installation Failed"
+msgstr "Instalare eşuată"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to install your software updates."
+msgstr "Vidalia nu a putut instala actualizările software."
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr "A apărut următoarea eroare:"
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "Nu a reuşit (%1)"
+
+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."
+
+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"
+"\n"
+"Doriţi să opriti si sa dati clientilor timp sa gaseasca alt releu?"
+
+msgctxt "MainWindow"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\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 ", probably Telnet,"
+msgstr ", probabil Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", probabil un client de email,"
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr "Fişier"
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "Despre Vidalia"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Pagina de start"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr "Verifică pentru actualizări"
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Eroare la setarea filtrului"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia nu a putut înregistra mesajele din jurnalul Tor."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "Eroare la deschiderea fişierului jurnal"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia nu a putut deschide fişierul jurnal specificat."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Este necesar numele fişierului jurnal"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "Trebuie să introduceţi un nume de fişier pentru a putea salva mesajele din jurnal."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Alege fişierul jurnal"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Salvează mesajele din jurnal"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Fişiere text (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Caută mesaje în jurnal"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Caută:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Nu s-a găsit"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "Căutarea a returnat 0 rezultate."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Jurnal"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Filtre mesaje..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Setează filtrele de mesaje"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Dimensiune istoric..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Setează numărul maxim de mesaje afişat"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Şterge"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Şterge toate mesajele din jurnal (Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Copiază"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Copiază mesajele alese în clipboard (Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Selectează tot"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Selectează toate mesajele (Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Salvează tot"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Salvează toate mesajele într-un fişier"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Salvează itemii selectaţi"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Salvează mesajele selectate într-un fişier"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Setări"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Modifică setările jurnalului"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Ajutor"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Arată documentaţia ajutătoare"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Închide"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Închide jurnalul"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Căutare"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Găseşte toate mesajele ce conţin textul (Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Ora"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Tipul"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Mesaj"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Salvează setările curente ale jurnalului"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Salvează setările"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Anulează modificările făcute setărilor"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Revocare"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Filtru mesaje"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Eroare"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Atenţie!"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Înştiinţare"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Detalii"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Depanare"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "Istoricul jurnalului."
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Numărul mesajelor ce apar în fereastra jurnalului"
+
+msgctxt "MessageLog"
+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"
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr "Activează salvarea automată într-un fişier a mesajelor noi din jurnal"
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "Salvează automat noile mesaje din jurnal într-un fişier."
+
+msgctxt "MessageLog"
+msgid "Messages that appear when something has \n"
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+"Acele mesaje apar când ceva a mers prost în \n"
+" şi Tor nu poate continua."
+
+msgctxt "MessageLog"
+msgid "Messages that only appear when \n"
+"something has gone wrong with Tor."
+msgstr ""
+"Acele mesaje apar doar cand \n"
+" a mers prost cu Tor."
+
+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 ""
+"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"
+"during normal Tor operation."
+msgstr ""
+"Mesajele care apar frecvent \n"
+"în timpul funcţionării normale Tor."
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+"Mesaje Hyper-verbose în principal din \n"
+"prezintă interes pentru dezvoltatorea Tor."
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+"Nu se poate scrie fişierul %1\n"
+"\n"
+"%2."
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Harta reţelei Tor"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Reîmprospătează"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "Reîmprospătează lista relay-urilor şi conexiunilor Tor"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Ajutor"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Ajutor în privinţa hărţii"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Ajutor în privinţa hărţii"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Închide"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Închide harta"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Măreşte"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Măreşte pe hartă"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Micşorează"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Micşorează pe hartă"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Potriveşte în fereastră"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Încadrează astfel încât toate circuitele afişate să încapă"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "Relay-ul nu a fost găsit"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr "Nu există detalii pentru relay-ul selectat."
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "Necunoscut"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr "Pe tot ecranul"
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr "Vezi harta internetului pe tot ecranul."
+
+msgctxt "NetViewer"
+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."
+msgstr "Pentru a folosi Tor ca proxy, prin care să accesaţi internetul, este nevoie să specificaţi atât o adresă de IP, cât şi un port."
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "Trebuie să specificaţi unul sau mai multe porturi la care firewall-ul dumneavoastră să vă permită conectarea."
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' nu este un număr valid de port."
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr "Bifaţi aici dacă reţeaua dumneavoastră locală necesită un proxy pentru a accesa internetul"
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "Folosesc un proxy pentru a accesa internetul."
+
+msgctxt "NetworkPage"
+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:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "Port:"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr "Bifaţi aici pentru a folosi numai conexiuni către relay-uri ce folosesc porturi permise de firewall-ul dumneavoastră"
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "Firewall-ul meu îmi permite să mă conectez doar la anumite porturi"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "Setări firewall"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "Porturi permise:"
+
+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 "Bifaţi aici pentru a cripta cererile către director şi, opţional, pentru a folosi bridge relay-uri pentru a accesa reţeaua Tor."
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "Providerul meu blochează conexiunile către reţeaua Tor"
+
+msgctxt "NetworkPage"
+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ă"
+
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr "Copiază bridge relay-urile alese în clipboard"
+
+msgctxt "NetworkPage"
+msgid "Find Bridges Now"
+msgstr "Găseşte bridges acum"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
+msgstr "<a href=\"bridges.finding\">Cum pot găsi bridges alcumva?</a>"
+
+msgctxt "NetworkPage"
+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."
+
+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 "Policy"
+msgid "accept"
+msgstr "acceptă"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "nu accepta"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Conectat"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "În hibernare"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Deconectat"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Locaţie:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "Adresă IP:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Platformă:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Lăţime de bandă:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Timp de la pornire:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Actualizat ultima oară la:"
+
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Copiază"
+
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
+msgstr "În hibernare"
+
+msgctxt "RouterInfoDialog"
+msgid "Online"
+msgstr "Conectat"
+
+msgctxt "RouterInfoDialog"
+msgid "Offline"
+msgstr "Deconectat"
+
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr "Necunoscut"
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr "Detalii relay"
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr "Sumar"
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr "Pseudonim:"
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr "Stare"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "Locaţie:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "Adresă IP:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "Platformă:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "Lăţime de bandă:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "Timp de la pornire:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "Informaţii de contact:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "Actualizat ultima oară la:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr "Descriptor"
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Deconectat"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "În hibernare"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KO/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Relay"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "Zoom pe relay"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 relay-uri conectate"
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Copiază"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "Pseudonim"
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "Amprentă"
+
+msgctxt "ServerPage"
+msgid "Bridge Support Unavailable"
+msgstr "Suport pentru bridge relay-uri este indisponibil"
+
+msgctxt "ServerPage"
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgstr "Aţi configurat Tor să se comporte ca un bridge relay pentru utilizatorii cenzuraţi, însă versiunea dumneavoastră de Tor nu oferă suport pentru astfel de relay-uri."
+
+msgctxt "ServerPage"
+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"
+msgid "Your bridge relay is not running."
+msgstr "Bridge relay-ul dumneavoastră este oprit."
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "Este necesar să specificaţi cel puţin un pseudonim de relay şi un port."
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "Rulează doar ca şi client."
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Contribuie la reţeaua Tor acţionând ca un relay pentru trafic"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "Portul relay-ului:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "Activează pentru a crea o copie locală a directorului relay"
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "Încearcă configurarea automată a port forwarding"
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "Test"
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "Asistenţă pentru port forwarding"
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Portul directorului:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Numărul portului directorului:"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Informaţii de contact:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "Numele relay-ului dumneavoastră"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "Portul prin care utilizatorii şi alte relay-uri pot comunica cu relay-ul dumneavoastră"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Pseudonim:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Setări de bază"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Dacă aveţi o conexiune cu descărcare rapidă dar încărcare lentă, specificaţi aici viteza de încărcare (upload)."
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "Cablu/DSL 256 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "Cablu/DSL 512 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "Cablu/DSL 768 Kbps"
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/Cablu/DSL 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "Personalizată"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Alegeţi o conexiune similară cu conexiunea dumneavoastră la internet"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Asistenţă pentru limitarea traficului"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Rata medie"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Limita medie pe termen lung a lăţimii de bandă"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KO/s"
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Rata maximă"
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "Limita de vârf a raţiei lăţimii de bandă"
+
+msgctxt "ServerPage"
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr "Rata maximă a lăţimii de bandă trebuie să fie mai mare sau egală cu rata medie. Ambele valori trebuie să fie cel puţin egale cu 20 KO/s."
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Limitări de trafic"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Porturile 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 "Porturile 110, 143, 993 şi 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Poştă electronică (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Porturi nespecificate de celelalte căsuţe de bifare"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Servicii diverse"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Porturile 706, 1863, 5050, 5190, 5222, 5223, 8300 şi 8888"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "Mesagerie instantanee (IM)"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "Portul 443"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "Site-uri sigure (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Portul 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Site-uri"
+
+msgctxt "ServerPage"
+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?"
+msgstr "Alegeţi resursele internet accesibile prin relay-ul dumneavoastră:"
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr "Tor va bloca anumite programe pentru email şi partajare a fişierelor implicit, pentru a reduce spam-ul şi alte abuzuri."
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Politici de ieşire"
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr "Pentru ca alţii să acceseze bridge relay-ul dumneavoastră, au nevoie de textul de mai jos:"
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "Aceasta este identitatea relay-ului dumneavoastră pe care o puteţi folosi în comunicarea cu alţii"
+
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr "Copiază identitatea relay-ului în clipboard"
+
+msgctxt "ServerPage"
+msgid "No Recent Usage"
+msgstr "Nefolosit recent"
+
+msgctxt "ServerPage"
+msgid "No clients have used your relay recently."
+msgstr "Niciun client nu a folosit relay-ul dumneavoastră recent."
+
+msgctxt "ServerPage"
+msgid "Leave your relay running so clients have a better chance of finding and using it."
+msgstr "Lăsaţi relay-ul pornit pentru ca alţi clienţi să aibe şanse mai bune în a-l găsi şi folosi."
+
+msgctxt "ServerPage"
+msgid "Bridge History"
+msgstr "Istoric bridge"
+
+msgctxt "ServerPage"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgstr "Vidalia nu a putut găsi istoricul de folosire a bridge-ului dumneavoastră."
+
+msgctxt "ServerPage"
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgstr "Tor a returnat un răspuns formatat necorespunzător când Vidalia a cerut istoricul de folosire a bridge-ului dumneavoastră."
+
+msgctxt "ServerPage"
+msgid "The returned response was: %1"
+msgstr "Răspunsul returnat a fost: %1"
+
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network"
+msgstr "Ajutaţi utilizatorii cenzuraţi să acceseze reţeaua Tor"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr "<a href=\"#bridgeUsage\">Cine a folosit bridge-ul meu?</a>"
+
+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"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr ""
+"Adresa de email la care aţi putea fi contactat dacă există o \n"
+"problema cu releu dumneavoastră. S-ar putea include, de asemenea amprentă "
+"PGP sau GPG."
+
+msgctxt "ServicePage"
+msgid "Error while trying to unpublish all services"
+msgstr "Eroare la încercarea de a şterge toate serviciile"
+
+msgctxt "ServicePage"
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
+msgstr "Configuraţi cel puţin un director de serviciu şi un port virtual pentru fiecare serviciu pe care doriţi să-l salvaţi. Eliminaţi-le pe celelalte."
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Eroare"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "Alegeţi un serviciu"
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "Alegere director de servicii"
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "Numărul portului virtual trebuie să fie în intervalul [1 - 65535]."
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "Destinaţia poate conţine numai forme de tip adresă:port, adresă sau port."
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr "Directorul este deja folosit de alt serviciu."
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "Formular"
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr "Servicii ascunse furnizate"
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "Adresa onion"
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "Port virtual"
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "Destinaţie"
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "Cale"
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "Activat"
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "Adaugă în listă un nou serviciu"
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "Elimină din listă serviciul ales"
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr "Copiază în clipboard adresa onion a serviciului ales"
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr "Răsfoieşte sistemul local de fişiere şi alege directorul pentru serviciul ales"
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "Creat de Tor"
+
+msgctxt "Stream"
+msgid "New"
+msgstr "Nou"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Se caută"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Se conectează"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "Deschide"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Acţiunea a eşuat"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Închis"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Se încearcă din nou"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "Remapat"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Necunoscut"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "Procesul %1 nu a putut fi oprit. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "Tor nu este instalat ca serviciu."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "Serviciul Tor nu a putut fi pornit."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "Nu s-a putut face hash pentru parola de control."
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "Reuşit"
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "Nu a fost găsit nici un dispozitiv cu capabilităţi UPnP"
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "Nu a fost găsit nici un gateway internet cu capabilităţi UPnP"
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "Pornirea WSA a eşuat"
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "Eroare la maparea portului"
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "Obţinerea mapării unui port a eşuat"
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "Eliminarea mapării unui port a eşuat"
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "Eroare necunoscută"
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "Se caută dispozitive cu capabilităţi UPnP"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "Se acutalizează maparea porturilor directorului"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "Se actualizează maparea porturilor relay-ului"
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "Testul s-a terminat cu succes!"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "Se testează suportul pentru UPnP"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr "Se testează suportul pentru Universal Plug & Play"
+
+msgctxt "UpdateProcess"
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgstr "Vidalia nu a fost în stare să verifice pentru actualizări software disponibile, deoarece nu a putut găsi '%1'."
+
+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."
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for available updates..."
+msgstr "Verific pentru actualizări disponibile..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Hide"
+msgstr "Ascunde"
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr "Descarc actualizările..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr "Instalez software-ul actualizat..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr "Gata! Software-ul dumneavoastră este actualizat."
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr "Actualizări software"
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr "Verific pentru actualizări..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr "Revocare"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr "Actualizări software disponibile"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr "Adu-mi aminte mai târziu"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr "Instalează"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr "Următoarele pachete software actualizate sunt disponibile pentru instalare:"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr "Pachet"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr "Versiune"
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "OK"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Revocare"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Da"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Nu"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Asistenţă"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Încearcă din nou"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Arată jurnalul"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Arată setările"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Continuare"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Revocare"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Răsfoieşte"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Argument invalid"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia rulează deja"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Afişează acest mesaj de înştiinţare şi închide."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "Restabileşte TOATE setările implicite ale Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Alege directorul pe care Vidalia să-l folosească pentru date."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Alege numele şi locaţia fişierului pid."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Alege numele şi locaţia jurnalului."
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Alege cât de multe evenimente să înregistreze Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Alege înfăţişarea interfeţei Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Alege limba în care se prezintă Vidalia."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Informaţii despre modul de utilizare al Vidalia"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "Nu s-a putut deschide jurnalul '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr "Codul de limbă specificat este invalid:"
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr "Stilul GUI specificat este invalid:"
+
+msgctxt "Vidalia"
+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"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+"Un alt proces Vidalia este, probabil, ca deja să ruleze.Dacă există într-"
+"adevăr nu este un alt proces Vidalia care rulează, puteţi alege să continue "
+"oricum \n"
+".\n"
+"Doriţi să continuaţi deschiderea Vidalia?"
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr "%1 secunde"
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr "%1 B/s"
+
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr "%1 KO/s"
+
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr "%1 MO/s"
+
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
+msgstr "%1 GO/s"
+
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr "%1 zile"
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr "%1 ore"
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr "%1 minute"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ru/qt_ru.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ru/qt_ru.po
new file mode 100644
index 0000000..4b22356
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ru/qt_ru.po
@@ -0,0 +1,443 @@
+msgid ""
+msgstr ""
+"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-03-14 03:44-0600\n"
+"Last-Translator: vitaliy <vitolink at gmail.com>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "Запустить"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "Программный модуль '%1' требует Qt %2, найдена версия %3."
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "Ошибка совместимости библиотеки Qt"
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "LTR"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "Активировать главное окно"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "OK"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "Сохранить"
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "Открыть"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "Отмена"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "Закрыть"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "Применить"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "Сбросить"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "Справка"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "Не сохранять"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "Отмена"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "&Да"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "Всегда ДА"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "&Нет"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "Всегда НЕТ"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "Сохранить всё"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "Прервать"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "Повтор"
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "Игнорировать"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "Восстановить стандартные настройки"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "Выйти без сохранения"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "&OK"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "Имя"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "Размер"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "Разновидность"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "Тип"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "Дата изменения"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "Все файлы (*)"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "Каталоги"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "&Открыть"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "&Сохранить"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "Открыть"
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"%1 уже существует.\n"
+"Заменить?"
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+"%1\n"
+"Файл не найден.\n"
+"Пожалуйста, проверьте правильность имени и пути."
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "Мой компьютер"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "&Переименовать"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "&Удалить"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "Показать &скрытые файлы"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "Назад"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "Родительская директория"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "Просмотр списка"
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "Просмотр деталей"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "Файлы типа:"
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "Каталог:"
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+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"
+"Все равно удалить?"
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "Вы действительно хотите удалить '%1'?"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "Невозможно удалить директорию."
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "Все файлы (*.*)"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "Сохранить как"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "Диск"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "Файл"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "Неизвестный"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "Найти каталог"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "Показать"
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "Вперед"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "Новый каталог"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "&Новый каталог"
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "&Выбрать"
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "Удалить"
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "Имя &файла:"
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "Искать в:"
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "Создать новый каталог"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+"<b>Нельзя использовать \"%1\" в качестве имени.</b><p>Выберите другое, без "
+"знаков препинания или с меньшим числом символов."
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr "Имя"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "Размер"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "Разновидность"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "Тип"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "Дата изменения"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "Мой компьютер"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "Компьютер"
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr "%1 Тб"
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr "%1 Гб"
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr "%1 Мб"
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr "%1 Кб"
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr "%1 байт"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ru/vidalia_ru.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ru/vidalia_ru.po
new file mode 100644
index 0000000..0ba6a3a
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/ru/vidalia_ru.po
@@ -0,0 +1,3425 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2010-03-29 01:07-0600\n"
+"Last-Translator: carolyn anhalt <carolyn at anhalt.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"
+"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 1.1.0\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "О программе Vidalia"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "Лицензия"
+
+msgctxt "AboutDialog"
+msgid "Vidalia 0.2.0"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "Tor 0.2.0.32"
+msgstr "Tor 0.2.0.32"
+
+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 "версия"
+
+msgctxt "AdvancedPage"
+msgid "'%1' is not a valid IP address."
+msgstr "Не удалось распознать IP адрес в '%1'."
+
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "Вы выбрали парольную аутентификацию, но не указали пароль."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Выберите файл настроек Tor"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Файл не найден"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 не существует. Создать?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Не удалось создать файл"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "Не удалось создать %1 [%2]"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Выберите каталог для данных Tor"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Не удалось удалить сервис Tor"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "Не удалось установить сервис Tor"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "Vidalia не смогла установить сервис Tor."
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Порт контроллера"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "Аутентификация:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Адрес:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "Никакая"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Cookie"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Пароль"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "Сгенерировать случайно"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Файл Конфигурации Tor"
+
+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 "Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+"Vidalia не может удалить сервис Tor.\n"
+"\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 "Выберите стиль интерфейса"
+
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr "Vidalia не может загрузить выбранный язык перевода."
+
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr "Показано от :"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Скрыть настройки"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Показать настройки"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Трафик Tor"
+
+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 "Клиенты из следующих стран используют ваш сервер с %1"
+
+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 "Разорвать цепочку (Del)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Закрыть поток (Del)"
+
+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 "Vidalia не смогла сохранить ваши настройки (%1)."
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Ошибка применения настроек"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia не смогла применить ваши настройки (%1) к Tor."
+
+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 "Ошибка посылки команды контроллеру. [%1]"
+
+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"
+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 "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 "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Выполняемые (*.exe)"
+
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Выберите путь к Tor"
+
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "Выберите исполняемый файл proxy"
+
+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 "Аргументы для proxy не соответствуют формату."
+
+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 "Стартовать Tor вместе с Vidalia"
+
+msgctxt "GeneralPage"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr "Программа proxy (опционально)"
+
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "Запускать proxy вместе с Tor"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Аргументы для proxy:"
+
+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 КБ/с"
+
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr "%1 КБ"
+
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr "%1 МБ"
+
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr "%1 ГБ"
+
+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 "Помощь"
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Назад"
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Вернуться на предыдущую страницу (Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Вперёд"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Перейти на следующую страницу (Shift+Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Начало"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Перейти на начальную страницу (Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Найти"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "Найти слово или фразу на текущей странице (Ctrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Закрыть"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Закрыть помощь"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+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 ""
+"Vidalia может открыть выбраную ссылку в выбраном вами по умолчанию броузере. "
+"В случае если ваш броузер не настроен для работы с Tor запрос не будет "
+"анонимным."
+
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr "Хотите ли вы открыть ссылку в вашем Web Броузере?"
+
+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 не может открыть выбраную ссылку в вашем Web Броузере. Вы можете "
+"скопировать ссылку в буфер обмена и вставить в адресную строку браузера."
+
+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 "MainWindow"
+msgid "Start Tor"
+msgstr "Запустить Tor"
+
+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 "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 "Вид"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Помощь"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "Ошибка при запуске веб-браузера"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia не смогла запустить браузер указанный в настройках"
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "Ошибка запуска IM клиента"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "Vidalia не может запустить сконфигурированый IM клиент"
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Ошибка при запуске прокси сервера"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia не смогла запустить указанный в настройках прокси сервер"
+
+# kd
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Подключение к директории реле "
+
+# kd
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "Создание связи зашифрованной директории"
+
+# kd
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "Получение статуса сети"
+
+# kd
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "Загрузка статуса сети"
+
+# kd
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "Загрузка сертификатов авторизации"
+
+# kd
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "Запрос информации реле"
+
+# kd
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "Загрузка реле информации"
+
+# kd
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "Подключение к сети Tor"
+
+# kd
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "Создание схемы Tor"
+
+# kd
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr "Подключено к сети Tor!"
+
+# kd
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Непризнанность статуса запуска"
+
+# kd
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr "Разное"
+
+# kd
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "Несоответствие личности"
+
+# kd
+msgctxt "MainWindow"
+msgid "done"
+msgstr "готово"
+
+# kd
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "в подключении отказано"
+
+# kd
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "таймаут связи "
+
+# kd
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "ошибка чтения / записи"
+
+# kd
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "не указан путь к хосту"
+
+# kd
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "недостаточные ресурсы"
+
+# kd
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "неизвестный"
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor не запущен"
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "Tor выключается"
+
+# kd
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Остановить Tor немедленно"
+
+# kd
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr "Остановить Tor"
+
+# kd
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Запуск программного обеспечения Tor"
+
+# kd
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "Начало работы Tor"
+
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Ошибка запуска Tor"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgstr "Vidalia не смогла запустить Tor. Проверьте настройки и убедитесь что имя и путь к исполняемому файлу Tor указан верно."
+
+# kd
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "Подключение к Tor"
+
+# kd
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "Ошибка при подключении"
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "Ретранслятор включён"
+
+# kd
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "Ошибка при выключении"
+
+# kd
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "Vidalia не смогла остановить программу Tor."
+
+# kd
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "Неожиданная ошибка"
+
+# kd
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Аутентификация к Tor"
+
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "Требуется cookie аутентификация"
+
+# kd
+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 отправила содержание аутентификации "
+"сookie, но Vidalia не смогла найти ни одного."
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "Хотите ли вы указать местоположение файла 'control_auth_cookie'?"
+
+# kd
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Директория данных"
+
+# kd
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Контроль Cookie (control_auth_cookie)"
+
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "Ошибка регистрации на события"
+
+# kd
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr ""
+"Vidalia не смогла зарегистрироваться на некоторые события. Многие из функций "
+"Vidalia могут быть недоступны."
+
+# kd
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Ошибка аутентификации"
+
+# kd
+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 доступно"
+
+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 и скачайте новую версию."
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Сайт Tor: %1"
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "Все последующие соединения не будут связаны с предыдущими соединениями."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "Ошибка создания нового Нима"
+
+# kd
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "Форвардинг Порта неудался"
+
+# kd
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "Vidalia не смогла автоматически настроить форвардинг порта."
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Панель управления Vidalia"
+
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "Состояние"
+
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Ярлыки Vidalia"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Настройка Ретранслятора"
+
+# kd
+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 "Последующие соединения будут выглядеть независимыми от текущих"
+
+# kd
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Просмотреть последнее использование пропускной способности"
+
+# kd
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Просмотр журнала истории сообщений"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Просмотреть помощь"
+
+# kd
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Настройки Vidalia"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Версия и информация о лицензии"
+
+# kd
+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 "Спрятать это окно"
+
+# kd
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr "Перемена пароля неудалась"
+
+# kd
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, 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 устарела или не рекомендуется. Пожалуйста посетите сайт Tor и скачайте новую версию."
+
+# kd
+msgctxt "MainWindow"
+msgid "Would you like to check if a newer package is available for installation?"
+msgstr "Хотите проверить, если новый пакет доступен для установки?"
+
+# kd
+msgctxt "MainWindow"
+msgid "Potentially Unsafe Connection"
+msgstr "Возможно небезопасное соединение"
+
+msgctxt "MainWindow"
+msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
+msgstr ""
+"Какое-то ваше приложение %1 использует зашифрованный и небезопасный порт %2. "
+"Все что использует этот порт можно проконтролировать. Проверьте настройки "
+"вашего приложения и по возможности используйте зашифрованные протоколы, "
+"такие как SSL, если это возможно."
+
+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 "У вас последняя версия Tor"
+
+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 не смогла установить сервис Tor."
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+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"
+"Нажмите кнопку 'Стоп', что бы остановить ваш сервер."
+
+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"
+"Хотели бы вы выключить сервер с задержкой, что бы пользователи могли найти "
+"новые сервера ?"
+
+msgctxt "MainWindow"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr ""
+"Vidalia зафиксировало, что Tor неожиданно завершил свою работу.\n"
+"\n"
+"Пожалуйста, проверьте журнал сообщение на наличие ошибок или сообщения об "
+"ошибке."
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ", Вероятно, Telnet,"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ", вероятно, клиент электронной почты,"
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr "Файл"
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "О программе Vidalia"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Начало"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr "Проверить наличие обновлений"
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Ошибка установки фильтра"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia не смогла зарегистрироваться для получения сообщений Tor."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "Ошибка открытия файла журнала"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia не смогла открыть указанный файл журнала."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Требуется указать имя файла журнала"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "Вы должны ввести имя файла чтобы сохранить записи журнала в файл."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Выберите файл журнала"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Сохранить сообщения журнала"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Текстовые файлы (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Найти в логе"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Найти:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Не найдено"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "Ничего не найдено."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Журнал сообщений"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Фильтры сообщений..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Установить фильтры сообщений"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Размер истории..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Установить максимальное количестов сообщение для показа"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Очистить"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Удалить все сообщения из журнала (Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Копировать"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Копировать выделенные сообщения в буфер обмена (Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Выбрать все"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Выбрать все сообщения (Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Сохранить все"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Сохранить все сообщения в файл"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Сохранить выделенные"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Сохранить выделенные сообщения в файл"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Настройки"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Изменить настройки журнала"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Помощь"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Открыть помощь"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Закрыть"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Закрыть журнал сообщений"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Найти"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Найти все сообщения с искомым текстом (Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Время"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Тип"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Сообщение"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Сохранить текущие настройки журнала сообщений"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Сохранить настройки"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Отменить изменения настроек"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Отменить"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Фильтр сообщений"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Ошибка"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Предупредение"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Замечание"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Информация"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Отладка"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "История сообщений"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Количество сообщений в окне журнала"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "сообщений"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log 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 "Messages that appear when something has \n"
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+"Сообщения которые недавно появлялись \n"
+"сообщали об ошибках, поэтому работа Tor не может быть продолжена."
+
+msgctxt "MessageLog"
+msgid "Messages that only appear when \n"
+"something has gone wrong with Tor."
+msgstr ""
+"Сообщения появившиеся после того как \n"
+"с Tor пошло что-то не так."
+
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently \n"
+"during normal Tor operation and are \n"
+"not considered errors, but you may \n"
+"care about."
+msgstr ""
+"Сообщения которые иногда появляются\n"
+"при нормальной работе Tor \n"
+"не являются ошибками, но желательно \n"
+"обратить на них внимание."
+
+msgctxt "MessageLog"
+msgid "Messages that appear frequently \n"
+"during normal Tor operation."
+msgstr ""
+"Сообщения которые часто появляются \n"
+"во время нормальной работы Tor."
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+"очень подробные сообщения в основном \n"
+"представляют интерес для разработчиков Tor."
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+"Не удается создать файл %1\n"
+"\n"
+"%2."
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Карта сети Tor"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Обновить"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "Обновить список серверов и соединений"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Помощь"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Показать помощь по карте сети"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Показать помощь по карте сети"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Закрыть"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Закрыть карту сети"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Увеличить"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Увеличить изображение карты"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Уменьшить"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Уменьшить изображение карты"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "АвтоРазмер"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Увеличить так чтобы показать все цепочки"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "Файл не найден"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr "Нет подробной информации в выбранном вами реле."
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "Неизвестно"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr "На полный экран"
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr "Показать карту сети во весь экран"
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+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."
+msgstr "Вы должны указать и IP адрес (или домен) и порт чтобы настроить Tor использовать пркси для доступа в Интернет."
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "Вы должны указать один или более портов к которым не заблокирован доступ брандмауэром."
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "Неверный номер порта '%1'."
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+"Проверьте требует ли ваша локальная сеть, прокси-сервер для выхода в "
+"интернет"
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "Я использую прокси для доступа в Интернет"
+
+msgctxt "NetworkPage"
+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 "Пароль:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "Порт:"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr "Проверьте разрешает ли ваш брандмауэр, порт данного реле"
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "Мой брандмауэр разрешает соединения не ко всем портам"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "Настройки брандмауэра"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "Разрешённые порты:"
+
+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 ""
+"Проверьте, чтобы зашифровать каталоге запросов и, факультативно, "
+"использование моста реле для доступа к сети Tor"
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "Мой интернет-провайдер блокирует доступ к сети Tor"
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr "Настройка моста"
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+"Tor в настоящее время не поддерживает запущенные вами мосты. <br>Соединение "
+"все равно будет зашифровано."
+
+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 "Удалить выбранные мосты из списка"
+
+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 "Policy"
+msgid "accept"
+msgstr "принимать"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "отклонять"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Работает"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Не активен"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Отключен"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Местонахождение:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "IP адрес:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Платформа:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Трафик:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Время работы:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Обновление:"
+
+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:"
+msgstr "Состояние"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "Местонахождение:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "IP адрес:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "Платформа:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "Трафик:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "Время работы:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "Контактная информация:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "Обновление:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr "Дескриптор"
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Отключен"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Не активен"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 КБ/с"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Сервер"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "Увеличить с фокусом на сервер"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 доступных реле"
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Копировать"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "Прозвище"
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "дактилоскопировать"
+
+msgctxt "ServerPage"
+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."
+msgstr ""
+"Вы настроили Tor что бы мосты были заблокированы для пользователей, но ваша "
+"версия Tor не поддерживает мосты."
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "Пожалуйста обновите версию Tor или настройте Tor как обычный сервер."
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "Ваш мост-сервер не запущен."
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "Вы должны указать как минимум имя сервера и порт."
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "Запустить только в качестве клиента"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Ретранслировать трафик для сети Tor"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "Порт сервера:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "Включить зеркало для каталога реле"
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "Пытаться настроить порт маршрутизации автоматически"
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "Тест"
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "Показать раздел справки о переадресации портов"
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Порт директории:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Номер порта для запросов директории (списка роутеров)"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Контактная информация:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "Имя вашего сервера"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "Порт через который пользователи и другие серверы смогут общаться с вашим сервером"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Ник:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Базовые настройки"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Для Интерент-соединений с большой входящей скоростью, но малой выходящей, пожалуйста указывайте выходящую."
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "Cable/DSL 256 Кбит/c"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "Cable/DSL 512 Кбит/c"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "Cable/DSL 768 Кбит/c"
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/Cable/DSL 1.5 Кбит/c"
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 1.5 Мбит/c"
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "Другое"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Выберите пункт который более всего подходит для описания вашего соединения"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Показать справку по ограничению трафика"
+
+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 "Ограничение максимального уровня трафика должно быть больше или равно ограничению среднего уровня трафика. Оба значения не могут быть меньше 20 КБ/сек."
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Ограничения трафика"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Порты 6660 - 6669 и 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Порты 110, 143, 993 и 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Получение почты (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Порты не указанные в других checkbox'ах"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Другие сервисы"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Порты 706, 1863, 5050, 5190, 5222, 5223, 8300 и 8888 "
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "Системы мгновенного обмена сообщениями (IM)"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "Порт 443"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "Защищённые веб-сайты (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Порт 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Веб-сайты"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "Показать справку по правилам"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr "Какой интернет протокол смогут получить пользователи вашего сервера?"
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr ""
+"Tor по прежнему будет блокировать некоторую исходящую почту и файлообменные "
+"приложения по умолчанию для уменьшения количества спама и других "
+"злоупотреблений."
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Правила вывода"
+
+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 не смогла сохранить ваши настройки (%1)."
+
+msgctxt "ServerPage"
+msgid "Tor returned an improperly formatted response when Vidalia requested your bridge's usage history."
+msgstr ""
+"Tor пришел неправильный формат ответа, при использовании Vidalia. "
+"Перезапросите историю использования мостов."
+
+msgctxt "ServerPage"
+msgid "The returned response was: %1"
+msgstr "Получение ответа: %1"
+
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network"
+msgstr "Помочь заблокированным пользователям получить доступ к сети Tor (требуется Tor 0.2.0.8-alpha или новее)"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr "<a href=\"#bridgeUsage\">Как мне найти мосты?</a>"
+
+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 ""
+"Адрес электронной почты в случае если у вашего сервера будут проблемы\n"
+"Вы можете также включить ваш PGP или GPG."
+
+msgctxt "ServicePage"
+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."
+msgstr ""
+"Пожалуйста, настройте службу сервисов и виртуальных портов для каждого "
+"сервиса которые хотите сохранить. Удалите другие."
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Ошибка"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "Пожалуйста выберите сервис."
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "Выберите каталог сервиса"
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "Виртуальный порт может содержать только номера портов [1 .. 65535]."
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "Цель может содержать только: порт, адрес или порт."
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr "Каталог уже используется другой службой."
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "Форма"
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr "Предоставляемые скрытые сервисы "
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "Адрес предоставленный Tor"
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "Виртуальный порт"
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "Цель"
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "Путь к каталогу"
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "Включить"
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "Добавить новый сервис в список"
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "Удалить выбранный сервис из списка"
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr "Копировать адрес предоставленный Tor в буфер обмена"
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr "Просмотр файловой системы для выбора каталога службы"
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "Создано Tor"
+
+msgctxt "Stream"
+msgid "New"
+msgstr "Новый"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Определяется"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Соединяется"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "Открытый"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Неудачный"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Закрытый"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Попытка"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "Переназначен"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Неизвестный"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "Процесс %1 не смог остановится. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "Сервис Tor не установлен."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "Не удалось запустить сервис Tor."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "Не удалось хэшировать пароль управления."
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "Успешно"
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "Не найдены включенные UPnP устройства"
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "Нет включенных UPnP устройств, интернет-шлюз устройства не найден!"
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "Ошибка запуска WSA"
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "Не удалось добавить порт в карту сети"
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "Не удалось получить порт карты сети"
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "Не удалось удалить порт из карты сети"
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "Неизвестная ошибка"
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "Поиск включенных UPnP устройств"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "Обновление порта каталога карты сети"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "Обновление порта реле карты сети"
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "Тестирование успешно завершено!"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "Тестирование поддержки UPnP"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr "Тестирование поддержки Plug & Play"
+
+msgctxt "UpdateProcess"
+msgid "Vidalia was unable to check for available software updates because it could not find '%1'."
+msgstr ""
+"Vidalia не смогла проверить наличие доступных обновлений программного "
+"обеспечения, поскольку не удалось найти '% 1'."
+
+msgctxt "UpdateProcess"
+msgid "Vidalia was unable to check for available software updates because Tor's update process exited unexpectedly."
+msgstr ""
+"Vidalia не смогла проверить наличие доступных обновлений программного "
+"обеспечения, поскольку в процессе обновления Tor неожиданно завершил работу."
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for available updates..."
+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 "Обновление Tor доступно"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr "Напомнить позже"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr "Установить"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr "Следующие пакеты обновления ПО готовы к установке:"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr "пакет"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr "Версия"
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "ОК"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Отменить"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Да"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Нет"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Помощь"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Ещё раз"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Показать журнал"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Показать настройки"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Продолжить"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Выйти"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Выбрать"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Неверный параметр"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia уже запущена"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Показывает это сообщение о использовании и завершает работу."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "Сбрасывает ВСЕ сохранённые настройки Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Устанавливает каталог который Vidalia будет использовать для файлов данных."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Устанавливает имя и путь к файлу с номером процесса Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Устанавливает имя и путь к файлу журнала Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Устанавливает уровень сообщений (verbosity) Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Устанавливает стиль интерфейса Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Устанавливает язык Vidalia."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Информация о использовании Vidalia"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "Не удалось открыть файл '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr "Указан неверный код языка:"
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr "Указан неверный тип GUI:"
+
+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 ""
+"Vidalia уже запущен, если это не так, то вы можете запустить еще один "
+"процесс Vidalia.\n"
+"\n"
+"Хотите продолжить запуск Vidalia?"
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr "%1 сек"
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr "%1 Б/с"
+
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr "%1 КБ/с"
+
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr "%1 MБ/с"
+
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
+msgstr "%1 GБ/с"
+
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr "%1 дней"
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr "%1 час(ов)"
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr "%1 минут(а)"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sl/qt_sl.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sl/qt_sl.po
new file mode 100644
index 0000000..a52f065
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sl/qt_sl.po
@@ -0,0 +1,431 @@
+msgid ""
+msgstr ""
+"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: 2009-10-17 19:28+0000\n"
+"Last-Translator: Matic Redek <cuuziismafia at hotmail.com>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
+"X-Generator: Pootle 1.1.0\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 ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sl/vidalia_sl.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sl/vidalia_sl.po
new file mode 100644
index 0000000..a464ed1
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sl/vidalia_sl.po
@@ -0,0 +1,4063 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-04-10 22:39+0000\n"
+"PO-Revision-Date: 2008-08-03 21:59+0000\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
+"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."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid ""
+"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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: generalpage.cpp:73
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:86
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr ""
+
+#: generalpage.cpp:96
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr ""
+
+#: generalpage.cpp:109
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr ""
+
+#: generalpage.cpp:117
+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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: generalpage.ui:154
+msgctxt "GeneralPage"
+msgid "Software Updates"
+msgstr ""
+
+#: generalpage.ui:160
+msgctxt "GeneralPage"
+msgid "Check for new software updates automatically"
+msgstr ""
+
+#: generalpage.ui:193
+msgctxt "GeneralPage"
+msgid "Check Now"
+msgstr ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv:"
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid ""
+"Vidalia was unable to open the selected link in your Web browser. You can "
+"still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 "
+"the Tor software. Please check your Task Manager to ensure there are no "
+"other Tor processes running."
+msgstr ""
+
+#: mainwindow.cpp:895
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+#: mainwindow.cpp:1154
+msgctxt "MainWindow"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any "
+"open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new "
+"relay?"
+msgstr ""
+
+#: mainwindow.cpp:1212
+msgctxt "MainWindow"
+msgid ""
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr ""
+
+#: mainwindow.cpp:1562
+msgctxt "MainWindow"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
+msgstr ""
+
+#: mainwindow.cpp:1564
+msgctxt "MainWindow"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
+msgstr ""
+
+#: mainwindow.cpp:1583
+msgctxt "MainWindow"
+msgid "Potentially Unsafe Connection"
+msgstr ""
+
+#: mainwindow.cpp:1588
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+#: mainwindow.cpp:1594
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
+
+#: mainwindow.cpp:1606
+msgctxt "MainWindow"
+msgid ""
+"One of your applications%1appears to be making a potentially unencrypted and "
+"unsafe connection to port %2. Anything sent over this connection could be "
+"monitored. Please check your application's configuration and use only "
+"encrypted protocols, such as SSL, if possible."
+msgstr ""
+
+#: mainwindow.cpp:1609
+msgctxt "MainWindow"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
+msgstr ""
+
+#: mainwindow.cpp:1817
+msgctxt "MainWindow"
+msgid "Update Failed"
+msgstr ""
+
+#: mainwindow.cpp:1843
+msgctxt "MainWindow"
+msgid "Your software is up to date"
+msgstr ""
+
+#: mainwindow.cpp:1845
+msgctxt "MainWindow"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
+msgstr ""
+
+#: mainwindow.cpp:1888
+msgctxt "MainWindow"
+msgid "Installation Failed"
+msgstr ""
+
+#: mainwindow.cpp:1889
+msgctxt "MainWindow"
+msgid "Vidalia was unable to install your software updates."
+msgstr ""
+
+#: mainwindow.cpp:1890
+msgctxt "MainWindow"
+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 "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid ""
+"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"
+"during normal Tor operation and are \n"
+"not considered errors, but you may \n"
+"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"
+"\n"
+"%2."
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: netviewer.cpp:507
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr ""
+
+#: netviewer.cpp:508
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+#: netviewer.cpp:523
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid ""
+"You must specify both an IP address or hostname and a port number to "
+"configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid ""
+"You must specify one or more ports to which your firewall allows you to "
+"connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid ""
+"Check to encrypt directory requests and, optionally, use bridge relays to "
+"access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid ""
+"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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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?"
+msgstr ""
+
+#: serverpage.ui:866
+msgctxt "ServerPage"
+msgid ""
+"Tor will still block some outgoing mail and file sharing applications by "
+"default to reduce spam and other abuse."
+msgstr ""
+
+#: serverpage.ui:676
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:902
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:920
+msgctxt "ServerPage"
+msgid ""
+"This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:942
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr ""
+
+#: serverpage.cpp:555
+msgctxt "ServerPage"
+msgid "No Recent Usage"
+msgstr ""
+
+#: serverpage.cpp:556
+msgctxt "ServerPage"
+msgid "No clients have used your relay recently."
+msgstr ""
+
+#: serverpage.cpp:559
+msgctxt "ServerPage"
+msgid ""
+"Leave your relay running so clients have a better chance of finding and "
+"using it."
+msgstr ""
+
+#: serverpage.cpp:594
+msgctxt "ServerPage"
+msgid "Bridge History"
+msgstr ""
+
+#: serverpage.cpp:596
+msgctxt "ServerPage"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgstr ""
+
+#: serverpage.cpp:599
+msgctxt "ServerPage"
+msgid ""
+"Tor returned an improperly formatted response when Vidalia requested your "
+"bridge's usage history."
+msgstr ""
+
+#: serverpage.cpp:600
+msgctxt "ServerPage"
+msgid "The returned response was: %1"
+msgstr ""
+
+#: serverpage.ui:33
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network"
+msgstr ""
+
+#: serverpage.ui:185
+msgctxt "ServerPage"
+msgid ""
+"Email address at which you may be reached if there is a\n"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+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 ""
+
+#: 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 ""
+
+#: 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 Tor's "
+"handy pocket creature died. Sorry."
+msgstr ""
+
+#: updateprocess.cpp:211
+msgctxt "UpdateProcess"
+msgid ""
+"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 ""
+
+#: 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"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: stringutil.cpp:323
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr ""
+
+#: stringutil.cpp:325
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+#: stringutil.cpp:327
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
+
+#: stringutil.cpp:329
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr ""
+
+#: stringutil.cpp:348
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr ""
+
+#: stringutil.cpp:350
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr ""
+
+#: stringutil.cpp:352
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr ""
+
+#: stringutil.cpp:354
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sq/qt_sq.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sq/qt_sq.po
new file mode 100644
index 0000000..106e1dd
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sq/qt_sq.po
@@ -0,0 +1,430 @@
+msgid ""
+msgstr ""
+"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: 2009-03-04 21:00+0000\n"
+"Last-Translator: Iliona Qejvanaj <Iliona>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "Aktivizo"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sq/vidalia_sq.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sq/vidalia_sq.po
new file mode 100644
index 0000000..c387b65
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sq/vidalia_sq.po
@@ -0,0 +1,3293 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Informacione mbi Vidalian"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Vidalia 0.2.0"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "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' nuk është adres IP e vlefshme."
+
+msgctxt "AdvancedPage"
+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"
+msgid "Select Tor Configuration File"
+msgstr "Zgjidh fajlin e konfigurimit të Tor"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Fajli Nuk u Gjet"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 nuk egziston. Dëshironi ta krijoni?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Nuk munda të krijoj fajlin"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "E pamundur të krijoj %1 [%2]"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Zgjidhni një directory që do përdoret për të dhënat e Tor"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "E pamundur të heq Shërbimin Tor"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "E pamundur të instaloj shërbimin Tor"
+
+msgctxt "AdvancedPage"
+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:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Adresa:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "Asnjë"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Cookie"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Password"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "Krijoje randoom"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Lundro"
+
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "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 ""
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Gjuha"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Zgjidh gjuhën që do përdori Vidalia"
+
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Stili"
+
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Zgjidh paraqitjen e Vidalias"
+
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr "Që Nga:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Fshih Zgjedhjet"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Shfaq Rregullimet"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Banda e përdorur nga Tor"
+
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "Reset"
+
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Shpejtësia në Hyrje"
+
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Shpejtësia në Dalje"
+
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Gjithmonë Sipër"
+
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Stili"
+
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Ndrysho trasparencën e Grafikut të Bandës"
+
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% Opak"
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Ruaj"
+
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Anullo"
+
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr ""
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "I ri"
+
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Hap"
+
+msgctxt "Circuit"
+msgid "Building"
+msgstr "Duke e krijuar"
+
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Dështoi"
+
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Mbyllur"
+
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "E Panjohur"
+
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Path Bosh>"
+
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Lidhje"
+
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "Gjëndja"
+
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Zoom te Qarku"
+
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "Mbyll Qarkun (Del)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Mbylle Fluksin (Del)"
+
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "Të Përgjithshme"
+
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Rrjeti"
+
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Paraqitja"
+
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Të Avancuara"
+
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Ndihmë"
+
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Gabim gjat shpëtimit të zgjedhjeve"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr "Vidalia nuk mundi të shpëtojë zgjedhjet tuaja %1."
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Gabim gjat zbatimit zë zgjedhjeve"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia nuk mundi të shpëtojë zgjedhjet tuaja %1 te Tor."
+
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Zgjedhjet"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Vidalia nuk mundi të lidhet me Tor. (%1)"
+
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "Socket kontrolli jo i lidhur."
+
+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 ""
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "Socket kontrolli jo i lidhur."
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Gabim gjat nisjes së një komande kontrolli. [%1]"
+
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr "Socket u shkëput ndërsa provoja të lexoja një rrjesht të dhënash."
+
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Përgjigjie kontrolli e gabuar. [%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 "Informacione mbi Vidalian"
+
+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 "Informacione"
+
+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 "Anullo"
+
+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 "Të Përgjithshme"
+
+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 "Përpara"
+
+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 "Porta:"
+
+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 "Të Përgjithshme"
+
+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 "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 "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "File exe (*.exe)"
+
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Zgjidh pathin për te Tor"
+
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr "Lundro"
+
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Tor"
+msgstr "Tor"
+
+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 "%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 "Fajli XML që dhatë nuk është një fajl përmbajtieje korrekt."
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "Kërkimi arriti fundin e dokumentit"
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "Kërkimi arriti fillimin e dokumentit"
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "Teksti nuk u gjet në dokument"
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "Numri i rezultateve të gjetura: %1"
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Ndihmë mbi Vidalian"
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Mbrapa"
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Shko te faqja e mëparshme (Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Përpara"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Shko tek faqja tjetër (Shift+Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Shpi"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Shko tek faqja e parë (Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Gjej"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "Kërko për një fjalë ose frazë te kjo faqe (Ctrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Mbylle"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Mbyll Ndihmën e Vidalias"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Gjej:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Gjej më Sipër"
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Gjej më Poshtë"
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "Bëj dallim Gërmë e Madhe/e Vogël"
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Vetëm fjalë të plota"
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Kapitujt e Ndihmës"
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Përmbajtja"
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Kërko"
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Duke kërkuar:"
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Gjeta Dokumenta"
+
+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 "Debug"
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Info"
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Njoftim"
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Warning"
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Gabim"
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "E Panjohur"
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Dil"
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Grafiku i Përdorimit të Bandës"
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Mesazhet e Log"
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Harta e Rrjetit"
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr "Paneli i Kontrollit"
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Zgjedhjet"
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr "Informacione"
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr "Ndihmë"
+
+msgctxt "MainWindow"
+msgid "New Identity"
+msgstr "Identitet i Ri"
+
+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 "Shif"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Ndihmë mbi Vidalian"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tori nuk është duke punuar"
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "Tori është duke ndalur"
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+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."
+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"
+msgid "Connecting to Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "Urat janë të aktivuara"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "Dëshironi të kërkoni vet për fajlin 'control_auth_cookie'?"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr ""
+
+msgctxt "MainWindow"
+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."
+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 "Ju lutem kontrolloni zgjedhjen tuaj të autentikimit të portës së kontrollit."
+
+msgctxt "MainWindow"
+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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr ""
+
+msgctxt "MainWindow"
+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"
+msgid "Failed to Create New Identity"
+msgstr "Nuk munda të Krijoj Identitetin e Ri"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Paneli i Kontrollit të Vidalias"
+
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "Gjëndja"
+
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Kombinimet e tastjerës së Vidalias"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Konfiguro Urat"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Shiko Rrjetin"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Shiko një hartë të rrjetit të Torit"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Përdor një Identitet të Ri"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Bëji lidhjet e tjera që do hapen të duken të reja"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Shiko dokumentacionin"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Shiko versionin dhe informacione mbi liçensën"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Dil nga Vidalia"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Shfaq ktë dritare gjatë nisjes"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Fshih"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Fshihe ktë dritare"
+
+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 "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 "Dështoi"
+
+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 "Vidalia nuk mundi të instalojë shërbimin Tor."
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+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 ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "Informacione mbi Vidalian"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Shpi"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Konfigurimi i Filtrit të Gabimeve"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia nuk mundi të regjistrohet për eventet log të Torit."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "Gabim gjat hapjes së fajlit të Log"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia s'mundi të hapi fajlin log që kërkuat."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Duhet emri i fajlit të Log"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "Duhet të fusni një emër për të mundur të shpëtoni mesazhet log në fajl."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Zgjidh fajlin e Log"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Shpëto Mesazhet Log"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Fajle Teksti (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Gjej tek mesazhet Log"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Gjej:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Nuk u Gjet"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "Kërkimi gjeti 0 rezultate."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Mesazhet e Log"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Filtrat e Mesazheve..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Vendos filtrat e mesazheve"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Madhësia e Historisë..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Shfaq numrin maksimal të mesazheve"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Pastro"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Pastro gjithë mesazhet nga Message Log (Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Kopjo"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Kopjo mesazhet e zgjedhura në clipboard (Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Zgjidhi të Gjitha"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Zgjidh gjithë mesazhet (Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Shpëto Gjithçka"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Shpëtoji gjithë mesazhet në fajl"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Shpëto të zgjedhurit"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Shpëto mesazhet e zgjedhura në fajl"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Zgjedhjet"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Rregullo Konfigurimin e Mesazheve Log"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Ndihmë"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Hap lexuesin e dokumentacionit"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Mbylle"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Mbyll Message Log"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Gjej"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Gjej gjith mesazhet që përmbajnë tekstin e kërkuar (Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Koha"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Tipi"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Mesazhe"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Shpëto konfigurimin e tanishëm të Mesazheve Log"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Shpëto Konfigurmin"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Anullo ndryshimet e bëra te konfigurimi"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Anullo"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Filtri i Mesazheve"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Gabim"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Warning"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Njoftim"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Info"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Debug"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "Historiku i Mesazheve Log"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Numri i mesazheve që do shfaqen në dritaren e mesazheve"
+
+msgctxt "MessageLog"
+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"
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr "Aktovo shpëtimin automatik të gjithë mesazheve të reja në fajl"
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "Shpëtoji automatikisht gjithë mesazhet në fajl"
+
+msgctxt "MessageLog"
+msgid "Messages that appear when something has \n"
+"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."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Harta e Rrjetit të Tor"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Azhorno të dhënat"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "Azhorno listën e urave dhe lidhjeve të Tor"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Ndihmë"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Shfaq ndihmën mbi hartën e rrjetit"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Shfaq ndihmën mbi hartën e rrjetit"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Mbylle"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Mbyll hartën e rrjetit"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Zoom +"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Zoom + në hartën e rrjetit"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Zoom -"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Zoom - në hartën e rrjetit"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Zoom sa Faqja"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Zoom që të duken të gjithë qarqet e dukshme"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "Fajli Nuk u Gjet"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "E Panjohur"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+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."
+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."
+msgstr "Ju duhet të përcaktoni një ose më tepër porta tek të cilat fairuolli juaj lejon lidhjen."
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' nuk është një numër porte i vlefshëm."
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "Unë përdor një proxy për tu lidhur në Internet"
+
+msgctxt "NetworkPage"
+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:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "Porta:"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "Fajruolli im më lejon të lidhem vetëm në porta të caktuara"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "Konfigurimi i Fairuollit"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "Portat e Lejuara:"
+
+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 ""
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "ISP-ja ime bllokon lidhjet drejt rrjetit të Torit"
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+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"
+
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr "Kopjo urat e zgjedhura në clipboard"
+
+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 "Policy"
+msgid "accept"
+msgstr "Prano"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "Refuzo"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "I lidhur"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Në gjumë"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "I shkëputur"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Vëndndodhja:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "Adresa IP:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Arkitektura:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Banda:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Ndezur:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Azhornimi i Fundit:"
+
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Kopjo"
+
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
+msgstr "Në gjumë"
+
+msgctxt "RouterInfoDialog"
+msgid "Online"
+msgstr "I lidhur"
+
+msgctxt "RouterInfoDialog"
+msgid "Offline"
+msgstr "I shkëputur"
+
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr "E Panjohur"
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr "Nickname:"
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr "Gjëndja"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "Vëndndodhja:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "Adresa IP:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "Arkitektura:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "Banda:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "Ndezur:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "Info të kontaktit:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "Azhornimi i Fundit:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "I shkëputur"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Në gjumë"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Urë"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "Zoom te Ura"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Kopjo"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr ""
+
+msgctxt "ServerPage"
+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."
+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."
+msgstr "Ju lutem instaloni një version më të ri të Tor ose konfiguroni Torin të funksionojë si një Tor relay normal."
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "Ura e juaj e relay nuk është aktive."
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "Ju duhet të jepni të paktën një nickname dhe portë."
+
+msgctxt "ServerPage"
+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:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Porta për Direktori:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Numri i Portës së Direktorive"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Info të kontaktit:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "Emri i relayit tuaj"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "Porta në të cilën përdoruesit dhe relayet e tjera mund të komunikojnë me relayin tuaj"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Nickname:"
+
+msgctxt "ServerPage"
+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."
+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"
+msgid "Cable/DSL 256 Kbps"
+msgstr "Kabëll/DSL 256 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "Kabëll/DSL 512 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "Kabëll/DSL 768 Kbps"
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/Kabëll/DSL 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "E personalizuar"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Zgjidhni opsionin që i afrohet më tepër lidhjes suaj"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Shfaq titujt e dokumentacionit mbi limitet e bandës"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Shpejtësia Mesatare"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Mesatarja për kohë të gjatë e limitit të bandës"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Niveli Maksimal"
+
+msgctxt "ServerPage"
+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."
+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"
+msgid "Bandwidth Limits"
+msgstr "Limitet e Bandës"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Portat 6660 - 6669 dhe 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Portat 110, 143, 993 dhe 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Shkarko Postën (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Porta të pa specifikuara më sipër"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Shërbime të tjera të ndryshme"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Portat 706, 1863, 5050, 5190, 5222, 8300 dhe 8888 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "Instant Messaging (IM)"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "Porta 443"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "Secure Websites (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Porta 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Uebsaite"
+
+msgctxt "ServerPage"
+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?"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Politikat e Daljes"
+
+msgctxt "ServerPage"
+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"
+msgstr "Ky është identiteti i urës suaj që mund ti jepni personave të tjerë"
+
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr "Kopjo identitetin e urës tuaj në clipboard"
+
+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 "Historiku i Mesazheve Log"
+
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "The returned response was: %1"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network"
+msgstr "Ndihmoni përdoruesit e çensuruar të arrijnë rrjetin Tor (Tor 0.2.0.8-alpha ose më i ri)"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Email address at which you may be reached if there is a\n"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr ""
+
+msgctxt "ServicePage"
+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."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Gabim"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+msgctxt "Stream"
+msgid "New"
+msgstr "E re"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Duke zgjidhur"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Duke u lidhur"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "Hap"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Dështoi"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Mbyllur"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Riprovoj"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "U Rimapua"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "E panjohur"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "Dështoi ndalimi i proçesit %1. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "Shërbimi Tor nuk është i instaluar."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "E pamundur të nis shërbimin Tor."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+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 "Fshih"
+
+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 "Ok"
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr "Anullo"
+
+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 "Backspace"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "Ok"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Anullo"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Po"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Jo"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Ndihmë"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Riprovo"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Shfaq log"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Shfaq rregullimet"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Vazhdo"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Dil"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Lundro"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Opsion i Gabuar"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia ishte e nisur që më parë"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Shfaq ktë mesazh përdorimi dhe del."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "Reseton GJITHË zgjedhjet e ruajtura të Vidalias."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Vendos direktorin ku Vidalia ruan fajlet e të dhënave."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Zgjedh emrin dhe vëndndodhjen e fajlit të PID të Vidalias."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Vendos emrin dhe vendndodhjen e fajlit të log të Vidalias."
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Zgjedh nivelin e detajit të logëve të Vidalias."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Zgjedh stilin e paraqitjes së Vidalias."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Zgjedh gjuhën e Vidalias."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Informacion mbi Prdorimin e Vidalias"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "E pamundur të hap fajlin e logut '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr "%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 ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sr/qt_sr.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sr/qt_sr.po
new file mode 100644
index 0000000..3e9b1b4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sr/qt_sr.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-08-20 03:25+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"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sr/vidalia_sr.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sr/vidalia_sr.po
new file mode 100644
index 0000000..22b0f4e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sr/vidalia_sr.po
@@ -0,0 +1,3292 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Vidalia 0.2.0"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor 0.2.0.32"
+msgstr ""
+
+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."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+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 ""
+
+msgctxt "AdvancedPage"
+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"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+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 ""
+
+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 ""
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+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 ""
+
+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 ""
+
+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 ""
+
+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 ""
+
+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"
+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 "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 "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 "The proxy arguments specified are not properly formatted."
+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 "MainWindow"
+msgid "Start Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Identity"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Control 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."
+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 ""
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+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 ""
+
+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 "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 ""
+
+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 "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+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 ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Always Save New Log 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 "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."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+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 ""
+
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+msgctxt "NetworkPage"
+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."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+msgctxt "NetworkPage"
+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 ""
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+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 ""
+
+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 "Policy"
+msgid "accept"
+msgstr ""
+
+msgctxt "Policy"
+msgid "reject"
+msgstr ""
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr ""
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr ""
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr ""
+
+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:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr ""
+
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+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 ""
+
+msgctxt "ServerPage"
+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 ""
+
+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 "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 ""
+
+msgctxt "ServicePage"
+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."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+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 ""
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sv/qt_sv.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sv/qt_sv.po
new file mode 100644
index 0000000..99db7ad
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sv/qt_sv.po
@@ -0,0 +1,438 @@
+msgid ""
+msgstr ""
+"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: 2009-02-24 03:20+0000\n"
+"Last-Translator: phobos <phobos at rootme.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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "Aktivera"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "Binären \\ kräver Qt %2, hittade Qt %3."
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "Inkompatibelt Qt-biblioteksfel"
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "LTR"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "Aktiverar programmets huvudfönster"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "OK"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "Spara"
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "Öppna"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "Stäng"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "Verkställ"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "Återställ"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "Hjälp"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "Spara inte"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "Förkasta"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "&Ja"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "Ja till &alla"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "&Nej"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "N&ej till alla"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "Spara alla"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "Avbryt"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "Försök igen"
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "Ignorera"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "Återställ standardvärden"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "Stäng utan att spara"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "&OK"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "Namn"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "Storlek"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "Sort"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "Typ"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "Ändringsdatum"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "Alla filer (*)"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "Kataloger"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "&Öppna"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "&Spara"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "Öppna"
+
+#: qfiledialog.cpp:1670
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr "%1 finns redan. Vill du ersätta den?"
+
+#: qfiledialog.cpp:1690
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr "%1 Filen hittades inte. Kontrollera att det korrekta filnamnet angavs."
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "Den här datorn"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "&Byt namn"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "&Ta bort"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "Visa &dolda filer"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "Tillbaka"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "Föräldrakatalog"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "Listvy"
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "Detaljerad vy"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "Filer av typen:"
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "Katalog:"
+
+#: qfiledialog.cpp:2476
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+"%1 Katalogen hittades inte. Kontrollera att det korrekta katalognamnet "
+"angavs."
+
+#: qfiledialog.cpp:2281
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr "\\ är skrivskyddad. Vill du ta bort den ändå?"
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "Är du säker på att du vill ta bort \\?"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "Kunde inte ta bort katalogen."
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "Alla filer (*.*)"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "Spara som"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "Enhet"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "Fil"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "Okänt"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "Hitta katalog"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "Visa"
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "Framåt"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "Ny mapp"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "&Ny mapp"
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "&Välj"
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "Ta bort"
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "Fil&namn:"
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "Kolla i:"
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "Skapa ny mapp"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "Invalid filename"
+msgstr "Ogiltigt filnamn"
+
+#: 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>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"
+msgid "Name"
+msgstr "Namn"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "Storlek"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "Sort"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "Typ"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "Ändringsdatum"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "Den här datorn"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "Dator"
+
+#: 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 bytes"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sv/vidalia_sv.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sv/vidalia_sv.po
new file mode 100644
index 0000000..ba5c1f1
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sv/vidalia_sv.po
@@ -0,0 +1,3292 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Om Vidalia"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "Licens"
+
+msgctxt "AboutDialog"
+msgid "Vidalia 0.2.0"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "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."
+msgstr "Du har valt lösenordsautentisering men inte angivit något lösenord."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Välj konfigurationsfil för Tor"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Filen hittades ej"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 existerar ej. Vill du skapa den?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Det gick ej att skapa filen"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "Det gick ej att skapa %1 [%2]"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Välj en katalog för Tor-data"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Vidalia kunde inte ta bort Windows-tjänsten för Tor. Du kanske måste ta bort tjänsten manuellt."
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "Det gick ej att installera Windows-tjänsten för Tor"
+
+msgctxt "AdvancedPage"
+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:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Adress:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "Inget"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Cookie"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Lösenord"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "Generera slumpmässigt"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Konfigurationsfil för Tor"
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "Starta Tor med följande konfigurationsfil (torrc)"
+
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "Välj sökväg till din konfigurationsfil"
+
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Bläddra"
+
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr "Datakatalog"
+
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr "Använd följande katalog för att lagra programdata för Tor"
+
+msgctxt "AdvancedPage"
+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 "Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Språk"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Välj det språk som Vidalia ska använda"
+
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Stil"
+
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Välj den stil som Vidalia ska använda"
+
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr "Vidalia kunde ej ladda den valda språköversättningen"
+
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr "Sedan:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Dölj inställningar"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Visa inställningar"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Tors bandbreddsförbrukning"
+
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "Nollställ"
+
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Mottagningshastighet"
+
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Sändningshastighet"
+
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Alltid överst"
+
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Stil"
+
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Ändrar genomskinligheten för bandbreddsdiagrammet"
+
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% ogenomskinlighet"
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Spara"
+
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Avbryt"
+
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr ""
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "Ny"
+
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Öppen"
+
+msgctxt "Circuit"
+msgid "Building"
+msgstr "Skapar"
+
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Misslyckad"
+
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Stängd"
+
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Okänd"
+
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Sökväg tom>"
+
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Anslutning"
+
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "Status"
+
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Zooma in på kretsen"
+
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "Avsluta kretsen (Del)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Avsluta strömmen (Del)"
+
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "Allmänt"
+
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Nätverk"
+
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr "Utdelning"
+
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "Tjänster"
+
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Utseende"
+
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Avancerat"
+
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Hjälp"
+
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Det gick ej att sparar inställningar"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr "Vidalia kunde inte spara din %1 inställningar."
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Det gick ej att tillämpar inställningar"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia kunde inte tillämpa din %1 inställningarna till Tor."
+
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Inställningar"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Vidalia kunde inte ansluta till Tor. (%1)"
+
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "Kontrollsockeln är inte ansluten."
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "Lösenord krävs"
+
+msgctxt "ControlPasswordInputDialog"
+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 ""
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "Kontrollsockeln är ej ansluten."
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Det gick ej att skicka kontrollkommandot. [%1]"
+
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr "Sockeln kopplades ifrån när data skulle läsas."
+
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Ogitligt kontrollsvar. [%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 "Om Vidalia"
+
+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 "Om"
+
+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 "Avbryt"
+
+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 "Allmänt"
+
+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 "Licens"
+
+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 "Framåt"
+
+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 "Port:"
+
+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 "Allmänt"
+
+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 "Utdelning"
+
+msgctxt "CountryInfo"
+msgid "Sri Lanka"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sudan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Suriname"
+msgstr "Smeknamn"
+
+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 "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 "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Körbara filer (*.exe)"
+
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Välj sökväg till Tor"
+
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "Välj den körbara fil som startar proxyservern"
+
+msgctxt "GeneralPage"
+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"
+
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr "Bläddra"
+
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Starta Tormjukvaran när Vidalia startar"
+
+msgctxt "GeneralPage"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr "Proxy Program (valfritt)"
+
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "Starta ett proxy program när Tor startar"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Proxy Program Argument:"
+
+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 "Den tillhandhållna XML-filen är inte ett giltigt dokument."
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "Sökningen har nått slutet av dokumentet"
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "Sökningen har nått början av dokumentet"
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "Texten hittades ej i dokumentet"
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "Hittade %1 träffar"
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Vidalias hjälp"
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Tillbaka"
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Gå till föregående sida (Backsteg)"
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Backsteg"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Framåt"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Gå till nästa sida (Skift+Backsteg)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Skift+Backsteg"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Hem"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Gå till hemsidan (Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Sök"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "Sök efter ett ord eller en fras på denna sida (Ctrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Stäng"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Stäng Vidalias hjälpen"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Sök:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Sök föregående"
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Sök nästa"
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "Skiftlägeskänsligt"
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Endast hela ord"
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Hjälpavsnitt"
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Innehåll"
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Sök"
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Söker efter:"
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Funna dokument"
+
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr "Öppnar extern länk"
+
+msgctxt "HelpTextBrowser"
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgstr "Vidalia kan öppna länken du valde i din uppsprungliga webbrowser. Om din browser inte är konfigurerar att använda Tor så kommer inte begäran vara annonym."
+
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr "Vill du att Vidalia ska öppna den här länken i din webbläsare?"
+
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr "Kunde ej öppna linken"
+
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr "Vidalia kunde inte öppna den valda länken i din webbrowser. Du kan fortfarande kopiera länken och klistra in det i din browser."
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr "Licensinformation"
+
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "Licens"
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr "Credits"
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "Avlusa"
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Info"
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Meddelande"
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Varning"
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Fel"
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Okänd"
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "Starta Tor"
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Avsluta"
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Bandbreddsdiagram"
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Meddelandelogg"
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Nätverkskarta"
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr "Kontrollpanelen"
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Inställningar"
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr "Om"
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr "Hjälp"
+
+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"
+
+msgctxt "MainWindow"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "MainWindow"
+msgid "View"
+msgstr "Vy"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Vidalia-hjälp"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "Det gick ej att starta webbläsaren"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia kunde inte starta den konfigurerade webbläsaren"
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "Fel när IM-klienten startades"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "Vidalia kunde ej öppna den konfigurerade IM-klienten"
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Det gick ej att starta proxy-tjänst"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia kunde inte starta den konfigurerade proxyservern"
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Ansluter till en nodkatalog"
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "Skapar en krypterad kataloganslutning"
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "Hämtar nätverksstatusen"
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "Laddar nätverksstatus"
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "Laddar auktoritära certifikat"
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "Begär nodinformation"
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "Laddar routerinformation"
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "Ansluter till Tor-nätverket"
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "Skapar en Torkrets"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "identitet felmatchad"
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr "redo"
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "anslutningen vägrades"
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "anslutningen gjorde en timeout"
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "läs/skrivfel"
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "framkomlig väg till värddatorn saknas (no route to host)"
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "otillräckliga resurser"
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "okänd"
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor är ej i gång"
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "Tor avslutas"
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Stoppa Tor nu"
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr "Stoppa Tor"
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Startar Torprogramvara"
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "Startar Tor"
+
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Det gick ej att starta Tor"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgstr "Vidalia kunde ej starta Tor. Kontrollera dina inställningar: stämmer namnet och sökvägen för Tors exekverbara fil?"
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "Ansluter till Tor"
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "Anslutningsfel"
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "Vidarebefordring är aktiverat"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "Kunde ej avsluta"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "Vidalia kunde inte avsluta Torprogrammet."
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "Oväntat fel"
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Autentiserar mot Tor"
+
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "Cookieautentisering krävs"
+
+msgctxt "MainWindow"
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgstr "Tor programvaran kräver att Vidalia skickar innehållet i en verifierad cookie men Vidalia kunde ej finna någon."
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "Vill du välja 'control_auth_cookie'-filen själv?"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Datakatalog"
+
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Kontrollcookie (control_auth_cookie)"
+
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "Ett fel uppstod vid eventsregistrering"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr "Vidalia kunde ej registrera sig för vissa händelser. Många av Vidalias funktioner kan vara otillgängliga."
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Autentiseringsfel"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Vidalia kunde ej styrka till Tor-program. (%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Vänligen kontrollera dina inställningar för kontrollportsautentisering."
+
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "Toruppdatering tillgänglig"
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr "Den installerade versionen av Tor är inte aktuell eller rekommenderas inte längre. Besök Torhemsidan för att ladda ner den senaste versionen."
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Tors hemsida: %1"
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "Efterföljande anslutningar kommer att framstå som olika från dina gamla anslutningar."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "Kunde ej skapa ny identitet"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "Portomdirigeringen misslyckades"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "Vidalia kunde ej konfigurera automatisk port-omdirigering."
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Kontrollpanel för Vidalia"
+
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "Status"
+
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Genvägar för Vidalia"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Skapa Tor-router"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Sätt upp en nod och hjälp nätverket växa"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Se nätverket"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Se en karta över Tor-nätverket"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Använd en ny identitet"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Få efterföljande anslutningar att framstå som olika från mina gamla anslutningar"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Se nuvarande bandbreddsförbrukning"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Se historik för loggmeddelanden"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Se hjälpdokumentationen"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Konfigurera Vidalia"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Se versions- och licensinformation för Tor"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Avsluta Vidalia"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Visa detta fönster vid uppstart"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Dölj"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Dölj detta fönster"
+
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr "Lösenordsreset misslyckades"
+
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr "Vidalia försökte ställa om Tors kontrollösenord, men kunde inte starta om Tormjukvaran. Kolla i aktivitetshanteraren och säkerställ att ingen annan Torprocess körs."
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgstr "Den installerade versionen av Tor är inte aktuell eller rekommenderas inte längre. Besök Torhemsidan för att ladda ner den senaste versionen."
+
+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 "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 "Toruppdatering tillgänglig"
+
+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 "Vidalia kunde inte avsluta Torprogrammet."
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+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 ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "Om Vidalia"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Hem"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Det gick ej att tillämpa filterinställningar"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia kunde ej registrera sig för Tors loggmeddelanden."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "Det gick ej att öppna loggfilen"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia kunde ej öppna den angivna loggfilen."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Namn för loggfilen krävs"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "Vänligen skriv in ett filnamn för att spara loggmeddelanden till en fil."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Välj loggfil"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Spara Loggmeddelanden"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Textfiler (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Sök i meddelandeloggen"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Sök:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Hittades ej"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "Sökningen hittade 0 resultat."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Meddelandelogg"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Filter för meddelanden..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Välj filter för meddelanden"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Storlek på historiken..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Välj maximalt antal meddelanden som ska visas"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Rensa"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Rena alla meddelanden i loggen (Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Kopiera"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Kopiera de valda meddelandena till urklipp (Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Välj alla"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Välj alla meddelanden (Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Spara alla"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Spara alla meddelanden till en fil"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Spara valda"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Spara valda meddelanden till en fil"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Inställningar"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Anpassa inställningarna för meddelandeloggen"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Hjälp"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Visa hjälpen"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Stäng"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Stäng meddelandeloggen"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Sök"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Hitta alla meddelanden som innehåller söktexten (Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Tid"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Typ"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Meddelande"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Sparar inställningarna för meddelandeloggen"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Spara inställningar"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Avbryter ändringar gjorda för meddelandeloggen"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Avbryt"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Filter för meddelanden"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Fel"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Varning"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Meddelande"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Info"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Avlusa"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "Historik för loggmeddelanden"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Antal meddelanden att visa i fönstret för loggmeddelanden"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "meddelanden"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Spara alltid nya loggmeddelanden"
+
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "Bläddra"
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr "Aktivera att alla nya loggmeddelanden sparas till en fil"
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "Spara automatiskt nya loggmeddelanden till filen"
+
+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."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor-nätverkskartan"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Uppdatera"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "Uppdatera listan med Tornoder och anslutningar"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Hjälp"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Visa hjälpen för nätverkskartan"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Visa hjälpen för nätverkskartan"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Stäng"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Stäng nätverkskartan"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Zooma in"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Zoomar in på nätverkskartan"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Zooma ut"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Zoomar ut från nätverkskartan"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Zooma för att anpassa"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Zoomar för att visa alla aktuella kretsar på kartan"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "Filen hittades ej"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "Okänd"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+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."
+msgstr "Du måste ange både en IP-adress (eller ett värddatornamn) och ett portnummer för att Tor ska kunna ansluta till Internet via en proxyserver."
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "Du måste ange ett eller flera portnummer som din brandvägg tillåter dig att ansluta till."
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' är inte ett giltigt portnummer."
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr "Se ifall ditt lokala nätverk kräver en proxy för att komma åt Internet."
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "Jag använder en proxyserver för att ansluta till Internet"
+
+msgctxt "NetworkPage"
+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:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "Port:"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr "Kryssa i för att endast ansluta till noder som använder portar som är tillåtna av din brandvägg"
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "Min brandvägg tillåter mig bara att ansluta till vissa portar"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "Brandväggsinställningar"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "Tillåtna portar:"
+
+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 "Kryssa i för att kryptera katalogförfrågningar och för att (efter separat val) använda bryggnoder för att komma åt Tornätverket"
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "Min internetleverantör blockerar anslutningar till Tor-nätverket"
+
+msgctxt "NetworkPage"
+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"
+
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr "Kopiera de valda bryggorna till urklipp"
+
+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 "Policy"
+msgid "accept"
+msgstr "acceptera"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "avslå"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Uppkopplad"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "I viloläge"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Nerkopplad"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Plats:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "IP-adress:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Plattform:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Bandbredd:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Uptid:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Senast uppdaterad:"
+
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Kopiera"
+
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
+msgstr "I viloläge"
+
+msgctxt "RouterInfoDialog"
+msgid "Online"
+msgstr "Uppkopplad"
+
+msgctxt "RouterInfoDialog"
+msgid "Offline"
+msgstr "Nerkopplad"
+
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr "Okänd"
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr "Namn:"
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr "Status"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "Plats:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "IP-adress:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "Plattform:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "Bandbredd:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "Uptid:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "Kontaktinfo:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "Senast uppdaterad:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Nerkopplad"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "I viloläge"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Router"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "Zooma in på router"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 router uppkopplad"
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Kopiera"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "Smeknamn"
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "Fingeravtryck"
+
+msgctxt "ServerPage"
+msgid "Bridge Support Unavailable"
+msgstr "Bryggstöd är inte tillgängligt"
+
+msgctxt "ServerPage"
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgstr "Du har konfigurerat Tor för att agera brygga åt censurerade användare, men din version av Tor stödjer inte bryggor."
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "Var god att uppgradera din Torprogramvara eller konfigurera den för att agera normal Tornod."
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "Din bryggrouter är ej i gång."
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "Du måste räkna upp åtminstone en routernamn och port."
+
+msgctxt "ServerPage"
+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:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "Aktivera för att spegla reläkatalogen"
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "Försök att konfigurera portomdirigeringen automatiskt"
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "Testa"
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "Visa hjälp avsnitt om port-omdirigering."
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Katalogport:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Portnummer för katalog"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Kontaktinfo:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "Namnet på din router"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "Den port som användare och andra routrar kan kommunicera med din router på"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Namn:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Allmänt"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Om din Internetanslutning har snabb nerladdningshastighet men långsam uppladdningshastighet, vänligen välj uppladningshastighet här."
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "Kabel/DSL 256 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "Kabel/DSL 512 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "Kabel/DSL 768 Kbps"
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/Kabel/DSL 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "Annat"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Välj det alternativ som bäst överensstämmer med din Internetanslutning"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Visa hjälpavsnittet om begränsningar på bandbreddshastigheter"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Snitthastighet"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Genomsnittlig begränsning av bandbreddshastighet"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Maxhastighet"
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "Maximumhastighet för begränsning av bandbredd"
+
+msgctxt "ServerPage"
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr "Maxvärdet för bandbreddshastigheten måste vara högre eller lika med snittvärdet för bandbreddhastigheten. Båda värdena måste vara minst 20 KB/s."
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Bandbreddsbegränsningar"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Portarna 6660 - 6669 och 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Portarna 110, 143, 993 och 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Hämta e-post (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Portar som inte täcks av de andra alternativen"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Andra övriga tjänster"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Portarna 706, 1863, 5050, 5190, 5222, 5223, 8300 och 8888"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "Snabbmeddelanden"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "Port 443"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "Säkra webbplatser (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Port 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Webbplatser"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "Visa hjälpavsnitt om användningspolicyn"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr "Vilka resurser på Internet ska användare kunna komma åt genom din router?"
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr "Tor kommer fortfarande att blockera vissa utgående mail- och fildelningsprogram för att minska spam och annat missbruk."
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Användningspolicyn"
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr "Ge andra tillgång till din brygga genom att ge dem följande textrad:"
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "Det här är din bryggrouters identitet som du kan ge till andra människor"
+
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr "Kopiera din bryggrouters identitet till urklipp"
+
+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 "Brygginställningar"
+
+msgctxt "ServerPage"
+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 ""
+
+msgctxt "ServerPage"
+msgid "The returned response was: %1"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network"
+msgstr "Hjälp censurerade användare att använda Tornätverket (Tor 0.2.0.8-alpha eller nyare)"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Hur kan jag hitta en brygga?</a>"
+
+msgctxt "ServerPage"
+msgid "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 ""
+
+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."
+msgstr "Konfigurera åtminstone en aktivitetskatalog och en virtuell port för varje aktivitet du vill spara. Ta bort de andra."
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Fel"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "Varsågod och välj en tjänst."
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "Välj en tjänst-katalog"
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "Virtuella portar får bara innehålla tillåtna port nummer [1..65535]."
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "Målet för enbart innehålla adressen:porten, adressen, eller porten"
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr "Katalogen används redan i en annan förbindelse."
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "Formulär"
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr "Erhållna gömda tjänster"
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "Onion-adress"
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "Virtuell port"
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "Mål"
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "Katalogens sökväg"
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "Aktiverad"
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "Lägga till tjänst till lista"
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "Tar bort den valda tjänsten från listan"
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr "Kopiera det vald onion-adress till urklipp"
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr "Bläddra i det lokala filsystemet och välj katalog för den valda tjänsten"
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "Skapad av Tor"
+
+msgctxt "Stream"
+msgid "New"
+msgstr "Ny"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Slår upp"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Ansluter"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "Öppen"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Misslyckad"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Stängd"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Försöker igen"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "Om-mappad"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Okänd"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "Processen %1 kunde ej stoppas. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "Tor-tjänsten är inte installerad."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "Kunde ej starta Tor-tjänsten."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "Misslyckades med att göra kontrolllösenordet till ett hashvärde."
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "Framgång"
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "Inga UPnP-aktiverade enheter hittades"
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "Ingen giltig UPnP-aktiverad Internet gateway kunde hittas."
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "WSAStartup misslyckades"
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "Misslyckades att lägga till en portmappning"
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "Misslyckades med att hämta en portmappning"
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "Misslyckades med att ta bort en portmappning"
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "Okänt fel"
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "Letar efter UPnP-aktiverade enheter"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "Uppdaterar katalogportmappning"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "Uppdaterar nodportmappning"
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "Testet avslutades med goda resultat!"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "Testar UPnP-stöd"
+
+msgctxt "UPNPTestDialog"
+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 ""
+
+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 "Dölj"
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr "Startar Torprogramvara"
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr "Okej"
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr ""
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr "Avbryt"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr "Toruppdatering tillgänglig"
+
+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 "Backsteg"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr "version"
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "Okej"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Avbryt"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Ja"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Nej"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Hjälp"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Försök igen"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Visa loggen"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Visa inställningar"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Fortsätt"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Avsluta"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Bläddra"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Ogiltigt argument"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia är redan igång"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Visar detta användningsmeddelanden och avslutar."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "Nollställer ALLA sparade inställningar för Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Ställer in katalogen som Vidalia använder för datafiler."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Ställer in namnet och platsen för Vidalias pidfil."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Ställer in namnet och platsen för Vidalias loggfil."
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Ställer in detaljrikedomen för Vidalias loggmeddelanden."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Ställer in utseende för Vidalia."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Ställer in språket för Vidalia."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Användningsinformation om Vidalia"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "Kunde ej öppna loggfilen '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr "%1 sekunder"
+
+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 ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sw/qt_sw.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sw/qt_sw.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sw/qt_sw.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sw/vidalia_sw.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sw/vidalia_sw.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/sw/vidalia_sw.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/templates/qt.pot b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/templates/qt.pot
new file mode 100644
index 0000000..ef3c5f3
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/templates/qt.pot
@@ -0,0 +1,427 @@
+msgid ""
+msgstr ""
+"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: 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"
+"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 ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/templates/vidalia.pot b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/templates/vidalia.pot
new file mode 100644
index 0000000..ae34379
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/templates/vidalia.pot
@@ -0,0 +1,3293 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Vidalia 0.2.0"
+msgstr ""
+
+msgctxt "AboutDialog"
+msgid "Tor 0.2.0.32"
+msgstr ""
+
+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."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+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 ""
+
+msgctxt "AdvancedPage"
+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"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+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 ""
+
+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 ""
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+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 ""
+
+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 ""
+
+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 ""
+
+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 ""
+
+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"
+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 "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 "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 "The proxy arguments specified are not properly formatted."
+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 "MainWindow"
+msgid "Start Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "New Identity"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "View"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr ""
+
+msgctxt "MainWindow"
+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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Control 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."
+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 ""
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+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 ""
+
+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 "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 ""
+
+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 "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+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 ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Always Save New Log 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 "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."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+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 ""
+
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+msgctxt "NetworkPage"
+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."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+msgctxt "NetworkPage"
+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 ""
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+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 ""
+
+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 "Policy"
+msgid "accept"
+msgstr ""
+
+msgctxt "Policy"
+msgid "reject"
+msgstr ""
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr ""
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr ""
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr ""
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr ""
+
+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:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr ""
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr ""
+
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+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 ""
+
+msgctxt "ServerPage"
+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 ""
+
+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 "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 ""
+
+msgctxt "ServicePage"
+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."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+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 ""
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/th/qt_th.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/th/qt_th.po
new file mode 100644
index 0000000..0e23a44
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/th/qt_th.po
@@ -0,0 +1,431 @@
+msgid ""
+msgstr ""
+"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-02-24 13:22-0500\n"
+"Last-Translator: Matthew Edman <edmanm at vidalia-project.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"
+"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 ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/th/vidalia_th.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/th/vidalia_th.po
new file mode 100644
index 0000000..10e370a
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/th/vidalia_th.po
@@ -0,0 +1,2792 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\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-10-25 13:47+0000\n"
+"Last-Translator: Poonsub Leenanurak <Poonsub_Lee at hotmail.com>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "เกี่ยวกับ Vidalia"
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "Qt"
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Tor"
+
+# a bit wrong spell
+#: 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 "0.2.0.31-alpha-dev (r123456)"
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr "4.4.2"
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "คุณเลือกการให้สิทธิตาม รหัสผ่าน, แต่ยังไม่ได้ตั้ง รหัสผ่าน"
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "เลือกไฟล์ตั้งค่าการทำงานของโปรแกรม Tor"
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "หาไฟล์ไม่พบ"
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "ไม่พบ%1. ต้องการสร้างมันขึ้นมาหรือไม่"
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "พบความผิดพลาดในการสร้างไฟล์"
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "ไม่สามารถสร้าง %1 [%2] ได้"
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "เลือกที่จัดข้อมูลของ Tor"
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "ไม่สามารถลบ Tor Service ได้"
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr "Vidalia ไม่สามารถลบ Tor Service ออกได้. คุณจำเป็นต้องลบด้วยตัวเอง"
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "ไม่สามารถติดตั้ง Tor Service"
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "Vidalia ไม่สามารถติดตั้ง Tor service"
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "เลข Port ควบคุม"
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "การให้สิทธิเข้าถึง"
+
+# Address:
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "เลข IP"
+
+#: 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 "ไฟล์ตั้งค่าการทำงานของโปรแกรม Tor"
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+"เริ่มการทำงานโปรแกรม Tor ด้วยไฟล์ตั้งค่าการทำงานของโปรแกรม(torrc)ที่ระบุ"
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "เลือกที่อยู่ของไฟล์ตั้งค่าการทำงานของโปรแกรม Tor ของคุณ"
+
+#: 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 "จัดเก็บข้อมูลของโปรแกรม Tor ที่"
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr "เลือกที่จัดเก็บข้อมูลสำหรับโปรแกรม Tor"
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "ภาษา"
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "เลือกภาษาที่จะใช้ใน Vidalia"
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "สไตล์"
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "เลือกสไตล์หน้าจอ Vidalia"
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr "Vidalia ไม่สามารถดึงภาษาที่เลือกขึ้นมาใช้ได้"
+
+#: 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 "การใช้ Bandwidth ของ Tor"
+
+#: 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 "ปรับระดับการความโปร่งแสงของกราฟ Bandwidth"
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% การโปร่งแสง"
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "จัดเก็บลงไฟล์"
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#: circuit.cpp:112
+msgctxt "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 "<Path Empty>"
+
+#: 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 "ปิดวงจรเชื่อมต่อ (กดปุ่ม Del)"
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "ปิดสายข้อมูลเชื่อมต่อ (กดปุ่ม Del)"
+
+#: 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 "Vidalia ไม่สามารถจัดเก็บการตั้งค่า %1 ของคุณได้."
+
+#: 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 "Vidalia ไม่สามารถประยุกต์ใช้ค่าที่ตั้งใหม่ให้ Tor ได้"
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "การตั้งค่า"
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Vidalia ไม่สามารถติดต่อกับ Tor ได้. (%1)"
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "ไม่ได้เชื่อมต่อกับ socket ควบคุม"
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "กรุณาใส่รหัสผ่าน"
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+msgstr "Vidalia ได้เชื่อมต่อกับ Tor ที่ต้องการรหัสผ่าน. กรุณาใส่รหัสผ่าน"
+
+#: controlpasswordinputdialog.ui:99
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
+msgstr "จดจำรหัสผ่าน"
+
+#: controlsocket.cpp:70
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "ไม่ได้เชื่อมต่อกับ socket ควบคุม"
+
+#: controlsocket.cpp:80
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "ผิดพลาดในการส่งคำสั่งควบคุม. [%1]"
+
+#: controlsocket.cpp:117
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr "การเชื่อมต่อ Socket ถูกตัดขาดระหว่างพยายามอ่านข้อมูล."
+
+#: controlsocket.cpp:156
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "การตอบกลับการควบคุม ไม่ถูกต้อง. [%1]"
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "โปรแกรม (*.exe)"
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "เลือกที่อยู่ของโปรแกรม Tor"
+
+#: generalpage.cpp:85
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "เลือกโปรแกรมที่จะใช้งาน Tor เป็น Proxy"
+
+#: generalpage.cpp:98
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr "คุณต้องระบุชื่อของโปรแกรม Tor ให้ถูกต้อง"
+
+#: generalpage.cpp:106
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr ""
+"รายละเอียดสั่งงานของโปรแกรมที่จะใช้งาน Tor เป็น Proxy มีรูปแบบไม่ถูกต้อง"
+
+#: generalpage.ui:28
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr "เริ่มการทำงาน Vidalia ทันทีที่เปิดเครื่อง"
+
+#: generalpage.ui:121
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr "เลือก"
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "เริ่มการทำงาน Tor ด้วยเมื่อ Vidalia เริ่มทำงาน"
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "Tor"
+msgstr "Tor"
+
+#: generalpage.ui:93
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr "โปรแกรมที่จะใช้งาน Tor เป็น Proxy(ไม่ต้องใส่ก็ได้)"
+
+#: generalpage.ui:99
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "เริ่มโปรแกรมที่จะใช้งาน Tor เป็น Proxy หลัง Tor ทำงานได้แล้ว"
+
+#: generalpage.ui:135
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "รายละเอียดสั่งงานของโปรแกรมที่จะใช้งาน Tor เป็น Proxy:"
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr "รับ:"
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+msgid "Sent: "
+msgstr "ส่ง:"
+
+#: graphframe.cpp:259
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr "%1 KB"
+
+#: graphframe.cpp:262
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr "%1 MB"
+
+#: graphframe.cpp:265
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr "%1 GB"
+
+#: 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 "ไฟล์ XML ที่บอก ไม่ใช่ไฟล์เนื้อหาส่วนช่วยเหลือ"
+
+#: 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 "หาพบ %1 ผลลัพธ์"
+
+#: helpbrowser.ui:33
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "ส่วนช่วยเหลือ Vidalia"
+
+#: helpbrowser.ui:484
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "ถอยหลัง"
+
+# ถอยไปหน้าที่แล้ว (Backspace)
+#: helpbrowser.ui:487
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "ถอยไปหน้าที่แล้ว (Backspace)"
+
+#: helpbrowser.ui:490
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Backspace"
+
+#: helpbrowser.ui:498
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "ไปข้างหน้า"
+
+# ไปหน้าต่อไป (Shift+Backspace)
+#: helpbrowser.ui:501
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "ไปหน้าที่เคยไปอีกครั้ง (Shift+Backspace)"
+
+#: helpbrowser.ui:504
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+#: 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 "Ctrl+H"
+
+#: 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 "ค้นหาคำ หรือ ข้อความ ในหน้าปัจจุบัน (Ctrl+F)"
+
+#: helpbrowser.ui:541
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+#: helpbrowser.ui:549
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "ปิด"
+
+#: helpbrowser.ui:552
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "ปิดส่วนช่วยเหลือ Vidalia "
+
+#: helpbrowser.ui:555
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+#: helpbrowser.ui:152
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "ค้นหา:"
+
+#: helpbrowser.ui:174
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "ค้นหาที่ผ่านมาแล้ว"
+
+#: helpbrowser.ui:187
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "ค้นหาต่อไป"
+
+#: helpbrowser.ui:221
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "แยกแยะตัวเล็กใหญ่"
+
+#: helpbrowser.ui:231
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "ตรงกันทั้งคำเท่านั้น"
+
+#: helpbrowser.ui:305
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "หัวข้อช่วยเหลือ"
+
+#: helpbrowser.ui:260
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "เนื้อหา"
+
+#: helpbrowser.ui:350
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "ค้นหา"
+
+#: helpbrowser.ui:362
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "ค้นหา:"
+
+#: helpbrowser.ui:405
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "พบเอกสารที่เกี่ยวข้อง"
+
+#: helptextbrowser.cpp:54
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file: "
+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."
+msgstr ""
+"Vidalia จะเปิดเนื้อหาบนอินเตอร์เน็ตที่คุณเลือก "
+"ด้วยโปรแกรมท่องอินเตอร์เน็ตที่คุณใช้ประจำ(default Web browser). ถ้าคุณยังไม่"
+"ได้ตั้งค่าโปรแกรมท่องอินเตอร์เน็ตที่คุณใช้ประจำให้ท่องอินเตอร์เน็ตผ่าน Tor "
+"แล้ว, การทำงานนี้จะไม่ซ่อนตัวตนให้คุณ"
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+"คุณยังต้องการให้ Vidalia เปิดเนื้อหาด้วยโปรแกรมท่องอินเตอร์เน็ตของคุณหรือไม่"
+
+#: 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 ""
+"Vidalia ไม่สามารถเปิดเนื้อหาที่คุณเืลือในโปรแกรมท่องอินเตอร์เน็ตของคุณได้. "
+"กรุณาคัดลอก URL เพื่อไปเรียกใช้งานโปรแกรมท่องอินเตอร์เน็ตด้วยตนเอง"
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr "ข้อมูลลิขสิทธิ"
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "ลิขสิทธิ"
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr "ผู้สร้าง"
+
+# แก้บัก
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "ดีบัก"
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "ข้อมูล"
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "ข้อสังเกต"
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "ข้อเตือน"
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "ผิดพลาด"
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "ไม่ทราบ"
+
+#: mainwindow.ui:233
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "เริ่ม Tor"
+
+# ออกจากโปรแกรม
+# ปิดโปรแกรม
+# จบโปรแกรม
+#: mainwindow.ui:443
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "ออก"
+
+#: mainwindow.ui:304
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "กราฟ Bandwidth"
+
+# Message Log
+# ข้อความสิ่งที่เคยทำ
+# ข้อความสิ่งที่ทำไปแล้ว
+#: 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 "Ctrl+T"
+
+#: mainwindow.cpp:438
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+#: mainwindow.cpp:439
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+#: mainwindow.cpp:440
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+#: mainwindow.cpp:441
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+#: mainwindow.cpp:442
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+#: mainwindow.cpp:443
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: 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 "ส่วนช่วยเหลือ Vidalia"
+
+#: mainwindow.cpp:527
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "ผิดพลาดในการสั่งเริ่มโปรแกรมท่องอินเตอร์เน็ต(web browser)"
+
+#: mainwindow.cpp:528
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia ไม่สามารถเริ่มโปรแกรมท่องอินเตอร์เน็ตที่ตั้งค่าไว้ได้"
+
+#: mainwindow.cpp:540
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "ผิดพลาดในการสั่งเริ่มโปรแกรมส่งข้อความ(IM)"
+
+#: mainwindow.cpp:541
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "Vidalia ไม่สามารถเริ่มโปรแกรมส่งข้อความที่ตั้งค่าไว้ได้"
+
+#: mainwindow.cpp:562
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "ผิดพลาดในการเริ่มทำงานเป็น proxy server"
+
+#: mainwindow.cpp:563
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia ไม่สามารถเริ่มทำงานเป็น proxy server ตามที่ตั้งค่าเอาไว้ได้"
+
+#: mainwindow.cpp:579
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "กำลังเชื่อมต่อกับ คลังเก็บรายชื่อ relay (relay directory)"
+
+#: 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 "กำลังดึง ใบรับรองการให้สิทธิ (authority certificates)"
+
+#: mainwindow.cpp:595
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "กำลังร้องขอ ข้อมูล relay"
+
+#: mainwindow.cpp:598
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "กำลังดึง ข้อมูล relay"
+
+#: mainwindow.cpp:1132
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "กำลังเชื่อมต่อสู่ เครือข่าย Tor"
+
+#: mainwindow.cpp:605
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "กำลังสร้างวงจรเชื่อมต่อ Tor"
+
+#: mainwindow.cpp:1297
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr "เชื่อมต่อสู่เครือข่าย Tor เรียบร้อย!"
+
+#: 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 "หาเส้นทางไปหา host ไม่พบ"
+
+#: 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 "ล้มเหลว (%1)"
+
+#: mainwindow.ui:168
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor ยังไม่ทำงาน"
+
+#: mainwindow.cpp:686
+msgctxt "MainWindow"
+msgid "Your relay is shutting down."
+"Click 'Stop' again to stop your relay now."
+msgstr "คุณกำลังรอปิดการทำงานส่วน relay. กดปุ่ม 'หยุด' อีกครั้งหากไม่ต้องการรอ."
+
+#: mainwindow.cpp:688
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "กำลังปิดการทำงาน Tor"
+
+#: mainwindow.cpp:693
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "หยุด Tor เดี๋ยวนี้"
+
+#: mainwindow.cpp:695
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr "หยุด Tor"
+
+#: mainwindow.cpp:711
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "กำลังเริ่มการทำงาน Tor"
+
+#: mainwindow.ui:75
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "กำลังเริ่มการทำงาน Tor"
+
+#: mainwindow.cpp:859
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "ผิดพลาดในการเริ่มการทำงาน Tor"
+
+#: 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 ในเครื่องของคุณ "
+"ว่าถูกต้องหรือไม่."
+
+#: mainwindow.cpp:896
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "กำลังเชื่อมต่อเข้ากับ Tor"
+
+#: mainwindow.cpp:906
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "การเชื่อมต่อผิดพลาด"
+
+#: mainwindow.cpp:938
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "กำลังทำงานเป็น relay"
+
+#: 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 ""
+"คุณกำลังทำงานเป็น relay. การจบการทำงาน relay ทันทีอาจส่งผลกระทบต่อผู้ใช้งาน "
+"Tor ผ่านเครื่องคุณได้. คุณต้องการให้เวลาซักพัก "
+"เพื่อให้ผู้ใช้งานเหล่านั้นได้หันไปใช้ relay ตัวใหม่เสียก่อน หรือไม่?"
+
+#: 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 "Vidalia ไม่สามารถหยุดการทำงานของ Tor ได้"
+
+#: 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 ""
+"Vidalia พบว่า Tor ปิดตัวเองลงอย่างไม่คาดคิด. กรุณาตรวจสอบ ข้อความสิ่งที่ทำไป "
+"เพื่อดู ข้อเตือ หรือ ข้อผิดพลาด ที่เกิดขึ้น."
+
+#: mainwindow.cpp:1055
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "กำลังขอสิทธิเข้าสู่ Tor"
+
+#: mainwindow.cpp:1075
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "ต้องการ Cookie เพื่อขอสิทธิ"
+
+#: 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 ต้องการให้ Vidalia ส่ง Cookie เพื่อขอสิทธิ, แต่ Vidalia หาไม่พบ."
+
+#: mainwindow.cpp:1080
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "คุณต้องการเลือกไฟล์ 'control_auth_cookie' ด้วยตัวเองหรือไม่?"
+
+#: mainwindow.cpp:1087
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "ที่อยู่ข้อมูล"
+
+# Cookie ควบคุม (control_auth_cookie)
+# Cookie เพื่อขอสิทธิ (control_auth_cookie)
+#: mainwindow.cpp:1089
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Cookie เพื่อขอสิทธิควบคุม (control_auth_cookie)"
+
+#: mainwindow.cpp:1141
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "ผิดพลาด ระหว่างลงทะเบียนเพื่อรับ event"
+
+#: mainwindow.cpp:1143
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr ""
+"Vidalia ไม่สามารถลงทะเบียนเพื่อรับ event บางอย่างได้. "
+"ทำให้ความสามารถหลายๆอย่างของ Vidalia อาจไม่สามารถใช้งานได้"
+
+#: 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 "Vidalia ไม่สามารถขอสิทธิเข้าถึงโปรแกรม Tor ได้. (%1)"
+
+#: mainwindow.cpp:1226
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "กรุณาตรวจสอบ การตั้งค่าการให้สิทธิ port ควบคุมของคุณ"
+
+#: mainwindow.cpp:1330
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "มีโปรแกรม Tor รุ่นใหม่กว่าที่ใช้อยู่ปัจจุบัน"
+
+#: 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 รุ่นที่ใช้อยู่ปัจจุบัน ตกรุ่น หรือ ไม่แนะนำให้ใช้แล้ว. "
+"กรุณาไปที่ website ของ Tor เพื่อดาวน์โหลด Tor รุ่นใหม่ล่าสุด"
+
+#: mainwindow.cpp:1333
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "website ของ Tor: %1"
+
+#: mainwindow.cpp:1394
+msgctxt "MainWindow"
+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 "ล้มเหลว ในการตั้งค่า Port Forwarding"
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "Vidalia ไม่สามารถ ตั้งค่า Port Forwarding โดยอัตโนมัติได้"
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "แผงควบคุม Vidalia"
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "สถานะ"
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "ปุ่มลัด Vidalia"
+
+# ตั้งค่า Relay
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "ตั้งตนเป็น Relay"
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "ตั้งตนเป็น Relay ช่วยเหลือขยายเครือข่ายให้ Tor"
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "ดูแผนที่เครือข่าย"
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "ดูแผนที่เครือข่าย Tor"
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "เปลี่ยนตัวตนใหม่"
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "จะส่งผลให้เราย้ายไปใช้ จุดออกของ Tor เครื่องใหม่ จนดูเหมือนเป็นอีกคน"
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "ดูระดับการใช้ bandwidth"
+
+#: 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 "ตั้งค่า Vidalia"
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "ดู รุ่น และ ข้อมูลลิขสิทธิ"
+
+# ออกจากโปรแกรม Vidalia
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "ปิดโปรแกรม Vidalia"
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "แสดงหน้าจอนี้เมื่อเริ่มโปรแกรม"
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "ซ่อน"
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "ซ่อนหน้าจอนี้"
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr "ล้มเหลว ในการล้างรหัสผ่านทิ้ง"
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+"Vidalia พยายามล้างรหัสผ่าน ในการควบคุม Tor ทิ้ง. "
+"แต่ไม่สามารถเริ่มการทำงานโปรแกรม Tor ใหม่ได้. กรุณาตรวจสอบแก้ไขบน Task "
+"Manager เพื่อให้มั่นใจได้ว่า Tor ตัวเดิม ไม่ได้ทำงานอยู่."
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+"ข้อความนี้จะปรากฏเมื่อมีความผิดพลาดอย่างรุนแรง และ Tor ไม่สามารถทำงานได้"
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr "ข้อความนี้จะปรากฏเมื่อมีความผิดพลาดกับ Tor "
+
+#: 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 ""
+"ข้อความนี้ไม่ปรากฏบ่อยในการทำงานปกติของ Tor และ ไม่ถือว่าเป็นข้อผิดพลาด, "
+"แต่คุณควรระวังเอาไว้."
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr "ข้อความนี้ปรากฏบ่อยๆในการทำงานปกติของ Tor"
+
+#: messagelog.cpp:136
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of "
+"interest to Tor developers."
+msgstr "ข้อความแบบรวบรัด สำหรับนักพัฒนาโปรแกรม Tor"
+
+#: messagelog.cpp:189
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "ผิดพลาด ในการตั้งค่าตัวกรอง"
+
+# register = ลงทะเบียนดัก event window?
+#: messagelog.cpp:190
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia ไม่สามารถลงทะเบียนเพื่อรับ events ของสิ่งที่ทำไปของ Tor ได้"
+
+#: 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 "Vidalia ไม่สามารถเปิดไฟล์เก็บสิ่งที่ทำไป ที่ระบุได้."
+
+#: 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 "ไฟล์อักษร (*.txt)"
+
+#: messagelog.cpp:309
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+#: messagelog.cpp:310
+msgctxt "MessageLog"
+msgid "Cannot write file %1"
+""
+"%2."
+msgstr "ไม่สามารถเขียนไฟล์ %1%2 ได้."
+
+#: 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 "ผลการค้นหาเป็น 0"
+
+# Message Log
+# ข้อความประวัติการทำงาน
+# ข้อความประวัติการทำงาน (Message Log)
+#: 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 "ล้างทิ้งข้อความสิ่งที่ทำไปทั้งหมด (Ctrl+E)"
+
+#: messagelog.ui:483
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+#: messagelog.ui:497
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "คัดลอก"
+
+#: messagelog.ui:500
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "คัดลอกข้อความที่เลือกใส่ clipboard (Ctrl+C)"
+
+#: messagelog.ui:503
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+#: 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 "Ctrl+A"
+
+#: 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 "Ctrl+T"
+
+#: messagelog.ui:567
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "ช่วยเหลือ"
+
+#: messagelog.ui:570
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "แสดงส่วนช่วยเหลือใน โปรแกรมท่องอินเตอร์เน็ต(browser)"
+
+#: messagelog.ui:573
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+#: 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 "Esc"
+
+#: messagelog.ui:598
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "ค้นหา"
+
+#: messagelog.ui:601
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "ค้นหาเนื้อความที่มีคำที่ต้องการค้นหา (Ctrl+F)"
+
+#: messagelog.ui:604
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+#: 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 "ข้อมูล"
+
+# Debug
+# แก้บัก
+#: messagelog.ui:281
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "ดีบัก"
+
+#: messagelog.ui:297
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "จำนวนข้อความสิ่งที่ทำไป"
+
+#: messagelog.ui:318
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "จำนวนข้อความที่จะแสดงบนหน้าจอแสดงข้อความสิ่งที่ทำไป "
+
+#: messagelog.ui:337
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "ข้อความ"
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "จัดเก็บข้อความสิ่งที่เพิ่งทำไปใหม่ๆเสมอ"
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "เลือก"
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr "ยินยอมให้จัดเก็บ ข้อความสิ่งที่เพิ่งทำไปใหม่ๆ ลงไฟล์โดยอัตโนมัติ"
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "จัดเก็บ ข้อความสิ่งที่เพิ่งทำไปใหม่ๆ ลงไฟล์โดยอัตโนมัติ"
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "แผนที่เครือข่าย Tor"
+
+# แสดงใหม่อีกครั้ง
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "แสดงใหม่"
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "แสดงรายชื่อ Tor relay และการเชื่อมต่อ ใหม่อีกครั้ง"
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "ช่วยเหลือ"
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "แสดงการช่วยเหลือ ส่วนแผนที่เครือข่าย Tor "
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "แสดงการช่วยเหลือ ส่วนแผนที่เครือข่าย Tor"
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "ปิด"
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "ปิดหน้าจอ แผนที่เครือข่าย Tor"
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "ขยายเข้าใกล้"
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "ขยายเข้าใกล้ แผนที่เครือข่าย Tor"
+
+#: 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 "ย่อออกห่าง แผนที่เครือข่าย Tor"
+
+#: 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 "Ctrl+Z"
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "Bridge ไม่ถูกต้อง "
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "ค่า Bridge ที่ระบุ ไม่ถูกต้อง"
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr "คัดลอก (Ctrl+C)"
+
+#: 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 หรือ ชื่อเครื่องบนอินเตอร์เน็ต และ เลข port ของ proxy "
+"เพื่อตั้งค่าให้โปรแกรม Tor ใช้งาน proxy ได้ถูกต้อง"
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+"คุณจะต้องบอกเลข port ที่ firewall ยินยอมให้คุณติดต่อภายนอกได้. ถ้ามีหลายเลข "
+"port ให้คั่นด้วย เครื่องหมายลูกน้ำ(,)"
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' ไม่ใช่หมายเลข port ที่ถูกต้อง."
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr "กรุณาเลือก ถ้าเครือข่ายของคุณต้องเชื่อมต่ออินเตอร์เน็ต ผ่าน proxy"
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "ต้องใช้ proxy ในการเชื่อมอินเตอร์เน็ต"
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr "ตั้งค่า proxy"
+
+# HTTP Proxy:
+# ระบุบ IP เครื่อง Proxy แบบ HTTP:
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "HTTP Proxy:"
+
+# Username:
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr "ชื่อผู้ใช้:"
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "ใช้ proxy นี้สำหรับการเชื่อมต่อแบบ HTTPS ด้วย"
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr "รหัสผ่าน:"
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "เลข Port:"
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr "กรุณาเลือกเพื่อใช้เฉพาะเลข port ที่ firewall ยินยอมให้ใช้"
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "Firewall ที่ฉันใช้ ยินยอมให้ติดต่อเฉพาะบางเลข port"
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "ตั้งค่า Firewall"
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "เลข Port ที่ยินยอม:"
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr "80, 443"
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+"กรุณาเลือก เพื่อเพิ่มการเข้ารหัสการร้องขอเข้าสู่เครือข่าย Tor, โดยจะระุบุเลข "
+"IP และ Port ของ Bridge ด้วยก็ได้"
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "ผู้ให้บริการอินเตอร์เน็ตของฉัน ปิดกั้นการเข้าถึงเครือข่าย Tor"
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+"ตั้งค่า Bridge (เครื่องที่จะส่งผ่านข้อมูลในการเข้าถึงเครือข่าย Tor "
+"ให้กับเรา)"
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+"Tor รุ่นที่ใช้อยู่ไม่สนับสนุนการขอใช้งาน bridge.<br> "
+"ทำได้เพียงเข้ารหัสการเชื่อมต่อกับ คลังรายชื่อ(Directory)."
+
+#: networkpage.ui:295
+msgctxt "NetworkPage"
+msgid "Add a Bridge:"
+msgstr "ใส่ IP ของ Bridge:"
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "<a href=\"bridges.finding\">จะหา bridge มาใช้ได้อย่างไร?</a>"
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr "ลบ bridge ที่เลือก ออกจากรายการ"
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr "คัดลอก bridge ที่เลือก ใส่ clipboard"
+
+#: policy.cpp:167
+msgctxt "Policy"
+msgid "accept"
+msgstr "ยอมรับ"
+
+#: policy.cpp:167
+msgctxt "Policy"
+msgid "reject"
+msgstr "ปฏิิเสธ"
+
+#: routerdescriptor.cpp:76
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Online"
+
+# Hibernating
+# ปิดชั่วคราว
+#: routerdescriptor.cpp:78
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "กำลังจำศีล"
+
+#: routerdescriptor.cpp:80
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Offline"
+
+#: routerdescriptorview.cpp:139
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "สถานที่อยู่:"
+
+#: routerdescriptorview.cpp:143
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "หมายเลข IP:"
+
+# ชนิดของ OS:
+#: routerdescriptorview.cpp:144
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "ทำงานบน:"
+
+#: routerdescriptorview.cpp:148
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Bandwidth:"
+
+# Uptime:
+# เวลาที่เครื่องเปิดให้ใช้งาน:
+#: routerdescriptorview.cpp:150
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "เวลาทำการ:"
+
+#: routerdescriptorview.cpp:156
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "แก้ไขครั้งล่าสุด:"
+
+#: routerdescriptorview.cpp:100
+msgctxt "RouterDescriptorView"
+msgid "%1 days "
+msgstr "%1 วัน"
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr "%1 ชั่วโมง"
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr "%1 นาที"
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr "%1 วินาที"
+
+#: routerdescriptorview.cpp:48
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "คัดลอก"
+
+#: routerlistitem.cpp:67
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Offline"
+
+# Hibernating
+#: routerlistitem.cpp:71
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "อยู่ในภาวะจำศีล"
+
+#: routerlistitem.cpp:83
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+#: routerlistwidget.cpp:49
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Relay"
+
+#: routerlistwidget.cpp:74
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "แสดงที่อยู่ของ Relay"
+
+#: routerlistwidget.cpp:220
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "มี %1 relay กำลังออนไลน์"
+
+# Copy
+#: 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 ""
+"ไม่สนับสนุน การทำงานแบบ Bridge "
+"(ส่งผ่านข้อมูลที่จำเป็นในการเชื่อมต่อเครือข่าย Tor ให้ผู้อื่น)"
+
+#: 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 ให้เป็น bridge relay "
+"(ช่วยส่งผ่านข้อมูลที่จำเป็นในการเชื่อมต่อเครือข่าย Tor "
+"ให้กับผู้ใช้งานที่ถูกปิดกั้นการเข้าถึงเครือข่าย Tor โดยตรง) แต่ Tor "
+"รุ่นที่คุณใช้อยู่ไม่สนับสนุนการทำงานนี้"
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "กรุณาติดตั้ง Tor รุ่นที่ใหม่กว่า หรือ ตั้งค่าให้เป็น Tor relay แบบปกติ"
+
+#: serverpage.cpp:199
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "เครื่องของคุณ ไม่ได้ทำงานเป็น bridge relay"
+
+#: serverpage.cpp:263
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr ""
+"คุณต้องระบุชื่อเรียกของ relay ที่จะทำงานบนเครื่องของคุณ และเลข port ที่จะใช้"
+
+#: 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 "เป็น Tor Relay (ช่วยส่งผ่านข้อมูลต่างๆให้เครือข่าย Tor ด้วย)"
+
+#: serverpage.ui:39
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
+msgstr ""
+"เป็น Bridge Relay (ช่วยส่งผ่านเฉพาะข้อมูลที่จำเป็นในการเชื่อมต่อเครือข่าย "
+"Tor ให้กับผู้ใช้งานที่ถูกปิดกั้นการเข้าถึงเครือข่าย Tor โดยตรง ด้วย, ต้องการ "
+"Tor รุ่น 0.2.0.8-alpha หรือใหม่กว่า)"
+
+#: serverpage.ui:91
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "เลข Port Relay:"
+
+#: serverpage.ui:110
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "ยอมให้เก็บสำเนา คลังรายชื่อของ relay (relay directory) ไว้ในเครื่องด้วย"
+
+#: serverpage.ui:113
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory "
+msgstr "สำเนาคลังรายชื่อ Relay ด้วย"
+
+#: serverpage.ui:139
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "พยายามสั่งตั้งค่า port forwarding โดยอัตโนมัติ"
+
+#: serverpage.ui:154
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "ทดสอบ"
+
+#: serverpage.ui:164
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "แสดงหน้าช่วยเหลือ หัวข้อ port forwarding"
+
+#: 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 ""
+"Email ที่ติดต่อได้ทันที ถ้าพบว่า relay คุณมีปัญหา. คุณอาจใส่รหัส PGP หรือ "
+"GPG ไว้ด้วยก็ได้."
+
+#: serverpage.ui:234
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "เลข Port คลังรายชื่อ:"
+
+#: serverpage.ui:267
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "เลข Port คลังรายชื่อ"
+
+#: serverpage.ui:279
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "E-mail ในการติดต่อคุณ"
+
+#: serverpage.ui:337
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "ชื่อ relay ที่จะตั้ง"
+
+#: serverpage.ui:370
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr ""
+"เลข port ที่จะให้ relay ทำงานส่งผ่านข้อมูลระหว่างผู้ใช้คนอื่นๆ และ relay "
+"เครื่องอื่นๆ"
+
+#: 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."
+msgstr ""
+"สำหรับการเชื่อมต่ออินเตอร์เน็ตที่ รับข้อมูลได้เร็วแต่ส่งข้อมูลได้ช้า "
+"กรุณาเลือกตามความเร็วในการส่งข้อมูล"
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "Cable/DSL 256 Kbps"
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "Cable/DSL 512 Kbps"
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "Cable/DSL 768 Kbps"
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/Cable/DSL 1.5 Mbps"
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 1.5 Mbps"
+
+#: 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 "แสดงส่วนช่วยเหลือ หัวข้อ การจำกัด bandwidth"
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "ระดับเฉลี่ย"
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "ระดับ bandwidth เฉลี่ยระยะยาว"
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "ระดับสูงสุด"
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "จำกัดระดับ bandwidth สูงสุด"
+
+#: 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 ""
+"ระดับ bandwidth สูงสุดของคุณ จะต้องมากกว่า หรือ เท่ากับ ระดับ bandwidth "
+"เฉลี่ย, แต่ไม่น้อยกว่า 20 KB ต่อวินาที."
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "จำกัด Bandwidth"
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "เลข Port 6660 - 6669 และ 6697"
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "บริการพิมพ์พูดคุย (IRC)"
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "เลข Port 110, 143, 993 และ 995"
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "บริการรับส่ง E-Mail (POP, IMAP)"
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "เปิดเลข port ที่ไม่ได้ระบุในตัวเลือกอื่นทั้งหมด"
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "บริการอื่นๆ"
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "เลข Port 706, 1863, 5050, 5190, 5222, 5223, 8300 และ 8888"
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "บริการรับส่งข้อความทันใจ(IM)"
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "เลข Port 443"
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "บริการท่องอินเตอร์เน็ตแบบเข้ารหัส(SSL)"
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "เลข Port 80"
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "บริการท่องอินเตอร์เน็ตแบบปกติ"
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "แสดงส่วนช่วยเหลือ หัวข้อ การตั้งนโยบายจุดออก ของ Tor"
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr ""
+"ประเภทบริการที่คุณจะยินยอมให้ ผู้ใช้งาน Tor คนอื่นๆ ใช้งานผ่านเครื่องคุณ"
+
+#: 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 มีการปิดกั้นการทำงานของบางโปรแกรมที่เกี่ยวกับการส่ง E-mail "
+"และการส่งไฟล์ เพื่อลดปัญหาการใช้ระบบ Tor เป็นทางผ่านในการ ส่งเมล์ขยะ(spam) "
+"และ รบกวนผู้อื่น(abuse)"
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "ตั้งนโยบาย จุดออก ของ Tor"
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr "ให้ผู้อื่นเข้าถึง Bridge บนเครื่องคุณโดยส่งต่อข้อความบรรทัดนี้ไปให้"
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+"นี่เป็นรหัสระบุถึงเครื่องของคุณที่ทำงานเป็น Bridge "
+"ซึ่งคุณสามารถส่งให้ผู้อื่นได้"
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr "คัดลอก รหัสระบุถึงเครื่องของคุณที่ทำงานเป็น Bridge ใส่ clipboard"
+
+#: 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."
+msgstr ""
+"กรุณาตั้งค่า ระบุที่จัดเก็บรายละเอียดการให้บริการ และระบุเลข port "
+"เสมือน(virtual port) อย่างน้อยหนึ่ง port. ลบสิ่งที่ไม่เกี่ยวข้องออกให้หมด"
+
+#: 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 "เลข port เสมือน (Virtual Port) จะต้องเป็นเลข 1 ถึง 65535 เท่านั้น."
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+"เป้าหมายในการส่งต่อการทำงาน จะต้องอยู่ในรูป address:port, address หรือ port."
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr "ที่จัดเก็บนี้มีบริการอื่นใช้อยู่แล้ว"
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "แบบฟอร์ม"
+
+# บริการแบบซ่อนตัวตน จะให้บริการผ่านทางระบบ ผู้ใช้บริการแบบซ่อนตัวตนจะรู้ที่อยู่เพียง ที่อยู่บนระบบ Tor
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr "การให้บริการแบบซ่อนตัวตน"
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "ที่อยู่บนระบบ Tor"
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "เลข Port เสมือน"
+
+#: 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 "คัดลอก ที่อยู่บนระบบ Tor ของบริการที่เลือก ใส่ clipboard"
+
+#: 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 "สร้างโดย Tor"
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr "สร้างใหม่"
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "หาเลข IP"
+
+#: 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 "ล้มเหลวในการหยุดการทำงาน %1. [%2]"
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "ยังไม่ได้ติดตั้งบริการ Tor"
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "ไม่สามารถเริ่มบริการ Tor"
+
+# Failed to hash the control password.
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "ล้มเหลวในการหาค่า hash ของ รหัสผ่านเพื่อควบคุม"
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "สำเร็จ"
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "ไม่พบเครื่องที่มีการทำงานแบบ UPnP"
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "ไม่พบเครื่องประตูทางผ่านสู่อินเตอร์เน็ตที่ทำงานแบบ UPnP"
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "ล้มเหลว ในการเริ่มต้นทำงานของ Winsock"
+
+# port mapping = การส่งต่อการทำงานของเลข port
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "ล้มเหลวในการเพิ่ม port mapping"
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "ล้มเหลวในการตรวจ port mapping"
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "ล้มเหลวในการลบ port mapping"
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "ข้อผิดพลาดที่ไม่รู้จัก"
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "ค้นพบเครื่องที่มีการทำงานแบบ UPnP"
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "กำลังแก้ไข port mapping สำหรับการเป็น คลังรายชื่อ"
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "กำลังแก้ไข port mapping สำหรับการเป็น relay"
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "การทดสอบ สำเร็จเสร็จสิ้น!"
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "กำลังทดสอบ การสนับสนุนการทำงานแบบ UPnP"
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr "กำลังทดสอบ การสนับสนุนการทำงานแบบ Universal Plug & Play"
+
+#: 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 "มี Vidalia กำลังทำงานอยู่แล้ว"
+
+#: 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 กำลังทำงานอยู่แล้ว. ถ้าไม่มี Vidalia ทำงานอยู่จริงๆ, "
+"คุณสามารถเลือกไปต่อได้. คุณต้องการไปต่อเพื่อเริ่มการทำงาน Vidalia หรือไม่"
+
+# ออกจากโปรแกรม?
+#: 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 ที่เก็บไว้ทั้งหมด"
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "ตั้งที่จัดเก็บข้อมูลของ Vidalia "
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "ตั้งชื่อและที่จัดเก็บ ไฟล์ pid ของ Vidalia"
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "ตั้งชื่อและที่จัดเก็บไฟล์ ข้อความสิ่งที่ทำไป(log) ของ Vidalia"
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "ตั้งระดับความรวบรัดของ ข้อความสิ่งที่ทำไป ของ Vidalia"
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "ตั้งสไตล์การแสดงผลของ Vidalia"
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "ตั้งการแสดงผลภาษาของ Vidalia"
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "ข้อมูลการใช้งาน Vidalia"
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr "รหัสภาษาที่ระบุ ไม่ถูกต้อง"
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr "สไตล์หน้าจอ(GUI)ที่ระบุ ไม่ถูกต้อง"
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr "ระดับของสิ่งที่ทำไป ที่ระบุ ไม่ถูกต้อง"
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "ไม่สามารถเปิดไฟล์เก็บสิ่งที่ทำไป '%1': %2"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/tr/qt_tr.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/tr/qt_tr.po
new file mode 100644
index 0000000..e0bc6a4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/tr/qt_tr.po
@@ -0,0 +1,438 @@
+msgid ""
+msgstr ""
+"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-05-12 04:19-0600\n"
+"Last-Translator: yunus kaba <yunuskaba 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"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "Etkinleştir"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "Yürütülebilir '%1' ihtiyaç duyuyor Qt %2, bulundu Qt %3."
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "Uyumsuz Qt kütüphane hatası"
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "QT_LAYOUT_DIRECTION"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "Ana pencereyi gösterir"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "Tamam"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "Kaydet"
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "Aç"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "İptal"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "Kapat"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "Uygula"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "Sıfırla"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "Yardım"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "Kaydetme"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "Kaydetme"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "Evet"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "Tümüne evet"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "Hayır"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "Tümüne hayır"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "Hepsini kaydet"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "Durdur"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "Yeniden Dene"
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "Yoksay"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "Varsayılanı ayarla"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "Kaydetmeden kapat"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "Tamam"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "İsim"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "Boyut"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "Tür"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "Tür"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "Son Değiştirilme Tarihi"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "Tüm Dosyalar"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "Klasörler"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "Aç"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "Kaydet"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "Aç"
+
+#: qfiledialog.cpp:1670
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr "Belirtilen dosya zaten var. Değiştirmek ister misiniz?"
+
+#: qfiledialog.cpp:1690
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr "Dosya bulunamadı. Lütfen dosya adından emin olup tekrar deneyin."
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "Bilgisayarım"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "Yeniden adlandır"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "Sil"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "Gizli dosyaları göster"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "Geri"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "Ana Dizin"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "Listele"
+
+# Normally it's "ayrıntılı görünüm" but windows translates it in this way.
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "Ayrıntılar"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "Dosya türü"
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "Dizin"
+
+#: qfiledialog.cpp:2476
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr "Klasör bulunamadı. Lütfen Klasör adından emin olarak tekrar deneyiniz."
+
+#: qfiledialog.cpp:2281
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr "salt okunur. Yine de silmek ister misiniz?"
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "Silmek istediğinizden emin misiniz?"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "Klasör silinemiyor."
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "Tüm dosyalar"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "Farklı Kaydet"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "Sürücü"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "Dosya"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "Bilinmiyor"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "Klasör bul"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "Göster"
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "İleri"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "Yeni klasör"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "Yeni klasör"
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "seç"
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "kaldır"
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "Dosya &isim"
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "Gözat:"
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "Yeni klasör yarat"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "Invalid filename"
+msgstr "Geçersiz dosya adı"
+
+#: 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 ""
+"\"%1\" ismi kullanılarmıyor. Lütfen başka bir ismi biraz daha karakterle ve "
+"yazım işareti kullanmadan deneyiniz."
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr "İsim"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "Boyut"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "Tür"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "Tür"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "Son Değiştirilme Tarihi"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "Bilgisayarım"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "Bilgisayar"
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr "TB"
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr "GB"
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr "MB"
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr "KB"
+
+#: qfilesystemmodel.cpp:684
+#, fuzzy
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr "%1 bayt"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/tr/vidalia_tr.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/tr/vidalia_tr.po
new file mode 100644
index 0000000..c4a1fd3
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/tr/vidalia_tr.po
@@ -0,0 +1,3307 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2010-05-13 01:40-0600\n"
+"Last-Translator: yunus kaba <yunuskaba 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"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Hakkında"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "Lisans"
+
+msgctxt "AboutDialog"
+msgid "Vidalia 0.2.0"
+msgstr "Vidalia"
+
+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 "AboutDialog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Tor"
+
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "Qt"
+
+msgctxt "AboutDialog"
+msgid "version"
+msgstr "Sürüm"
+
+msgctxt "AdvancedPage"
+msgid "'%1' is not a valid IP address."
+msgstr "'%1' geçerli bir IP adresi değil."
+
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "Şifre ile doğralamayı seçtiniz ama şifre girmediniz."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Yapılandırma Dosyası Seçin"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Dosya bulunamadı"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 bulunamadı.Yeniden oluşturmak istermisin?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Dosya Oluşturulamadı"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "%1 [%2] Oluşturulamadı"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Tor verileri için klasör seçiniz"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Hizmet kaldırılamadı"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "Hizmet yüklenemedi"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "Vidalia, Hizmeti kuramadı."
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Kontrol Portu"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "Kimik Doğrulama:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Adres:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "Hiçbiri"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Çerez"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Şifre"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "Rastgele Oluştur"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Yapılandırma Dosyası"
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "Tor'u, belirtilen yapılandırma dosyası (torrc) ile çalıştır"
+
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "Yapılandırma dosyasının için klasör seç"
+
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Gezgin"
+
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr "Kayıt Klasörü"
+
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr "Tora ait verileri, aşağıdaki klasörde depola"
+
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr "Tor için kullanılacak kayıt klasörünü seç"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr "Vidali hizmeti silemiyor.Kendiniz silmeyi deneyebilirsiniz."
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Dil"
+
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Kullanmak istediğiniz dili seçin"
+
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Stil"
+
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Vidalia için arayüz seç"
+
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr "Vidalia seçmiş olduğunuz dili yükleyemiyor."
+
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr "Beri:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Ayarlar gizle"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Ayarları göster"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Tor Bant kullanımı"
+
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "Sıfırla"
+
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Alınan Veri"
+
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Gönderilen Veri"
+
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Her zaman üstte"
+
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Stil"
+
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Bant grafiğinin saydamlığını değiştir"
+
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% Saydam"
+
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Kaydet"
+
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "İptal"
+
+msgctxt "BridgeDownloader"
+msgid "Starting HTTPS bridge request..."
+msgstr "HTTPS isteğini başlatıyor..."
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr "Bağlanıyor %1:%2..."
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr "HTTPS başlatma isteğini gönderiyor..."
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr "Köprü listesini indiriyor..."
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr "İndiriyor"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr "Köprüleri inderemiyor: %1"
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr "İsteğinizi tekrar deniyor..."
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr "Ülke"
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr "# Kullanıclar"
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr "Belirlenen ülkelerden sizi kullanan kullanıcılar %1"
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr "Köprü Kullanımı"
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr "Kullanıcı"
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "Yeni"
+
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Aç"
+
+msgctxt "Circuit"
+msgid "Building"
+msgstr "Yapılıyor"
+
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Hata"
+
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Kapandı"
+
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Bilinmeyen"
+
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Klasör yolu boş>"
+
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Bağlantı"
+
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "Durum"
+
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Yakınlaş"
+
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "Bağlantıyı kes(Del)"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Yayını kapat(Del)"
+
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "Genel"
+
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Ağ"
+
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr "Paylaşım"
+
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "Hizmetler"
+
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Görünüm"
+
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Gelişmiş"
+
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Yardım"
+
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Ayarlar kaydedilemedi"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr "Vidali %1 ayarlarınızı kaydedemiyor."
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Ayarları uygulayamadı"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia %1 ayarlarınızı Tor'a uygulayamıyor."
+
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Ayarlar"
+
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Vidalia Tor'a bağlanamadı. (%1)"
+
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "Kontrol soketi bağlı değil."
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "Şifre gerekli"
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
+msgstr "Şifremi hatırla"
+
+msgctxt "ControlPasswordInputDialog"
+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 "Kontrol soketi bağlı değil."
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Kontrol komutu gönderirken hata oluştu.[%1]"
+
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr "Veri okurken soket bağlantısı kootu."
+
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Hatalı yanıtı.[%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 "Hakkında"
+
+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 "İptal"
+
+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 "Genel"
+
+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 "Lisans"
+
+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 "İleri"
+
+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 "Port:"
+
+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 "Genel"
+
+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 "Paylaşım"
+
+msgctxt "CountryInfo"
+msgid "Sri Lanka"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Sudan"
+msgstr ""
+
+msgctxt "CountryInfo"
+msgid "Suriname"
+msgstr "Kullanıcı adı"
+
+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 "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 "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Çalıştırılabilir(*.exe)"
+
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Tor için klasör seç"
+
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "Proxy seçin"
+
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr "Tor için bir isim belirlemek zorundasınız."
+
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr "Proxy'iniz formata uygun değil."
+
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+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 "Proxy Uygulaması(isteğe bağlı)"
+
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "Tor başladığında proxyide başlat"
+
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Proxy parametleri:"
+
+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 "Desteklenen XML dosyayı içerik dökümanı olmak için uygun değil."
+
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "Arama dosyanın sonuna ulaştı"
+
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "Arama dosyanın başına geldi"
+
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "Aranan kelime bulunamadı"
+
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "%1 sonuç bulundu"
+
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Vidalia Yardım"
+
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Geri"
+
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Bir önceki sayafaya git(Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "İleri"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Bir sonraki sayafa git (Shift+Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Ana Sayfa"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Ana Sayfaya git(Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Bul"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "Şuanki sayfada ara(Ctrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Kapat"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Yardımı Kapat"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Bul:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Bir öncekini bul"
+
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Sonrakini bul"
+
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "büyük-küçük harfe duyarlı"
+
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Tam szöcükler"
+
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Yardım Başlıkları"
+
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "İçerik"
+
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Arama"
+
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Arama:"
+
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Bulunan dökümanlar"
+
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents:"
+msgstr ""
+
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr "Başka bir link açma"
+
+msgctxt "HelpTextBrowser"
+msgid "Vidalia can open the link you selected in your default Web browser. If your browser is not currently configured to use Tor then the request will not be anonymous."
+msgstr "Vidali seçmiş olduğunuz adresi web gezgininizde açabiliyor. Eğer web gezgininiz henüz ayarlanmamıışsa isteğiniz Tor üzerinden gerçekleşmeyecektir."
+
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr "Vidalianın web gezgininde açmasını istermisin?"
+
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr "Link açılamıyor"
+
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr "Vidalia seçtiğiniz bağlantıyı web gezgininizde açamıyor. Adresi web gezgininize kopyalayıp devam edebilirsiniz."
+
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file:"
+msgstr ""
+
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr "Lisans bilgisi"
+
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "Lisans"
+
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr "Katkıda bulunanlar"
+
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "Debug"
+
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Bilgi"
+
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "Uyarı"
+
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Dikkat"
+
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Hata"
+
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Bilinmeyen"
+
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "Tor'u başlat"
+
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Çıkış"
+
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Band Grafiği"
+
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Mesaj Günlükleri"
+
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Ağ haritası"
+
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr "Kontol paneli"
+
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Ayarlar"
+
+msgctxt "MainWindow"
+msgid "About"
+msgstr "Hakkında"
+
+msgctxt "MainWindow"
+msgid "Help"
+msgstr "Yardım"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "View"
+msgstr "Görünüm"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Yardım"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "Web gezgini başlatırlırken hata oluştu"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia web gezginini başlatamıyor"
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+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 kullanıcısını başlatamıyor"
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Proxy sunucusu başlatmada hata"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Proxy sunucusu başlatılamıyor"
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Aktarım klasörüne bağlanıyor"
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "Şifrelenmiş dizin bağlantısı kuruluyor"
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "Ağ durumu güncelliyor"
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "Ağ yükleniyor"
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "Doğrulama sertifikalarını yüklüyor"
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "Aktarım bilgisi isteniyor"
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "Aktarım bilgisi yükleniyor"
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "Tor ağına bağlanıyor"
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "Tor ağına bağlantı sağlanıyor"
+
+msgctxt "MainWindow"
+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"
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr "Tamam"
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "Bağlantı red edildi"
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "Zaman aşımı"
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "Okuma/yazma hatası"
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "Yönlendirilecek sunucu yok"
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "Yetersiz kaynak"
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "Bilinmeyen"
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor çalışmıyor"
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "Tor kapatılıyor"
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Hemen Durdur"
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr "Durdur"
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Tor'u başlatıyor"
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "Tor başlıyor"
+
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "Tor'u başlatırken hata oluştu"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgstr ""
+"Vidalia Tor'u başlatamıyor.Ayarlardan belirlediğiniz konumu kontrol ediniz."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "Tor'a bağlanıyor"
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "Bağlantı hatası"
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "Aktarım aktif"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "Programı kapatmada hata"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "Vidalia tor'u sonlandıramıyor."
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "Beklenmedik hata"
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Kimlik doğrulaması gerçekleşiyor"
+
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "Çerez doğrulaması gerekli"
+
+msgctxt "MainWindow"
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgstr "Tor yazılımı kimlik doprulama çerezlerinin içerini vidaliaya göndermesi gerekiyor, ama çerez bulamıyor."
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "Kenidiniz bir 'control_auth_cookie' belirlemek istermisiniz?"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Kayıt klasörü"
+
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Kontrol çerezleri (control_auth_cookie)"
+
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "Olayları kaydederken hata oluştu"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr ""
+"Vidalia bazı olayarın kaydını gerçekleştiremedi.Şu anda bir çok vidalia "
+"fonksiyonu çalışmıyor olabilir."
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Kimlik doğrulamada hata oluştu"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr "Tor'un doğruluğu sağlanamadı.(%1)"
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "Lütfen kimlik doğrulama portunuzu kontrol edin."
+
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "Tor'un yeni güncelleştirmesi var"
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended. Please visit the Tor website to download the latest version."
+msgstr ""
+"Tor şu anda kullanmış olduğunuz sürümü tavsiye etmiyor.Lütfen Tor'un "
+"websitesini ziyaret edip en son sürümünü indirin."
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Tor websitesi: %1"
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "Tüm alt bağlantılarınız önceki bağlantılarınızdan farklı gözükecektir."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "Yeni kimlik alırken hata oluştu"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "Port yanıtlarken hata oluştu"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "Vidalia port yanıtlama ayarlarını uygulayamıyor."
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Kontrol Paneli"
+
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "Durum"
+
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "Kısayollar"
+
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Bağlantı ayarları"
+
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr "Bir kur ve ağın büyümesini sağla"
+
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Ağı göster"
+
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Tor Ağını haritada göster"
+
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Kimliği Yenile"
+
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr "Yeni bağlantılar oluşturur"
+
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Band kullanımı"
+
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Günlük kayıtları"
+
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Yardım"
+
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Ayarlar"
+
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Sürüm ve Lisans"
+
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Çıkış"
+
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Başlangıçta göster"
+
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "Gizle"
+
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Pencereyi gizle"
+
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr "Şifre sıfırlanamadı"
+
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr "Vidilia kontrol şifresinizi sıfırlamayı denedi, ama başaramadı.Lütfen programı yeniden başlatın.Ayrıca görev yöneticinizden başka tor programının çalışmadığından emin olun."
+
+msgctxt "MainWindow"
+msgid "The currently installed version of Tor is out of date or no longer recommended."
+msgstr ""
+"Tor şu anda kullanmış olduğunuz versiyonu tavsyie etmiyor.Lütfen Tor'un "
+"websitesini ziyaret edip en son sürümünü indirin."
+
+msgctxt "MainWindow"
+msgid "Would you like to check if a newer package is available for installation?"
+msgstr "Yeni bir sürüm olup olmadığını kontrol etmek ister misin?"
+
+msgctxt "MainWindow"
+msgid "Potentially Unsafe Connection"
+msgstr "Güvenli olmayan bağlantı"
+
+msgctxt "MainWindow"
+msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Update Failed"
+msgstr "Güncellenemedi"
+
+msgctxt "MainWindow"
+msgid "Your software is up to date"
+msgstr "Yazılımınız güncellendi"
+
+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 "Vidalia tor yazlımını sonlandıramıyor."
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+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 ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr "Dosya"
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "Hakkında"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "Ana Sayfa"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Filtreler ayarlanırken hata oluştu"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia Tor olaylarını günkülerine kaydedemiyor."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "Günlük dosyası açılırken hata oluştu"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidali belirtilen günlük dosyasını açamıyor."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Günlük dosyasının adı gerekli"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "Günlük dosyasını kaydetmek için bir isim girmelisiniz."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Günlük dosyası seç"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Günlük dosyalarını kaydet"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Metin belgesi (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Günlük dosyalarında ara"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Bul:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Bulunamadı"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "Arama 0 eşleşme buldu."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Mesaj Günlükleri"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Mesaj Filtreleri..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Mesaj filtresi ayarla"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Geçmiş Boyutu..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Maximum gösterilecek mesaj sayısını ayarla"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Temizle"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Günlüklerdeki tüm mesajları temizle(Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Kopyala"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Seçilen mesajı panoya kopyala(Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Tümünü seç"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Tüm mesajları seç(Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Tümünü kaydet"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Tüm mesajları dosyaya kaydet"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Seçileni kaydet"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Seçilen mesajı dosyaya kaydet"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Ayarlar"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Günlük mesajlar ayarlarını düzenle"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Yardım"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "Yardım"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Kapat"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Mesaj günlüklerini kaydet"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Bul"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Arananan kelimeyi tüm mesajlarda ara(Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Zaman"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Tür"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Mesaj"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Şu anki mesajı günlüğe kaydet"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Ayarları kaydet"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Yapılan ayarları iptal et"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "İptal"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Mesaj filtresi"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Hata"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Dikkat"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Uyarı"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Bilgi"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Hata ayıklama"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "Günlük geçmişi"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Günlük dosyalarında görüntülenen mesaj sayısı"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "Mesajlar"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Yeni günlük mesajlarını herzaman kaydet"
+
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "Gezgin"
+
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr "Yeni günlük mesajlarını otomatik olarak kaydet"
+
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "Yeni günlük mesajlarını otomatik kaydet"
+
+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."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor Ağ haritası"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Yenile"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "Tor bağlantı ve aktarımlarını yenile"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Yardım"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Yardım"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Yardım"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Kapat"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Ağ haritasını kapat"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Yakınlaş"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Yakınlaş"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Uzaklaş"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Uzaklaş"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Pencereye sığdır"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Şu anki pencereye sığdır"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "Dosya bulunamadı"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "Bilinmeyen"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr "Tam ekran"
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr "Tam ekran"
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "Hatalı köprü"
+
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr "Belirlediğiniz köprü tanımı geçerli değil."
+
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr "Kopyala(Ctrl+C)"
+
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr "İnternet bağlanırken proxy kullanmak için IP adresi veya Sunucu ve port numarası girmeniz gerekiyor."
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "Firewall'un Tor ağına bağlanabilmek için birden fazla port belirlemeniz gerekiyor."
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' geçerli bir port numarası değil."
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr "Eğer internete bağlanmak için bir proxy sunucusuna ihtiyaç duyuyorsa bunu kontol et."
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "Internet erişimimde proxy kullanıyorum"
+
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr "Proxy ayarları"
+
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "HTTP Proxy:"
+
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr "Kullanıcı adı:"
+
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "Bu proxy HTTP içinde kullan"
+
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr "Şifre:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "Port:"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr "Güvenlik duvarı sadece izin verilen portlar üzerinden aktarım izni vermesini kontrol et"
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "Firewall sadece belli portlara izin versin"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "Firewall Ayarları"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "İzin verilen portlar:"
+
+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 ""
+"Tor ağına bağlanmak için köprü kullan yada şifrelenmiş klasördeki istekleri "
+"kontrol et"
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "İnternet sağlayıcım Tor ağını blokluyor"
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr "Köprü ayarları"
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr "Şu anda kullanmış olduğunuz tor sürümü köprü özelliğini desteklemiyor.<br>Dizin bağlantılarınız hala şifreli haldedir."
+
+msgctxt "NetworkPage"
+msgid "Add a Bridge:"
+msgstr "Köprü ekle:"
+
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Nasıl bir köprü bulabilirim?</a>"
+
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr "Seçilen köprüyü listeden sil"
+
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr "Seçilen köprüyü panoya kopyala"
+
+msgctxt "NetworkPage"
+msgid "Find Bridges Now"
+msgstr "Köprü bul"
+
+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 "Policy"
+msgid "accept"
+msgstr "Kabul et"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "Reddet"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Çevrimiçi"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Hazırda Bekliyor"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "Çevrimdışı"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Konum:"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "IP Adresi:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Platform:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Bandgenişliği:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Hizmetsüresi:"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Son güncelleme:"
+
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Kopyala"
+
+msgctxt "RouterInfoDialog"
+msgid "Hibernating"
+msgstr "Hazırda Bekliyor"
+
+msgctxt "RouterInfoDialog"
+msgid "Online"
+msgstr "Çevrimiçi"
+
+msgctxt "RouterInfoDialog"
+msgid "Offline"
+msgstr "Çevrimdışı"
+
+msgctxt "RouterInfoDialog"
+msgid "Unknown"
+msgstr "Bilinmeyen"
+
+msgctxt "RouterInfoDialog"
+msgid "Relay Details"
+msgstr ""
+
+msgctxt "RouterInfoDialog"
+msgid "Summary"
+msgstr "Özet"
+
+msgctxt "RouterInfoDialog"
+msgid "Name:"
+msgstr "Takma ad:"
+
+msgctxt "RouterInfoDialog"
+msgid "Status:"
+msgstr "Durum"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "Konum:"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "IP Adresi:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "Platform:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "Bandgenişliği:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "Hizmetsüresi:"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "İletişim:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "Son güncelleme:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr "Açıklayıcı"
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Çevrimdışı"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Hazırda Bekliyor"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Bağlantı"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "Yakınlaş"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 bağlantı online"
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Kopyala"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "Kullanıcı adı"
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "Parmakizi"
+
+msgctxt "ServerPage"
+msgid "Bridge Support Unavailable"
+msgstr "Köprü desteği kullanım dışı"
+
+msgctxt "ServerPage"
+msgid "You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges."
+msgstr ""
+"Ayarlarınız Tor'u köprü gibi davranmaya zorluyor, ama şu anki sürümü "
+"köprülemeyi desteklemiyor."
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "Lütfen Tor'ukendi Tor ağınız için ayarlamak için Tor'u güncelleyin."
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "Köprünüz çalışmıyor."
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "En azından bir takma ad ve port belirmeniz gerekiyor."
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "Sadece kullanıcı olarak çalıştır"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Tor ağı için aktarım trafiği"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "Aktarım portu:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "Aktarım klasörünü etkinleştir"
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "Port yanıtlmayı otomatik olarak gerçekleştir"
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "Test"
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "Port yanıtlama başlıklarını göster"
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Yönetim portu:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Yönetici Port Numarası"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "İletişim:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "Bağlantı isminiz"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "Kendi ağınızdan diğer ağların iletişim kurabildiği port"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Takma ad:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Temel ayarlar"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Daha hızlı indirme yapmak yapmak için lütfen bağlantı tipinizi seçin."
+
+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 "Özel"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Internet bağlantısı için en sık kullanılan bağlantınızı seçin"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Bandgenişliği ortalamasıyla ilgili yardım başlıkların göster"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Ortalama oran"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Uzun aralıklı ortalama badgenişliği limiti"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Maximum ortalama"
+
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "En yüksek bandgenişliği ortalaması"
+
+msgctxt "ServerPage"
+msgid "Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s."
+msgstr "Maximum bandgenişliği oranın büyük veya eşit olmalı mevcut bandgenişlği ortlamasına. İki değerde en az 20KB/s."
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Bandgenişliği sınırı"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Portlar 6660 - 6669 ve 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Portlar 110, 143, 993 ve 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Gelen posta (POP, IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Diğer portlar tanımlanmadı"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Diğer hizmetler"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Portlar 706, 1863, 5050, 5190, 5222, 5223, 8300 ve 8888"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "Anlık mesajlaşma"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "Port 443"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "Secure Websites (SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Port 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Web Siteleri"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "İzin verilen politikalarla ilgi yardım başlıklarını göster"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr "Hangi internet kaynakları kullanıcılar tarafından sizin üzerinizden ulaşabilir?"
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr "Tor hala bazı dışarıya giden mail ve dosya paylaşım uygulamalarını varsayılan ayarlara göre spamları azaltmak için blokluyor."
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "İzin verilen protokoller"
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr "Bu satırı verenlerin kendi köprüne erişmine izin ver:"
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "Bu kimliği hem köprüne hemde ağına erişmeleri için verebilirsin"
+
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr "Köprü bağlantı kimliklerini panoya kopyala"
+
+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 "Köprü ayarları"
+
+msgctxt "ServerPage"
+msgid "Vidalia was unable to retrieve your bridge's usage history."
+msgstr "Vidali %1 ayarlarnızı kaydedemiyor."
+
+msgctxt "ServerPage"
+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 ""
+
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network"
+msgstr "Tor ağına erişirken yardımı gösterme(Tor 0.2.0.8-alpha yada daha yeni)"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr "<a href=\"bridges.finding\">Nasıl bir köprü bulabilirim?</a>"
+
+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 ""
+
+msgctxt "ServicePage"
+msgid "Error while trying to unpublish all services"
+msgstr "Türm servsileri durdururken ahta oluştu"
+
+msgctxt "ServicePage"
+msgid "Please configure at least a service directory and a virtual port for each service you want to save. Remove the other ones."
+msgstr ""
+"Lütfen sanal port kullanımı için en az biri hizmet klasörü "
+"belirleyiniz.Diğerlerini kaldırın."
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Hata"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "Lütfen bir hizmet seçin."
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "Hizmet klasörü seç"
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "Sanal porltar sadece geçerli aralıktaki portlar olabilir[1.65535]."
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "Hedef adres sadece:port,adres veya port olabilir."
+
+msgctxt "ServicePage"
+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"
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "Tor adresi"
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "Sanal port"
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "Hedef"
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "Klasör yolu"
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "Aktif"
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "Yeni hizmet ekle"
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "Seçilen hizmeti sil"
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr "Ağ hizmetinin adresini panoya kopyala"
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr "Seçili hizmet için klasör seç"
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "Geliştirildi"
+
+msgctxt "Stream"
+msgid "New"
+msgstr "Yeni"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "Çözüyor"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "Bağlanıyor"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "Açık"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Hata"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Kapatıldı"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Yeniden deniyor"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "Tekrar haritalandı"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Bilinmeyen"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "%1 işlemini durdurken hata oluştu.[%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "Tor hizmeti yüklenemedi."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "Tor hizmeti başlatılamadı."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "Kontrol şifresinin hash kodunda hata oluştu."
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "Başarılı"
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "UPnP aygıtı bulunamadı"
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "Geçerli ağ geçidi sağlayan UpnP aygıtı bulunamadı"
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "WSAStartup başarız"
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "Port haritası ekleyemiyor"
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "Port haritası alamayor"
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "Port haritalamayı kaldıramıyor"
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "Bilinmeyen hata"
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "UPnP-aktif olan aygıtları araştır"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "Port haritalama dizinini güncelliyor"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "Aktarım için port haritalama güncelleniyor"
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "Test başarıyla gerçekleşti"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "UPnP Desteği test ediliyor"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr "Tak ve çalıştır desteği test ediliyor"
+
+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 "Güncellemeleri kontrol ediyor"
+
+msgctxt "UpdateProgressDialog"
+msgid "Hide"
+msgstr "Gizle"
+
+msgctxt "UpdateProgressDialog"
+msgid "Downloading updates..."
+msgstr "Güncellemeleri indiriyor..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Installing updated software..."
+msgstr "Güncellemeleri kuruyor..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Done! Your software is now up to date."
+msgstr "Güncellendi."
+
+msgctxt "UpdateProgressDialog"
+msgid "OK"
+msgstr "Tamam"
+
+msgctxt "UpdateProgressDialog"
+msgid "Software Updates"
+msgstr "Güncellemeler"
+
+msgctxt "UpdateProgressDialog"
+msgid "Checking for updates..."
+msgstr "Güncellemeler kontrol ediyor..."
+
+msgctxt "UpdateProgressDialog"
+msgid "Cancel"
+msgstr "İptal"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Software Updates Available"
+msgstr "Tor yeni güncelleştirmesi var"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Remind Me Later"
+msgstr "Daha sonra"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Install"
+msgstr "Kur"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "The following updated software packages are ready for installation:"
+msgstr ""
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Package"
+msgstr "Paket"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr "Sürüm"
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "Tamam"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "İptal"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Evet"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Hayır"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Yardım"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Yeniden Dene"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Günlükleri göster"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Ayarları göster"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Devam"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Çık"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Gözat"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Hatalı arguman"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia zaten çalışıyor"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Kullanım ve çıkış mesajlarını görüntüle."
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "Bütün kayıtlı Vidaila ayarlarını sıfırla."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Vidalia kullanıcılarının dosyalarını için klasör ayarla."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Vidalia pidfile için konum belirle."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Vidalia günlük dosyaları için isim ve konum belirle."
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Vidalia günlük dosyalarınıın ayrıntılı şekilde tut."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Vidalia arayüzünü belirle."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Vidalianın dilini belirle."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Vidali Kullanım Bilgisi"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "Günlük dosyası açılamıyor'%1':%2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr "Yanlış dil kodu belirtildi:"
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr "Yanlış arayüz belirtildi:"
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr "Yanlış log seviyesi belirtildi:"
+
+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 ""
+"Şu anda vidalia zaten çalışıyor.Başka bir vidalia uygulaması başlatmak "
+"istediğinden emin misin?"
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr "%1 saniye"
+
+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 gün"
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr " saat"
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr "%1 dakika"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/uk/qt_uk.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/uk/qt_uk.po
new file mode 100644
index 0000000..41665da
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/uk/qt_uk.po
@@ -0,0 +1,431 @@
+msgid ""
+msgstr ""
+"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: 2009-04-12 14:14-0400\n"
+"Last-Translator: Matt Edman <edmanm at vidalia-project.net>\n"
+"Language-Team: Ukrainian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/uk/vidalia_uk.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/uk/vidalia_uk.po
new file mode 100644
index 0000000..fb8f11b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/uk/vidalia_uk.po
@@ -0,0 +1,2685 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: 2009-07-09 20:51+0000\n"
+"Last-Translator: Nestor Z. <nestor at linuxmail.org>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Про Vidalia"
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "Qt"
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Tor"
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr "Недоступний"
+
+#: aboutdialog.cpp:57
+#, fuzzy
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr "Не виконується"
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr "0.2.0"
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr "0.2.0.31-alpha-dev (r123456)"
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr "4.4.2"
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 "Ви вибрали '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 ""
+
+#: 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 "Файл налаштувань Tor"
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Завжди поверх інших вікон"
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Стиль"
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% Прозорість"
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Зберегти"
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Відмова"
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr "Новий"
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Відкрити"
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Мережа"
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "Ліцензія"
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr "Новий"
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr "Відкрити"
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Відмова"
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/vi/qt_vi.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/vi/qt_vi.po
new file mode 100644
index 0000000..73d5ce6
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/vi/qt_vi.po
@@ -0,0 +1,121 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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-04-21 15:39\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"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+msgid "Activate"
+msgstr "Kích hoạt"
+
+msgid "Executable '%1' requires Qt %2, found Qt "
+"%3."
+msgstr "Có thể thực thi '%1' yêu cầu Qt %2, Qt %3 được tìm "
+"thấy."
+
+msgid "Incompatible Qt Library Error"
+msgstr "Lỗi không Tương thích Thư viện Qt"
+
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "QT_LAYOUT_DIRECTION"
+
+msgid "Activates the program's main window"
+msgstr "Kích hoạt cửa sổ chính của chương trình"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Save"
+msgstr "Lưu"
+
+msgid "Open"
+msgstr "Mở"
+
+msgid "Cancel"
+msgstr "Hủy bỏ"
+
+msgid "Close"
+msgstr "Đóng"
+
+msgid "Apply"
+msgstr "Áp dụng"
+
+msgid "Reset"
+msgstr "Thiết đặt lại"
+
+msgid "Help"
+msgstr "Trợ giúp"
+
+msgid "Don't Save"
+msgstr "Không lưu lại"
+
+msgid "Discard"
+msgstr "Hủy bỏ"
+
+msgid "&Yes"
+msgstr "&Đồng ý"
+
+msgid "Yes to &All"
+msgstr "Đồng ý với &Toàn bộ"
+
+msgid "&No"
+msgstr "&Không"
+
+msgid "N&o to All"
+msgstr "&Không với Toàn bộ"
+
+msgid "Save All"
+msgstr "Lưu Toàn bộ"
+
+msgid "Abort"
+msgstr "Bỏ qua"
+
+msgid "Retry"
+msgstr "Thử lại"
+
+msgid "Ignore"
+msgstr "Lờ đi"
+
+msgid "Restore Defaults"
+msgstr "Khôi phục Mặc định"
+
+msgid "Close without Saving"
+msgstr "Đóng không cần lưu"
+
+msgid "&OK"
+msgstr "&OK"
+
+msgid "Name"
+msgstr "Tên"
+
+msgid "Size"
+msgstr "Kích cỡ"
+
+msgid "Kind"
+msgstr "Loại"
+
+msgid "Type"
+msgstr "Dạng"
+
+msgid "Date Modified"
+msgstr "Ngày Sửa đổi"
+
+msgid "All Files (*)"
+msgstr "Tất cả các Tệp (*)"
+
+msgid "Directories"
+msgstr "Các Thư mục"
+
+msgid "&Open"
+msgstr "&Mở"
+
+msgid "&Save"
+msgstr "&Lưu"
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/vi/vidalia_vi.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/vi/vidalia_vi.po
new file mode 100755
index 0000000..6b906fc
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/vi/vidalia_vi.po
@@ -0,0 +1,2663 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: 2010-03-16 22:08+0930\n"
+"Last-Translator: Lyndon Johnson <lyndon.johnson58 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"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "Về Vidalia"
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr "Qt"
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr "Bộ định tuyến củ hành (The onion router)"
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr "Không sẵn sàng"
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr "Không đang chạy"
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr "0.2.0"
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr "0.2.0.31-alpha-dev (r123456)"
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr "4.4.2"
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "Giấy phép"
+
+#: aboutdialog.ui:163
+msgctxt "AboutDialog"
+msgid "version"
+msgstr "phiên bản"
+
+#: advancedpage.cpp:109
+msgctxt "AdvancedPage"
+msgid "'%1' is not a valid IP address."
+msgstr "'%1' không phải là một địa chỉ IP hợp lệ."
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "Bạn đã chọn xác thực 'Mật khẩu', nhưng lại không ghi rõ mật khẩu."
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "Chọn Tập tin Cấu hình Tor"
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "Tập tin không tìm được"
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 không tồn tại. Bạn có muốn tạo nó ra không?"
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "Tạo Tập tin bị thất bại"
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "Không thể tạo %1 [%2]"
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "Chọn một Thư mục để dùng cho Dữ liệu của Tor"
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "Không thể gỡ bỏ Dịch vụ Tor"
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service.You may need to remove it manually."
+msgstr "Vidalia không thể gỡ bỏ Dịch vụ Tor. Bạn có thể cần phải tự gỡ bỏ."
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "Không thể cài đặt Dịch vụ Tor"
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "Vidalia không thể cài đặt Dịch vụ Tor."
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "Cổng Điều khiển"
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "Xác thực:"
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "Địa chỉ:"
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "Không có"
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Cookie"
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "Mật khẩu"
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "Tạo ra Ngẫu nhiên "
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Tập tin Cấu hình Tor"
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr "Bắt đầu nhu liệu Tor với tập tin cấu hình đã ghi rõ (torrc)"
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr "Chọn đường dẫn đến tập tin cấu hình của bạn"
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr "Trình duyệt"
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr "Từ điển Dữ liệu"
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr "Cất giữ dữ liệu cho nhu liệu Tor trong thư mục sau đây"
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr "Chọn thư mục dùng để cất giữ dữ liệu cho nhu liệu Tor"
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "Ngôn ngữ"
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr "Chọn lựa ngôn ngữ dùng trong Vidalia"
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr "Kiểu dáng"
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr "Chọn lựa kiểu dáng giao diện của Vidalia"
+
+#: appearancepage.cpp:67
+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."
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr "Kể từ:"
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "Ẩn những Thiết lập"
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "Hiện những Thiết lập"
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Cách dùng Tor Bandwidth"
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr "Đặt lại"
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr "Tỷ lệ Nhận "
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr "Tỷ lệ Gửi "
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr "Luôn luôn ở Trên"
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr "Kiểu dáng"
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr "Thay đổi tính minh bạch của đồ thị Bandwidth"
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr "100"
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr "% Mờ"
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr "Lưu"
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr "Thôi"
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr "Mới"
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr "Mở"
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr "Xây dựng"
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr "Thất bại"
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr "Đóng"
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr "Không biết"
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr "<Đường dẫn Rỗng>"
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr "Kết nối"
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr "Tình trạng"
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr "Tăng giảm tới Mạch"
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr "Đóng mạch (Del)"
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "Đóng Stream (Del)"
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr "Chung"
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr "Mạng lưới"
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr "Chia sẻ"
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr "Những dịch vụ"
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr "Xuất hiện"
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr "Nâng cao"
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr "Giúp đỡ"
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr "Lỗi bảo lưu thiết lập "
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr "Vidalia không thể bảo lưu %1 những thiết lập của bạn ."
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "Lỗi Thiết lập ứng dụng "
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia không thể ứng dụng %1 những thiết lập của bạn với Tor."
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr "Thiết lập"
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr "Vidalia không thể kết nối với Tor. (% 1)"
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr "Socket kiểm soát không được kết nối."
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr "Mật khẩu bắt buộc"
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+msgstr "Vidalia đã kết nối với một quá trình Tor đang chạy mà nó yêu cầu một mật khẩu. Xin vui lòng nhập mật khẩu điều khiển của bạn:"
+
+#: controlpasswordinputdialog.ui:99
+msgctxt "ControlPasswordInputDialog"
+msgid "Remember my password"
+msgstr "Ghi nhớ mật khẩu của tôi"
+
+#: controlsocket.cpp:70
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "Socket kiểm soát không được kết nối."
+
+#: controlsocket.cpp:80
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "Lỗi gửi lệnh điều khiển. [% 1]"
+
+#: controlsocket.cpp:117
+msgctxt "ControlSocket"
+msgid "Socket disconnected while attempting to read a line of data."
+msgstr "Socket ngắt kết nối khi đang thử đọc một dòng dữ liệu."
+
+#: controlsocket.cpp:156
+msgctxt "ControlSocket"
+msgid "Invalid control reply. [%1]"
+msgstr "Không hợp lệ kiểm soát sự trả lời. [% 1]"
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr "Thực thi (*. exe)"
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to Tor"
+msgstr "Chọn đường dẫn tới Tor"
+
+#: generalpage.cpp:85
+msgctxt "GeneralPage"
+msgid "Select Proxy Executable"
+msgstr "Chọn Proxy Executable"
+
+#: generalpage.cpp:98
+msgctxt "GeneralPage"
+msgid "You must specify the name of your Tor executable."
+msgstr "Bạn phải chỉ định tên của Tor thực thi của bạn."
+
+#: generalpage.cpp:106
+msgctxt "GeneralPage"
+msgid "The proxy arguments specified are not properly formatted."
+msgstr "Các đối số proxy được chỉ định không được định dạng đúng."
+
+#: generalpage.ui:28
+msgctxt "GeneralPage"
+msgid "Start Vidalia when my system starts"
+msgstr "Bắt đầu Vidalia khi hệ thống của tôi bắt đầu"
+
+#: generalpage.ui:121
+msgctxt "GeneralPage"
+msgid "Browse"
+msgstr "Trình duyệt"
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr "Bắt đầu phần mềm Tor khi bắt đầu Vidalia"
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "Tor"
+msgstr "The-onion-router"
+
+#: generalpage.ui:93
+msgctxt "GeneralPage"
+msgid "Proxy Application (optional)"
+msgstr "Proxy ứng dụng (tùy chọn)"
+
+#: generalpage.ui:99
+msgctxt "GeneralPage"
+msgid "Start a proxy application when Tor starts"
+msgstr "Bắt đầu một ứng dụng proxy khi Tor bắt đầu"
+
+#: generalpage.ui:135
+msgctxt "GeneralPage"
+msgid "Proxy Application Arguments:"
+msgstr "Các đối số Proxy ứng dụng:"
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr "Recv: "
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+msgid "Sent: "
+msgstr "Gởi:"
+
+#: graphframe.cpp:259
+msgctxt "GraphFrame"
+msgid "%1 KB"
+msgstr "%1 KB"
+
+#: graphframe.cpp:262
+msgctxt "GraphFrame"
+msgid "%1 MB"
+msgstr "%1 MB"
+
+#: graphframe.cpp:265
+msgctxt "GraphFrame"
+msgid "%1 GB"
+msgstr "%1 GB"
+
+#: helpbrowser.cpp:135
+msgctxt "HelpBrowser"
+msgid "Error Loading Help Contents: "
+msgstr "Lỗi nạp Trợ giúp Nội dung:"
+
+#: helpbrowser.cpp:147
+msgctxt "HelpBrowser"
+msgid "Supplied XML file is not a valid Contents document."
+msgstr "Tập tin XML được cung cấp không phải là một tài liệu nội dung hợp lệ."
+
+#: helpbrowser.cpp:396
+msgctxt "HelpBrowser"
+msgid "Search reached end of document"
+msgstr "Tìm kiếm đã đến cuối cùng của tài liệu"
+
+#: helpbrowser.cpp:398
+msgctxt "HelpBrowser"
+msgid "Search reached start of document"
+msgstr "Tìm kiếm đã đến bắt đầu của tài liệu"
+
+#: helpbrowser.cpp:400
+msgctxt "HelpBrowser"
+msgid "Text not found in document"
+msgstr "Văn bản không được tìm thấy trong tài liệu"
+
+#: helpbrowser.cpp:445
+msgctxt "HelpBrowser"
+msgid "Found %1 results"
+msgstr "Tìm thấy% 1 kết quả"
+
+#: helpbrowser.ui:33
+msgctxt "HelpBrowser"
+msgid "Vidalia Help"
+msgstr "Vidalia Trợ giúp"
+
+#: helpbrowser.ui:484
+msgctxt "HelpBrowser"
+msgid "Back"
+msgstr "Trở về"
+
+#: helpbrowser.ui:487
+msgctxt "HelpBrowser"
+msgid "Move to previous page (Backspace)"
+msgstr "Chuyển đến trang trước đó (Backspace)"
+
+#: helpbrowser.ui:490
+msgctxt "HelpBrowser"
+msgid "Backspace"
+msgstr "Backspace"
+
+#: helpbrowser.ui:498
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "Về phía trước"
+
+#: helpbrowser.ui:501
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "Chuyển đến trang tiếp theo (Shift + Backspace)"
+
+#: helpbrowser.ui:504
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Chuyển+Quay lại "
+
+#: helpbrowser.ui:512
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "Trang chu?"
+
+#: helpbrowser.ui:515
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "Đi đến trang chủ (Ctrl + H)"
+
+#: helpbrowser.ui:518
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+#: helpbrowser.ui:535
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "Ti`m"
+
+#: helpbrowser.ui:538
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "Tìm kiếm một từ hoặc cụm từ trên trang hiện tại (Ctrl + F)"
+
+#: helpbrowser.ui:541
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+#: helpbrowser.ui:549
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "Đóng"
+
+#: helpbrowser.ui:552
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "Đóng Vidalia Trợ giúp"
+
+#: helpbrowser.ui:555
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+#: helpbrowser.ui:152
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "Tìm:"
+
+#: helpbrowser.ui:174
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "Tìm Ngược lại"
+
+#: helpbrowser.ui:187
+msgctxt "HelpBrowser"
+msgid "Find Next"
+msgstr "Tìm Kế tiếp"
+
+#: helpbrowser.ui:221
+msgctxt "HelpBrowser"
+msgid "Case sensitive"
+msgstr "Nhạy cảm chữ Hoa, chữ thường"
+
+#: helpbrowser.ui:231
+msgctxt "HelpBrowser"
+msgid "Whole words only"
+msgstr "Chỉ toàn bộ các từ "
+
+#: helpbrowser.ui:305
+msgctxt "HelpBrowser"
+msgid "Help Topics"
+msgstr "Chủ đề trợ giúp"
+
+#: helpbrowser.ui:260
+msgctxt "HelpBrowser"
+msgid "Contents"
+msgstr "Nội dung"
+
+#: helpbrowser.ui:350
+msgctxt "HelpBrowser"
+msgid "Search"
+msgstr "Tìm kiếm"
+
+#: helpbrowser.ui:362
+msgctxt "HelpBrowser"
+msgid "Searching for:"
+msgstr "Tìm theo:"
+
+#: helpbrowser.ui:405
+msgctxt "HelpBrowser"
+msgid "Found Documents"
+msgstr "Tài liệu được tìm thấy"
+
+#: helptextbrowser.cpp:54
+msgctxt "HelpTextBrowser"
+msgid "Error opening help file: "
+msgstr "Lỗi mở tập tin trợ giúp:"
+
+#: helptextbrowser.cpp:72
+msgctxt "HelpTextBrowser"
+msgid "Opening External Link"
+msgstr "Mở Liên kết ngoài"
+
+#: 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 có thể mở các liên kết mà bạn đã chọn trong trình duyệt web mặc định của bạn. Nếu trình duyệt của bạn hiện không có cấu hình để sử dụng Tor thì yêu cầu sẽ không được ẩn danh."
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr "Bạn có muốn Vidalia mở liên kết trong trình duyệt web của bạn?"
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr "Không thể mở Liên kết "
+
+#: 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 "Vidalia không thể mở liên kết được lựa chọn trong trình duyệt web của bạn. Bạn vẫn có thể sao chép URL và dán nó vào trình duyệt của bạn."
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr "Thông tin giấy phép"
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr "Giấy phép"
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr "Tín dụng"
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr "De lỗi"
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr "Thông tin "
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr "chú ý "
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr "Cảnh báo"
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr "Lỗi"
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr "Không biết"
+
+#: mainwindow.ui:233
+msgctxt "MainWindow"
+msgid "Start Tor"
+msgstr "Bắt đầu Tor"
+
+#: mainwindow.ui:443
+msgctxt "MainWindow"
+msgid "Exit"
+msgstr "Thoát"
+
+#: mainwindow.ui:304
+msgctxt "MainWindow"
+msgid "Bandwidth Graph"
+msgstr "Đồ thị Băng thông "
+
+#: mainwindow.ui:317
+msgctxt "MainWindow"
+msgid "Message Log"
+msgstr "Thông báo Đăng nhập"
+
+#: mainwindow.cpp:348
+msgctxt "MainWindow"
+msgid "Network Map"
+msgstr "Bản đồ Mạng "
+
+#: mainwindow.cpp:354
+msgctxt "MainWindow"
+msgid "Control Panel"
+msgstr "Bản điều khiển"
+
+#: mainwindow.ui:380
+msgctxt "MainWindow"
+msgid "Settings"
+msgstr "Cài đặt"
+
+#: mainwindow.ui:430
+msgctxt "MainWindow"
+msgid "About"
+msgstr "Về"
+
+#: mainwindow.ui:367
+msgctxt "MainWindow"
+msgid "Help"
+msgstr "Giúp"
+
+#: mainwindow.cpp:1391
+msgctxt "MainWindow"
+msgid "New Identity"
+msgstr "Giám định Mới"
+
+#: mainwindow.cpp:437
+msgctxt "MainWindow"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+#: mainwindow.cpp:438
+msgctxt "MainWindow"
+msgid "Ctrl+B"
+msgstr "Ctrl+B"
+
+#: mainwindow.cpp:439
+msgctxt "MainWindow"
+msgid "Ctrl+L"
+msgstr "Ctrl+L"
+
+#: mainwindow.cpp:440
+msgctxt "MainWindow"
+msgid "Ctrl+N"
+msgstr "Ctrl+N"
+
+#: mainwindow.cpp:441
+msgctxt "MainWindow"
+msgid "Ctrl+?"
+msgstr "Ctrl+?"
+
+#: mainwindow.cpp:442
+msgctxt "MainWindow"
+msgid "Ctrl+I"
+msgstr "Ctrl+I"
+
+#: mainwindow.cpp:443
+msgctxt "MainWindow"
+msgid "Ctrl+P"
+msgstr "Ctrl+P"
+
+#: mainwindow.cpp:463
+msgctxt "MainWindow"
+msgid "Tor"
+msgstr "Tor"
+
+#: mainwindow.cpp:468
+msgctxt "MainWindow"
+msgid "View"
+msgstr "Xem"
+
+#: mainwindow.cpp:476
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Vidalia Trợ giúp"
+
+#: mainwindow.cpp:527
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "Lỗi bắt đầu trình duyệt web"
+
+#: mainwindow.cpp:528
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia không thể bắt đầu trình duyệt web cấu hình"
+
+#: mainwindow.cpp:540
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "Lỗi bắt đầu nhắn tin khách hàng IM"
+
+#: mainwindow.cpp:541
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "Vidalia không thể bắt đầu các thân chủ nhắn tin cấu hình IM"
+
+#: mainwindow.cpp:562
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "Lỗi bắt đầu máy chủ proxy"
+
+#: mainwindow.cpp:563
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia không thể bắt đầu máy chủ cấu hình proxy "
+
+#: mainwindow.cpp:579
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "Kết nối vào một thư mục chuyển tiếp "
+
+#: mainwindow.cpp:583
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "Thành lập một kết nối thư mục được mã hóa"
+
+#: mainwindow.cpp:586
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "Khôi phục trạng thái mạng"
+
+#: mainwindow.cpp:589
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "Nap tình trạng mạng"
+
+#: mainwindow.cpp:592
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "Nạp giấy chứng nhận quyền"
+
+#: mainwindow.cpp:595
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "Yêu cầu thông tin tiếp sức"
+
+#: mainwindow.cpp:598
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "Tải thông tin tiếp sức"
+
+#: mainwindow.cpp:1132
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "Kết nối với mạng Tor"
+
+#: mainwindow.cpp:605
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "Thành lập một mạch Tor"
+
+#: mainwindow.cpp:1297
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr "Kết nối với mạng Tor!"
+
+#: mainwindow.cpp:612
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "Tình trạng khởi động không được công nhận"
+
+#: mainwindow.cpp:619
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr "hỗn hợp"
+
+#: mainwindow.cpp:622
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "nhận dạng không phù hợp"
+
+#: mainwindow.cpp:625
+msgctxt "MainWindow"
+msgid "done"
+msgstr "làm xong"
+
+#: mainwindow.cpp:628
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "kết nối từ chối"
+
+#: mainwindow.cpp:631
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "kết nối timeout"
+
+#: mainwindow.cpp:634
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "lỗi đọc / ghi"
+
+#: mainwindow.cpp:637
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "không có lộ trình để lưu trữ"
+
+#: mainwindow.cpp:640
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "không đủ nguồn lực"
+
+#: mainwindow.cpp:643
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "chưa biết"
+
+#: mainwindow.cpp:645
+msgctxt "MainWindow"
+msgid " failed (%1)"
+msgstr "thất bại (% 1)"
+
+#: mainwindow.ui:168
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor không hoạt động"
+
+#: mainwindow.cpp:686
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.Click 'Stop' again to stop your relay now."
+msgstr "Chuyển tiếp của bạn đang bị tắt. Nhấn 'Stop' một lần nữa để dừng phần chuyển tiếp của bạn bây giờ."
+
+#: mainwindow.cpp:688
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "Tor là tắt"
+
+#: mainwindow.cpp:693
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "Dừng Tor Now"
+
+#: mainwindow.cpp:695
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr "Dừng Tor"
+
+#: mainwindow.cpp:711
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Bắt đầu phần mềm Tor"
+
+#: mainwindow.ui:75
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "Bắt đầu Tor"
+
+#: mainwindow.cpp:859
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "lỗi bắt đầu Tor"
+
+#: 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 không thể bắt đầu Tor. Kiểm tra các thiết lập của bạn để đảm bảo đúng tên và vị trí của Tor thực thi được chỉ định của bạn."
+
+#: mainwindow.cpp:896
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "Kết nối với Tor"
+
+#: mainwindow.cpp:906
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "Lỗi kết nối"
+
+#: mainwindow.cpp:938
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "Tiếp nhận được cho phép"
+
+#: 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 "Bạn hiện đang chạy một chuyển tiếp. Chấm dứt phần chuyển tiếp của bạn sẽ gián đoạn bất kỳ kết nối công khai từ khách hàng. Bạn co' muốn tắt máy từ từ và cho khách hàng thời gian để tìm một chuyển tiếp mới?"
+
+#: mainwindow.cpp:965
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "Lỗi Shutting Down"
+
+#: mainwindow.cpp:966
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "Vidalia đã không thể ngăn chặn các phần mềm Tor."
+
+#: mainwindow.cpp:997
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "Lỗi bất ngờ"
+
+#: 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 "Vidalia phát hiện ra rằng phần mềm Tor đã thoát bất ngờ.Hảy vui lòng kiểm tra đăng nhập thông điệp cho cảnh báo mới đây hay các thông báo lỗi."
+
+#: mainwindow.cpp:1055
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Chứng thực Tor"
+
+#: mainwindow.cpp:1075
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "Xác thực Cookie đòi hỏi"
+
+#: 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 "Các phần mềm Tor đòi hỏi Vidalia gửi yêu cầu về nội dung của một cookie xác thực, nhưng Vidalia đã không thể tìm thấy một cookie."
+
+#: mainwindow.cpp:1080
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "Bạn có muốn duyệt hồ sơ 'control_auth_cookie' chính mình?"
+
+#: mainwindow.cpp:1087
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "Thư mục Dữ liệu "
+
+#: mainwindow.cpp:1089
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "Kiểm soát Cookie (control_auth_cookie)"
+
+#: mainwindow.cpp:1141
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "Lỗi Đăng ký Sự kiện"
+
+#: mainwindow.cpp:1143
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+msgstr "Vidalia không thể đăng ghi cho một số sự kiện. Nhiều trong số các tính năng của Vidalia có thể không có sẵn."
+
+#: mainwindow.cpp:1222
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "Lỗi xác thực"
+
+#: mainwindow.cpp:1224
+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)"
+
+#: mainwindow.cpp:1226
+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."
+
+#: mainwindow.cpp:1330
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "Có sẵn Cập nhật Tor "
+
+#: 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 "Phiên bản cài đặt hiện thời của Tor hết hạn hoặc không còn được đề nghị. Xin vui lòng truy cập vào trang web Tor để tải phiên bản mới nhất."
+
+#: mainwindow.cpp:1333
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Tor trang web:% 1"
+
+#: mainwindow.cpp:1394
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "Tất cả các kết nối tiếp theo sẽ xuất hiện khác với các kết nối cũ của bạn."
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "Không thể tạo Identity mới"
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "Chuyển tới cổng thất bại"
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "Vidalia không thể cấu hình chuyển tiếp cổng tự động."
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Bảng Kiểm soát Vidalia"
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr "Tình trạng"
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr "đường tắt Vidalia"
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr "Thiết lập tiếp nhận"
+
+#: mainwindow.ui:246
+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"
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr "Xem các mạng"
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr "Xem một bản đồ của mạng Tor"
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr "Sử dụng một Identity mới"
+
+#: mainwindow.ui:275
+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"
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr "Xem băng thông sử dụng gần đây"
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr "Xem lịch sử tin đăng nhập "
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr "Xem tài liệu trợ giúp"
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr "Cấu hình Vidalia"
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr "Xem thông tin về phiên bản và giấy phép"
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr "Thoát khỏi Vidalia"
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr "Hiển thị cửa sổ này lu'c khởi động"
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr "giấu"
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr "Ẩn cửa sổ này"
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr "Đặt lại mật khẩu bị lỗi"
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+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."
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has gone very wrong and Tor cannot proceed."
+msgstr "Thông điệp xuất hiện khi một cái gì đó đã đi rất sai và Tor không thể tiến hành."
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when something has gone wrong with Tor."
+msgstr "Thông điệp mà chỉ xuất hiện khi một cái gì đó đã đi sai với Tor."
+
+#: 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 "Thông điệp xuất hiện thường xuyên trong khi vận hành Tor bình thường và không được coi là lỗi, nhưng bạn có thể quan tâm."
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently during normal Tor operation."
+msgstr "Thông điệp xuất hiện thường xuyên trong khi vận hành Tor bình thường."
+
+#: messagelog.cpp:136
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of interest to Tor developers."
+msgstr "Hyper-tiết bài viết chủ yếu quan tâm đến các nhà phát triển Tor."
+
+#: messagelog.cpp:189
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "Lỗi Thiết Filter"
+
+#: messagelog.cpp:190
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia không thể ghi đăng cho các sự kiện đăng nhập của Tor."
+
+#: messagelog.cpp:205
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "Lỗi mở tập tin Đăng nhập"
+
+#: messagelog.cpp:206
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia không thể mở hồ sơ đăng nhập chỉ định."
+
+#: messagelog.cpp:227
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "Tên Tập tin Đăng nhập bắt buộc"
+
+#: messagelog.cpp:229
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "Bạn phải nhập một tên tập tin để có thể lưu các tin nhắn đăng nhập vào một tập tin."
+
+#: messagelog.cpp:280
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "Chọn Log File"
+
+#: messagelog.cpp:297
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "Lưu Đăng Thông điệp"
+
+#: messagelog.cpp:300
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "Tệp tin văn bản (*. txt)"
+
+#: messagelog.cpp:309
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+#: messagelog.cpp:310
+msgctxt "MessageLog"
+msgid "Cannot write file %1%2."
+msgstr "Không thể ghi tập tin% 1% 2."
+
+#: messagelog.cpp:360
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "Tìm trong tin nhắn Đăng nhập"
+
+#: messagelog.cpp:361
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "Tìm:"
+
+#: messagelog.cpp:367
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "Không tìm thấy"
+
+#: messagelog.cpp:368
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "Tìm thấy 0 tương hợp."
+
+#: messagelog.ui:19
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "Thông báo Đăng nhập"
+
+#: messagelog.ui:452
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "Bộ lọc tin nhắn ..."
+
+#: messagelog.ui:455
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "Thiết lập bộ lọc thư"
+
+#: messagelog.ui:463
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "Lịch sử Kích thước ..."
+
+#: messagelog.ui:466
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "Thiết lập tối đa số tin nhắn để hiển thị"
+
+#: messagelog.ui:477
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "Rõ ràng"
+
+#: messagelog.ui:480
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "Xoá tất cả thư từ Đăng nhập tin nhắn (Ctrl + E)"
+
+#: messagelog.ui:483
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+#: messagelog.ui:497
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "Bản sao"
+
+#: messagelog.ui:500
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "Chép các tin nhắn được chọn vào bộ nhớ tạm (Ctrl + C)"
+
+#: messagelog.ui:503
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+#: messagelog.ui:514
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "Chọn Tất cả"
+
+#: messagelog.ui:517
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "Chọn tất cả bài viết (Ctrl + A)"
+
+#: messagelog.ui:520
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+#: messagelog.ui:528
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "Lưu Tất cả"
+
+#: messagelog.ui:531
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "Lưu tất cả các tin nhắn đến một tập tin"
+
+#: messagelog.ui:539
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "Lưu lựa chọn"
+
+#: messagelog.ui:542
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "Lưu tin nhắn lựa chọn vào một hồ sơ"
+
+#: messagelog.ui:553
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "Thiết lập"
+
+#: messagelog.ui:556
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "Điều chỉnh Cài đặt tin nhắn Đăng nhập"
+
+#: messagelog.ui:559
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+#: messagelog.ui:567
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "Giúp "
+
+#: messagelog.ui:570
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "SHiển thị trình duyệt trợ giúp"
+
+#: messagelog.ui:573
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+#: messagelog.ui:581
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "Đóng"
+
+#: messagelog.ui:584
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "Đóng Đăng nhập tin nhắn"
+
+#: messagelog.ui:587
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+#: messagelog.ui:598
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "Tìm"
+
+#: messagelog.ui:601
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "Tìm tất cả các tin nhắn có chứa các văn bản tìm kiếm (Ctrl + F)"
+
+#: messagelog.ui:604
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+#: messagelog.ui:66
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "Thời gian"
+
+#: messagelog.ui:71
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "Loại"
+
+#: messagelog.ui:76
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "Thông điệp"
+
+#: messagelog.ui:160
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "Lưu những thiết lập Đăng nhập tin nhắn hiện tại"
+
+#: messagelog.ui:163
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "Thiết lập Bảo lưu"
+
+#: messagelog.ui:179
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "Hủy bỏ các thay đổi được thực hiện cho các cài đặt"
+
+#: messagelog.ui:182
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "Hủy"
+
+#: messagelog.ui:196
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "Lọc Thông báo"
+
+#: messagelog.ui:217
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "Lỗi"
+
+#: messagelog.ui:233
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "Cảnh báo"
+
+#: messagelog.ui:249
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "Thông báo"
+
+#: messagelog.ui:265
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "Tin"
+
+#: messagelog.ui:281
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "Gở lỗi"
+
+#: messagelog.ui:297
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "Lược sử đăng nhập tin nhắn"
+
+#: messagelog.ui:318
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "Một số tin nhắn để hiển thị trong cửa sổ đăng nhập tin nhắn"
+
+#: messagelog.ui:337
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "Thông điệp"
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr "Luôn luôn Đăng Lưu Thông điệp mới"
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr "Trình duyệt"
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr "Kích hoạt tính năng ưu tự động ltất cả các tin nhắn đăng nhập mới vào một tập tin"
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr "Tự động lưu các tin nhắn đăng nhập mới vào một tập tin"
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Bản đồ mạng Tor"
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "Cập nhật"
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "Cập nhật danh sách của những Tor chuyển tiếp và kết nối"
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "Giúp "
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "Hiển thị giúp bản đồ mạng"
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "Hiển thị giúp bản đồ mạng "
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "Đóng"
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "Đóng đồ mạng"
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "Phóng to"
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "Phóng to trên bản đồ mạng"
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "Thu Nhỏ"
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "Thu nhỏ trên bản đồ mạng"
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "Phóng Để phù hợp "
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "Phóng để phù hợp với tất cả các mạch hiện đang hiển thị"
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr "Cầu không hợp lệ"
+
+#: networkpage.cpp:194
+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ệ."
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr "Sao chép (Ctrl+C)"
+
+#: 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 "Bạn phải xác định cả hai một địa chỉ IP hay tên máy và số cổng để cấu hình Tor để sử dụng một proxy ủy quyền truy cập vào Liên mạng"
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "Bạn phải chỉ định một hoặc nhiều cổng để firewall của bạn cho phép bạn kết nối."
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'% 1' không phải là một số cổng hợp lệ."
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr "Kiểm tra nếu mạng địa phương của bạn yêu cầu một máy ủy quyền proxy để truy cập Liên mạng"
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "Tôi sử dụng một máy chủ proxy để truy cập Liên mạng"
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr "Những Cài đặt máy chủ proxy"
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr "HTTP Ủy nhiệm:"
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr "Tên đăng nhập:"
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr "Sử dụng proxy na`y cũng cho HTTPS"
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr "Mật khẩu:"
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "Cổng:"
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr "Kiểm tra chỉ kết nối với những tiếp sức sử dụng cổng được cho phép bởi tường lửa của bạn"
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "Tường lửa của tôi chỉ cho phép tôi kết nối với một số cổng nhất định"
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "Những Cài đặt tường lửa"
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "Những Cổng Được phép:"
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr "80, 443"
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr "Kiểm tra để mã hóa các yêu cầu thư mục và, mo^.t ca'ch tùy chọn, sử dụng những tiếp sức cầu để truy cập vào mạng Tor"
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "ISP của tôi chặn các kết nối vào mạng Tor"
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr "Những Thiết lập Cầu"
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr "Phần mềm Tor ma` bạn hiện đang chạy không hỗ trợ cầu. <br> Nhu*~ng kết nối danh mục sẽ vẫn được mã hóa."
+
+#: networkpage.ui:295
+msgctxt "NetworkPage"
+msgid "Add a Bridge:"
+msgstr "Thêm một cầu:"
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr "<a href=\"bridges.finding\"> Làm thế nào để tìm thấy một cây cầu </? a>"
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr "Hủy bỏ các cây cầu được lựa chọn từ danh sách"
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+msgid "Copy the selected bridges to the clipboard"
+msgstr "Sao chép lại các cầu được chọn vào bộ nhớ tạm"
+
+#: policy.cpp:167
+msgctxt "Policy"
+msgid "accept"
+msgstr "chấp nhận"
+
+#: policy.cpp:167
+msgctxt "Policy"
+msgid "reject"
+msgstr "từ chối"
+
+#: routerdescriptor.cpp:76
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "Trực tuyến"
+
+#: routerdescriptor.cpp:78
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "Không hoạt động"
+
+#: routerdescriptor.cpp:80
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "thoát tuyến"
+
+#: routerdescriptorview.cpp:139
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "Địa điểm:"
+
+#: routerdescriptorview.cpp:143
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "Địa chỉ IP:"
+
+#: routerdescriptorview.cpp:144
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "Diễn đàn:"
+
+#: routerdescriptorview.cpp:148
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "Băng thông:"
+
+#: routerdescriptorview.cpp:150
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "Thời gian hoạt động:"
+
+#: routerdescriptorview.cpp:156
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "Cập nhật cuối nhất:"
+
+#: routerdescriptorview.cpp:100
+msgctxt "RouterDescriptorView"
+msgid "%1 days "
+msgstr "% 1 ngày"
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr "% 1 giờ"
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr "% 1 phut"
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr "% 1 giây"
+
+#: routerdescriptorview.cpp:48
+msgctxt "RouterDescriptorView"
+msgid "Copy"
+msgstr "Sao chép"
+
+#: routerlistitem.cpp:67
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "Ngoại tuyến"
+
+#: routerlistitem.cpp:71
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "Đang không hoạt động"
+
+#: routerlistitem.cpp:83
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+#: routerlistwidget.cpp:49
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "Tiếp sức"
+
+#: routerlistwidget.cpp:74
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "Phóng to to*'i tiếp sức"
+
+#: routerlistwidget.cpp:220
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "% 1 rơ le trực tuyến"
+
+#: routerlistwidget.cpp:67
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "Sao chép"
+
+#: routerlistwidget.cpp:68
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "Biệt danh"
+
+#: routerlistwidget.cpp:71
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "Vân tay"
+
+#: serverpage.cpp:140
+msgctxt "ServerPage"
+msgid "Bridge Support Unavailable"
+msgstr "Hết Cầu Hỗ trợ"
+
+#: 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 "Bạn đã cấu hình Tor để hoạt động như một cầu nối tiếp sức cho người sử dụng kiểm duyệt, nhưng phiên bản Tor của bạn không hỗ trợ cầu."
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "Xin vui lòng nâng cấp phần mềm Tor của bạn hoặc cấu hình Tor để hành động như là một Tor tiếp sức bình thường."
+
+#: serverpage.cpp:199
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "Tiếp sức cầu của bạn không chạy."
+
+#: serverpage.cpp:263
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "Bạn phải chỉ định ít nhất một biệt hiệu tiếp sức và cổng."
+
+#: serverpage.ui:25
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "Chạy chi? như một khách hàng"
+
+#: serverpage.ui:32
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Tiếp sức giao thông cho mạng Tor"
+
+#: serverpage.ui:39
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network (Tor 0.2.0.8-alpha or newer)"
+msgstr "Trợ giúp người dùng kiểm duyệt tiến tới mạng Tor (Tor 0.2.0.8-alpha hay mới hơn)"
+
+#: serverpage.ui:91
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "Cổng tiếp sức:"
+
+#: serverpage.ui:110
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "Kích hoạt để đối xứng thư mục tiếp sức"
+
+#: serverpage.ui:113
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory "
+msgstr "Nhân bản thư mục tiếp sức"
+
+#: serverpage.ui:139
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "Thử tự động cấu hình chuyển tới cổng"
+
+#: serverpage.ui:154
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "Kiểm tra"
+
+#: serverpage.ui:164
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "Hiển thị chủ đề trợ giúp cho chuyển tới cổng"
+
+#: serverpage.ui:204
+msgctxt "ServerPage"
+msgid "Email address at which you may be reached if there is aproblem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr "Hãy thư điện tử d-ịa chỉ mà bạn có thể đến nếu có một vấn đề với tiếp sức của bạn. Bạn cũng có thể bao gồm PGP của bạn hoặc vân tay GPG."
+
+#: serverpage.ui:234
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "Cổng danh mục:"
+
+#: serverpage.ui:267
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "Số cổng danh mục "
+
+#: serverpage.ui:279
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "Thông báo Liên hệ:"
+
+#: serverpage.ui:337
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "Tên tiếp sức của bạn"
+
+#: serverpage.ui:370
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "Cổng mà người sử dụng và những chuyển tiếp khác có thể giao tiếp với tiếp sức của bạn"
+
+#: serverpage.ui:380
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "Biệt danh:"
+
+#: serverpage.ui:76
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "Những Cài đặt Cơ bản"
+
+#: serverpage.ui:435
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "Cho các kết nối Liên mạng với tốc độ tải xuống nhanh, nhưng nạp lên chậm, xin ghi vào danh sách tốc độ nạp lên của bạn ở đây."
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "Cable/DSL 256 Kbps"
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "Cable/DSL 512 Kbps"
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "Cable/DSL 768 Kbps"
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/Cable/DSL 1.5 Mbps"
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "> 1.5 Mbps"
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "tùy chỉnh"
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "Hãy chọn đề mục tương tự gần nhất như kết nối Liên mạng của bạn"
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "Chỉ chủ đề giúp về giới hạn tốc độ băng thông"
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "Tỷ lệ trung bình"
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "Giới hạn băng thông trung bình dài hạn"
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr "Tỷ lệ Tối đa"
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+msgstr "Đỉnh giới hạn tỷ lệ băng thông"
+
+#: 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 "Tỷ lệ băng thông tối đa của bạn phải lớn hơn hoặc bằng mức băng thông trung bình của bạn. Cả hai giá trị phải có ít nhất 20 kB / s."
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "Giới hạn băng thông"
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "Cổng 6660 - 6669 và 6697"
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "Ports 110, 143, 993 và 995"
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "Lấy Mail (POP, IMAP)"
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "Các Cổng chưa xác định bo*?i những hộp kiểm khác"
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "Hỗn hợp Các dịch vụ khác"
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "Cổng 706, 1863, 5050, 5190, 5222, 5223, 8300 và 8888"
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "Nhắn tin Tức tho*ì (IM)"
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "Cổng 443"
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "Trang web an toàn (SSL)"
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "Cổng 80"
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "Trang web"
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "Hiển thị chủ đề về các chính sách trợ giúp thoát"
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr "Người sử dụng những nguồn năng lực Liên mạng gì sẽ có thể truy nhập từ tiếp sức của bạn?"
+
+#: 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 vẫn sẽ chặn một số thư gửi đi và chia sẻ tập tin ứng dụng mặc định để giảm thư rác và lạm dụng khác."
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "Chính sách xuất cảnh"
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr "Hãy để những người khác tiếp cận cầu của bạn bằng cách cho họ dòng này:"
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "Đây là danh tính của cầu tiếp sức của bạn mà bạn có thể cung cấp cho người khác"
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+msgid "Copy your bridge relay's identity to the clipboard"
+msgstr "Sao chép danh tính của tiếp sức cầu của bạn vào bộ nhớ tạm"
+
+#: servicepage.cpp:116
+msgctxt "ServicePage"
+msgid "Error while trying to unpublish all services"
+msgstr "Lỗi trong khi đang thử thôi xuất bản tất cả các dịch vụ"
+
+#: 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 "Xin cấu hình ít nhất một thư mục dịch vụ và một cổng ảo cho mỗi dịch vụ mà bạn muốn lưu. Hãy hủy bỏ những cái khác."
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "Lỗi"
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "Hãy chọn một Dịch vụ."
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "Chọn Thư mục Dịch vụ"
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "Cổng thật chỉ có thể chứa những số cổng hợp lệ [1 .. 65.535]."
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "Mục tiêu chỉ có thể chứa các địa chỉ: cổng, địa chỉ, hoặc cổng."
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr "Thư mục đã được sử dụng bởi dịch vụ khác."
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "Mẫu"
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr "Những dịch vụ ẩn được cung cấp"
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "Địa chỉ onion"
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "Ảo Cảng"
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "Mục tiêu"
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "Đường dẫn thư mục"
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "Bật"
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "Thêm dịch vụ mới vào danh sách"
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "Hủy bỏ dịch vụ lựa chọn từ danh sách"
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr "Sao lại địa chỉ onion của dịch vụ được chọn vào bộ nhớ tạm"
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr "Trình duyệt trong hệ thống tập tin địa phương và chọn thư mục cho dịch vụ được chọn"
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "Tạo bởi Tor"
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr "Mới"
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "đang Giải quyết "
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "đang Kết nối"
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr "Mở"
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr "Thất bại"
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr "Đóng cửa"
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "Đang thử lại"
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "Thiết kế la.i"
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "Không biết"
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "Quá trình % 1 không ngừng. [% 2]"
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "Các dịch vụ Tor không được cài đặt."
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "Không thể bắt đầu dịch vụ Tor."
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "Không thể làm hỏng mật mã kiểm soát."
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "Thành công"
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "Không tìm thấy các thiết bị UPnP-cho phép "
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "Không tìm thấy các thiết bị cổng Liên mạng UPnP-cho phép hợp lệ "
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "WSAStartup thất bại"
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "Không thể thêm một bản đồ cổng "
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "Không thể tìm thấy một bản đồ cổng "
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "Không thể gỡ bỏ một bản đồ cổng "
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "Lỗi không rõ"
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "Khám phá các thiết bị UPnP-cho phép"
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "Cập nhật bản đồ cổng thư mục"
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "Cập nhật bản đồ cổng tiếp sức"
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "Kiểm tra hoàn tất thành công!"
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "Thử nghiệm Hỗ trợ UPnP"
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr "Thử nghiệm Hỗ trợ Phổ dụng Plug & Play "
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "OK"
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "Hủy"
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "Có"
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "Không"
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "Giúp đỡ"
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "Thử lại"
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "Hiển Đăng nhập"
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "Hiển thị Thiết lập"
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "Tiếp tục"
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "Thoát"
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "Trình duyệt"
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "Đối số không hợp lệ"
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia đang chạy"
+
+#: 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 "Một quá trình Vidalia khác có thể đang chạy ro^`i. Nếu thực sự không phải là một quá trình Vidalia khác đang chạy, bạn có thể chọn để tiếp tục. Bạn co' muốn tiếp tục khởi động Vidalia?"
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "Hiển thị thông báo sử dụng này và thoát."
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "Đặt lại TẤT CẢ các thiết lập lưu Vidalia."
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "Đặt các sử dụng thư mục Vidalia cho các tập tin dữ liệu."
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "Đặt tên và vị trí của Vidalia's pidfile."
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "Đặt tên và vị trí của hồ sơ đăng nhập Vidalia."
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "Đặt tính dông dài của đăng nhập Vidalia."
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "Đặt phong cách giao diện của Vidalia."
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "Đặt ngôn ngữ của Vidalia."
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Tư liệu cách sử dụng Vidalia "
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr "Mã ngôn ngữ chỉ định không hợp lệ:"
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr "Phong cách Giao diện chỉ định không hợp lệ:"
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr "Mức Đăng nhập chỉ định không hợp lệ:"
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "Không thể mở hồ sơ đăng nhập '%1':% 2"
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/vidalia_i18n.qrc b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/vidalia_i18n.qrc
new file mode 100644
index 0000000..7ce5890
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/vidalia_i18n.qrc
@@ -0,0 +1,63 @@
+<RCC>
+ <qresource prefix="/lang">
+ <file>vidalia_ar.qm</file>
+ <file>vidalia_bg.qm</file>
+ <file>vidalia_bms.qm</file>
+ <file>vidalia_cs.qm</file>
+ <file>vidalia_da.qm</file>
+ <file>vidalia_de.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_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_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_zh_TW.qm</file>
+ </qresource>
+ <qresource prefix="/lang">
+ <file>qt_ar.qm</file>
+ <file>qt_bg.qm</file>
+ <file>qt_bms.qm</file>
+ <file>qt_cs.qm</file>
+ <file>qt_da.qm</file>
+ <file>qt_de.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_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_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_zh_TW.qm</file>
+ </qresource>
+</RCC>
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_CN/qt_zh_CN.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_CN/qt_zh_CN.po
new file mode 100644
index 0000000..0df207e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_CN/qt_zh_CN.po
@@ -0,0 +1,438 @@
+msgid ""
+msgstr ""
+"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: 2009-11-29 07:55-0700\n"
+"Last-Translator: yfdyh000 <yfdyh000 at Gmail.com>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.1.0\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "激活"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "执行“%1”需要 Qt %2，只找到了 Qt %3。"
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "不兼容的 Qt 库错误"
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "QT_LAYOUT_DIRECTION"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "激活程序的主窗口"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "确定"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "保存"
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "打开"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "取消"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "关闭"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "应用"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "重置"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "帮助"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "不保存"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "抛弃"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "是(&Y)"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "全部选是(&A)"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "否(&N)"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "全部选否(&O)"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "保存全部"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "放弃"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "重试"
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "忽略"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "恢复默认"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "不保存关闭"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "确定(&O)"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "名称"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "大小"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "类型"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "类型"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "日期被修改"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "所有文件 (*)"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "目录"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "打开(&O)"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "保存(&S)"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "打开"
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr "%1已经存在。你想要替换它么？"
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+"文件 %1 没有找到。\n"
+"请核实已给定正确文件名。"
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "我的计算机"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "重命名(&R)"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "删除(&D)"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "显示隐藏文件(&H)"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "后退"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "父目录"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "列表视图"
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "详细视图"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "文件类型："
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "目录："
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+"目录%1 没有找到。\n"
+"请核实已给定正确目录名。"
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+"“%1“ 只读。\n"
+"你还是想删除它么？"
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "你确认你想删除“%1“？"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "不能删除目录。"
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "所有文件 (*.*)"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "另存为"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "驱动器"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "文件"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "未知的"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "查找目录"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "显示 "
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "前进"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "新建文件夹"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "新建文件夹(&N)"
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "选择(&C)"
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "移除"
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "文件名称(&N)："
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "查看："
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "创建新文件夹"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+"<b>名称“%1“不能被使用。</b><p>请使用另外一个包含更少字符或者不含有标点符号的"
+"名称。"
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr "名称"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "大小"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "类型"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "类型"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "日期被修改"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "我的计算机"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "计算机"
+
+#: 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千字节"
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr "%1字节"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_CN/vidalia_zh_CN.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_CN/vidalia_zh_CN.po
new file mode 100644
index 0000000..3daec06
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_CN/vidalia_zh_CN.po
@@ -0,0 +1,3318 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: 2009-12-14 04:54-0700\n"
+"Last-Translator: Mini Dragon <projecteurs at gmail.com>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.1.0\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "关于 Vidalia"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "许可"
+
+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 "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 "你选择了 '密码' 验证方式,而你并未指定密码."
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "请选择 Tor 配置文件"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "未找到该文件"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 不存在.请问是否要创建该文件?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "创建文件失败"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "无法创建 %1 [%2]"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "请选择一个用于保存 Tor 数据的文件夹"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "无法移除 Tor 服务"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "无法安装 Tor 服务"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "Vidalia 无法安装 Tor 为系统服务."
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "控制端口"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "验证:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "地址:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "无"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Cookie"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "密码"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "随机生成"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Tor配置文件"
+
+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 "Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+"Vidalia 无法删除 Tor 服务。\n"
+"\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 "Vidalia 无法载入选中的语言。"
+
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr "起始时间:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "隐藏设定"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "显示设定"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Tor 带宽使用"
+
+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 "来自下列国家的客户端从 %1 起开始使用您的中继"
+
+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 "删除回路（Del）"
+
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr "删除流（Del）"
+
+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 "Vidalia 无法保存你的 %1 设置。"
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "应用设置时发生错误"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia 无法应用你的 %1 设置于 Tor."
+
+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 "发送控制命令时发生错误。 [%1]"
+
+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"
+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 "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 "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 "The proxy arguments specified are not properly formatted."
+msgstr "代理程序的参数格式不正确。"
+
+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/秒"
+
+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 "Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "前进"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "移至下一页(Shift+Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "主页"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "移至主页(Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "查找"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "在当前页搜索关键词或语句(Ctrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "关闭"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "关闭 Vidalia 帮助"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "查找:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "查找上一个"
+
+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 "Vidalia 会在默认的浏览器里打开您选择的链接。如果浏览器没有设置为使用 Tor，请求将不是匿名的。"
+
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr "您希望 Vidalia 在浏览器里打开链接吗？"
+
+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 复制，然后粘贴到浏览器里。"
+
+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 "MainWindow"
+msgid "Start Tor"
+msgstr "启动 Tor"
+
+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 "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 "查看"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Vidalia 帮助"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "启动浏览器时发生了错误"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr "Vidalia 无法启动选定的浏览器"
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "启动即时通讯客户端时发生了错误"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "Vidalia 无法启动选定的即时通讯客户端"
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "启动代理服务器时发生了错误"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia 无法启动选定的代理服务器"
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "连接中继目录"
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "建立加密的目录连接"
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr "接收网络状态"
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr "载入网络状态"
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr "载入授权服务器证书"
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "请求中继信息"
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr "载入中继信息"
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "连接 Tor 网络"
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "建立 Tor 回路"
+
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr "Tor 网络已经连接！"
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr "未知的启动状态"
+
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr "杂项"
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr "身份不一致"
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr "结束"
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr "连接被拒绝"
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "连接超时"
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "读写错误"
+
+# do you mean no circuit available to route traffic? if so this is the right translation.
+# do you mean no circuit available to route traffic? if so this is the right translation.
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr "没有可用链路"
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "资源不够"
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "未知"
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor 未运行"
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "正在关闭 Tor"
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "立刻停止 Tor"
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr "停止 Tor"
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "Tor 软件启动中"
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "启动 Tor"
+
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "启动 Tor 时发生错误"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgstr "Vidalia 无法启动 Tor.请检查 Tor 可执行程序的路径以及设定是否正确."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "连接 Tor"
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "连接错误"
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "中继功能已启用"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "关闭时发生了错误"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "Vidalia 无法停止 Tor 软件。"
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "异常错误"
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "Tor 验证中"
+
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "需要 Cookie 验证"
+
+msgctxt "MainWindow"
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgstr "Tor 要求 Vidalia 发送 认证Cookie 中的内容但 Vidalia 无法找到 Cookie。"
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "你要自己浏览 'control_auth_cookie' 文件吗?"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "数据目录"
+
+msgctxt "MainWindow"
+msgid "Control Cookie (control_auth_cookie)"
+msgstr "认证Cookie (control_auth_cookie)"
+
+msgctxt "MainWindow"
+msgid "Error Registering for Events"
+msgstr "事件记录错误"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to register for some events. Many of Vidalia's features may be unavailable."
+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 更新"
+
+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 网站下载最新版。"
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr "Tor 网站：%1"
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "所有新建连接将会不同于之前的连接."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "新身份创建失败"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "端口映射失败"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "Vidalia 无法配置端口的自动映射。"
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Vidalia 控制面板"
+
+msgctxt "MainWindow"
+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 "创建中继节点帮助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版本已经过时，不再推荐使用。"
+
+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 "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 ""
+"程序 %1 似乎正与端口 %2 建立不安全的未加密链接。任何通过此连接的流量都可能被监视。请检查您的程序配置，如果可能，尽量使用加密协议例如SSL。"
+
+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 无法安装 Tor 为系统服务."
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+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"
+"再次单击'停止'立刻关闭中继。"
+
+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"
+"您是否想延迟关闭以便给与您的客户端时间转移至新的中继？"
+
+msgctxt "MainWindow"
+msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
+msgstr ""
+"Vidalia检测到Tor软件意外退出。\n"
+"\n"
+"请检查消息日志获取最近的警告及错误信息。"
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr "，也许是Telnet程序，"
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr "，也许是Email客户端，"
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr "文件"
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "关于 Vidalia"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "主页"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr "检查更新"
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "设定过滤条件时发生错误"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia 无法注册 Tor 日志事件."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "打开日志文件时发生错误"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia 无法打开指定的日志文件."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "必须指定日志文件名"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "必须指定保存消息文件的文件名."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "请选择日志文件"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "保存日志内容"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "文本文件 (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "查找于消息日志"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "查找:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "未找到"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "找到 0 个匹配结果."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "消息日志"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "消息过滤..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "设定消息过滤条件"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "日志大小..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "设定消息最大显示的条数"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "清空"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "清空消息日志中的全部内容(Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "复制"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "复制选中消息至剪贴板(Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "选择全部"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "选择全部消息(Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "保存全部"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "保存全部消息至文件"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "保存所选"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "保存所选消息至文件"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "设定"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "调整消息日志设定"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "帮助"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "显示帮助浏览器"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "关闭"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "关闭消息日志"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "查找"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "从消息中查找文字(Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "时间"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "类型"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "内容"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "保存当前消息日志设定"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "保存设定"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "放弃保存已更改的设定"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "取消"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "消息过滤"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "错误"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "警告"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "注意"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "信息"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "调试"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "日志历史记录"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "在日志窗口显示的消息条数"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "消息"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log 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 "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运行时偶尔出现\n"
+"并非错误但可能需要关注。"
+
+msgctxt "MessageLog"
+msgid "Messages that appear frequently \n"
+"during normal Tor operation."
+msgstr "此类消息在Tor正常运行中经常出现。"
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr "Tor开发者需要的详细消息。"
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+"无法写入文件%1\n"
+"\n"
+"%2。"
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor 网络地图"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "刷新"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "刷新 Tor 中继服务器和连接信息"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "帮助"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "显示关于网络地图的帮助信息"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "显示网络地图帮助"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "关闭"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "关闭网络地图"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "放大"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "放大网络地图"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "缩小"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "缩小网络地图"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "适合图像"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "缩放网络地图以显示完整回路"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "未找到该文件"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr "尚无所选中继节点的细节信息。"
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "未知"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr "全屏"
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr "全屏查看网络地图"
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+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."
+msgstr "你必须指定 Tor 用于访问网络的 IP 地址或主机名,以及端口."
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "你必须指定一个或多个端口用于连接防火墙."
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' 不是一个有效的端口."
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr "如果您的局域网需要代理服务器接入Internet请选择此项"
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "我使用代理服务器连接到网络"
+
+msgctxt "NetworkPage"
+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 "密码:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "端口:"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr "选择此项Tor将仅连接端口被防火墙所允许的中继。"
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "我的防火墙只允许我连接到指定端口"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "防火墙设定"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "允许端口:"
+
+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 "选择此项则加密目录请求，您还可以选择性地通过 桥接中继 访问Tor网络。"
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "我的 ISP 阻挡了对 Tor 网络的连接"
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr "网桥设置"
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr "您正运行的Tor软件不支持网桥功能。<br>但与目录服务器的连接仍可加密。"
+
+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 "从列表中移除选中的网桥"
+
+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 "Policy"
+msgid "accept"
+msgstr "接受"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "拒绝"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "联机"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "休眠"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "脱机"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "地理位置"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "IP 地址:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "系统平台:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "带宽:"
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "运行时间"
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "最后更新:"
+
+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:"
+msgstr "状态"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "地理位置"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "IP 地址:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "系统平台:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "带宽:"
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "运行时间"
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "信息:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "最后更新:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr "描述信息块"
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "脱机"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "休眠"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "中继"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "移动至中继"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 中继在线"
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "复制"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "昵称"
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "节点密钥指纹"
+
+msgctxt "ServerPage"
+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."
+msgstr "你已将 Tor 设定为网桥中继服务器,然而你的 Tor 版本并不支持此功能."
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "请升级你的 Tor 软件或者将 Tor 设定为普通中继服务器."
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr "您的桥接中继尚未运行"
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "你必须指定至少一个中继名称和端口."
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "仅运行客户端功能"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Tor 网络中继"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "中继端口:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr "启用此项为中继目录服务器创建镜像"
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "尝试自动配置端口映射"
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "测试"
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "显示有关端口映射的帮助主题"
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "目录端口:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "请指定目录端口"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "信息:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "您中继服务的名称"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "您中继服务的端口，供其他用户或中继与其通讯时连接。"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "名称:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "基本设定"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "如网络连接的下行速率较大,而上行速度较慢,请选择适用的网络连接类型(主要适用于 DSL 用户)"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "宽带/DSL 256 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "宽带/DSL 512 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "宽带/DSL 768 Kbps"
+
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr "T1/宽带/DSL 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr "带宽大于 1.5 Mbps"
+
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr "自定义"
+
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr "请选择适合或接近的网络连接类型"
+
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr "显示关于带宽速率限制的相关帮助主题"
+
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr "平均速率"
+
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr "长期平均带宽限制"
+
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr "KB/s"
+
+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 "你的最大带宽速率必须大于或等于你的平均带宽速率.两个数值必须至少 20KB/s"
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "带宽限制"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "端口范围: 6660-6669 和 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "IRC 聊天服务"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "端口范围: 110,143,993 和 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "邮件接收服务(POP,IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "除以上指定端口外的其它所有端口"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "其它服务"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "端口范围: 706,1863,5050,5190,5222,8300 和 8888 {706, 1863, 5050, 5190, 5222, 5223, 8300 ?}"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "即时通讯服务(IM)"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "端口: 443"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "加密网站(SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "端口: 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "普通网站"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "显示关于服务策略的相关帮助主题"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr "用户通过您的中继服务可以访问的Internet资源"
+
+msgctxt "ServerPage"
+msgid "Tor will still block some outgoing mail and file sharing applications by default to reduce spam and other abuse."
+msgstr "Tor仍会默认拦截某些出站邮件或文件共享程序以减少垃圾邮件及其他网络滥用行为。"
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "服务策略"
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr "将此行告诉朋友他们就可以访问您的网桥："
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr "此行为您的网桥身份，您可以将其告知他人。"
+
+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 无法保存你的 %1 设定."
+
+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 网络(限于 Tor 0.2.0.3-alpha 或更高版本) {0.2.0.8-?}"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr "<a href=\"#bridgeUsage\">谁曾使用过我的网桥?</a>"
+
+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 ""
+"中继故障时联系您的Email地址\n"
+"您还可以同时提供您的PGP/GPG指纹。"
+
+msgctxt "ServicePage"
+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."
+msgstr "请至少配置一个服务目录并为每项服务配置一个虚拟端口。删除其他的项目。"
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "错误"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "请选择一项服务"
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "选择服务目录"
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "虚拟端口必须合法的端口号[1-65535]。"
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr "目标可必须包含地址:端口、地址或端口。"
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr "此目录已被其他服务占用。"
+
+# what do you mean? a table? 这是服务页面那个控件的名字.无所谓啦!
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "表单"
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr "已提供隐藏服务"
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "Oinon地址"
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "虚拟端口"
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "本地目标"
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "目录位置"
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "启用"
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "向列表中添加新服务"
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "从列表中移除选中的服务"
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr "将选中服务的.Onion地址复制到剪贴板"
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr "浏览本地文件系统为所选服务设定服务目录"
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr "由Tor创建"
+
+msgctxt "Stream"
+msgid "New"
+msgstr "新建"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "正在解析"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "正在连接"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "打开"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "失败"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "关闭"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "正在重试"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "重新映射"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "未知"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "进程 %1 停止失败. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "未安装 Tor 服务."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "无法启动 Tor 服务."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "密码指纹生成失败。"
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "成功"
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "未发现任何UPnP支持设备"
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr "未发现支持UPnP的Internet网关设备"
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "WSAStartup 函数调用失败"
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "无法添加映射端口"
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "无法获取映射端口"
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "无法删除映射端口"
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "未知错误"
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "正在搜索UPnP设备"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "正在更新目录端口映射"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "正在更新端口映射"
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "成功完成测试！"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "正在测试UPnP支持"
+
+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 "Vidalia无法找到“%1”，不能检查软件更新。"
+
+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 "版本"
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "确定"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "取消"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "是"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "否"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "帮助"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "重试"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "显示日志"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "显示设定"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "继续"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "退出"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "浏览"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "无效参数"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia 已经运行"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "显示使用信息和退出"
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "复位所有储存的 Vidalia 设定."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "设定 Vidalia 数据保存位置."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "设定 Vidalia 进程文件的名称和保存位置."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "设定 Vidalia 日志文件的名称和保存位置"
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "设定 Vidalia 的日志冗余."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "设定 Vidalia 的界面样式."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "设定 Vidalia 的界面语言."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Vidalia 使用信息"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "无法打开日志文件 '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr "指定语言代码无效："
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr "指定界面风格无效："
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr "指定日志等级无效："
+
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+"似乎另一个Vidalia进程已经运行。如果没有其他的Vidalia进程运行，您可以选择继续。\n"
+"\n"
+"您要启动Vidalia吗?"
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr "%1 秒"
+
+msgctxt "stringutil.h"
+msgid "%1 B/s"
+msgstr "%1 B/s"
+
+msgctxt "stringutil.h"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+msgctxt "stringutil.h"
+msgid "%1 MB/s"
+msgstr "%1 MB/s"
+
+msgctxt "stringutil.h"
+msgid "%1 GB/s"
+msgstr "%1 GB/s"
+
+msgctxt "stringutil.h"
+msgid "%1 days"
+msgstr "%1 日"
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr "%1 小时"
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr "%1 分"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_HK/qt_zh_HK.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_HK/qt_zh_HK.po
new file mode 100644
index 0000000..fc80a04
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_HK/qt_zh_HK.po
@@ -0,0 +1,426 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr ""
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr ""
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr ""
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr ""
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr ""
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr ""
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr ""
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr ""
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr ""
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr ""
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr ""
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr ""
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr ""
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr ""
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr ""
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr ""
+
+#: qfiledialog.cpp:1670
+msgctxt "QFileDialog"
+msgid "%1 already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: qfiledialog.cpp:1690
+msgctxt "QFileDialog"
+msgid "%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr ""
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr ""
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr ""
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr ""
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr ""
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr ""
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr ""
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr ""
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr ""
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr ""
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr ""
+
+#: qfiledialog.cpp:2476
+msgctxt "QFileDialog"
+msgid "%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr ""
+
+#: qfiledialog.cpp:2281
+msgctxt "QFileDialog"
+msgid "'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr ""
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr ""
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr ""
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr ""
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr ""
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr ""
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr ""
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr ""
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr ""
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr ""
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr ""
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr ""
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr ""
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr ""
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr ""
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr ""
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr ""
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr ""
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr ""
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr ""
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr ""
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr ""
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr ""
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr ""
+
+#: qfilesystemmodel.cpp:677
+msgctxt "QFileSystemModel"
+msgid "%1 TB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:679
+msgctxt "QFileSystemModel"
+msgid "%1 GB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:681
+msgctxt "QFileSystemModel"
+msgid "%1 MB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:683
+msgctxt "QFileSystemModel"
+msgid "%1 KB"
+msgstr ""
+
+#: qfilesystemmodel.cpp:684
+msgctxt "QFileSystemModel"
+msgid "%1 bytes"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_HK/vidalia_zh_HK.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_HK/vidalia_zh_HK.po
new file mode 100755
index 0000000..cd31a6d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_HK/vidalia_zh_HK.po
@@ -0,0 +1,2682 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2008-11-24 15:59+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: aboutdialog.ui:16
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:53
+msgctxt "AboutDialog"
+msgid "Vidalia"
+msgstr ""
+
+#: aboutdialog.ui:88
+msgctxt "AboutDialog"
+msgid "Qt"
+msgstr ""
+
+#: aboutdialog.ui:69
+msgctxt "AboutDialog"
+msgid "Tor"
+msgstr ""
+
+#: aboutdialog.cpp:53
+msgctxt "AboutDialog"
+msgid "Unavailable"
+msgstr ""
+
+#: aboutdialog.cpp:57
+msgctxt "AboutDialog"
+msgid "Not Running"
+msgstr ""
+
+#: aboutdialog.ui:81
+msgctxt "AboutDialog"
+msgid "0.2.0"
+msgstr ""
+
+#: aboutdialog.ui:106
+msgctxt "AboutDialog"
+msgid "0.2.0.31-alpha-dev (r123456)"
+msgstr ""
+
+#: aboutdialog.ui:131
+msgctxt "AboutDialog"
+msgid "4.4.2"
+msgstr ""
+
+#: aboutdialog.ui:107
+msgctxt "AboutDialog"
+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 ""
+
+#: advancedpage.cpp:120
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr ""
+
+#: advancedpage.cpp:223
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr ""
+
+#: advancedpage.cpp:236
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr ""
+
+#: advancedpage.cpp:238
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr ""
+
+#: advancedpage.cpp:249
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr ""
+
+#: advancedpage.cpp:250
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr ""
+
+#: advancedpage.cpp:265
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr ""
+
+#: advancedpage.cpp:287
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:289
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service."
+""
+"You may need to remove it manually."
+msgstr ""
+
+#: advancedpage.cpp:298
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr ""
+
+#: advancedpage.cpp:299
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr ""
+
+#: advancedpage.ui:28
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr ""
+
+#: advancedpage.ui:48
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr ""
+
+#: advancedpage.ui:58
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr ""
+
+#: advancedpage.ui:86
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr ""
+
+#: advancedpage.ui:91
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr ""
+
+#: advancedpage.ui:96
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr ""
+
+#: advancedpage.ui:111
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr ""
+
+#: advancedpage.ui:157
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ""
+
+#: advancedpage.ui:219
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr ""
+
+#: advancedpage.ui:240
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+#: advancedpage.ui:259
+msgctxt "AdvancedPage"
+msgid "Select path to your configuration file"
+msgstr ""
+
+#: advancedpage.ui:318
+msgctxt "AdvancedPage"
+msgid "Browse"
+msgstr ""
+
+#: advancedpage.ui:275
+msgctxt "AdvancedPage"
+msgid "Data Directory"
+msgstr ""
+
+#: advancedpage.ui:296
+msgctxt "AdvancedPage"
+msgid "Store data for the Tor software in the following directory"
+msgstr ""
+
+#: advancedpage.ui:315
+msgctxt "AdvancedPage"
+msgid "Select the directory used to store data for the Tor software"
+msgstr ""
+
+#: appearancepage.ui:22
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr ""
+
+#: appearancepage.ui:37
+msgctxt "AppearancePage"
+msgid "Choose the language used in Vidalia"
+msgstr ""
+
+#: appearancepage.ui:75
+msgctxt "AppearancePage"
+msgid "Style"
+msgstr ""
+
+#: appearancepage.ui:103
+msgctxt "AppearancePage"
+msgid "Choose Vidalia's interface style"
+msgstr ""
+
+#: appearancepage.cpp:67
+msgctxt "AppearancePage"
+msgid "Vidalia was unable to load the selected language translation."
+msgstr ""
+
+#: bwgraph.cpp:166
+msgctxt "BandwidthGraph"
+msgid "Since:"
+msgstr ""
+
+#: bwgraph.cpp:232
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr ""
+
+#: bwgraph.ui:40
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr ""
+
+#: bwgraph.ui:16
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr ""
+
+#: bwgraph.ui:63
+msgctxt "BandwidthGraph"
+msgid "Reset"
+msgstr ""
+
+#: bwgraph.ui:151
+msgctxt "BandwidthGraph"
+msgid "Receive Rate"
+msgstr ""
+
+#: bwgraph.ui:170
+msgctxt "BandwidthGraph"
+msgid "Send Rate"
+msgstr ""
+
+#: bwgraph.ui:183
+msgctxt "BandwidthGraph"
+msgid "Always on Top"
+msgstr ""
+
+#: bwgraph.ui:234
+msgctxt "BandwidthGraph"
+msgid "Style"
+msgstr ""
+
+#: bwgraph.ui:284
+msgctxt "BandwidthGraph"
+msgid "Changes the transparency of the Bandwidth Graph"
+msgstr ""
+
+#: bwgraph.ui:368
+msgctxt "BandwidthGraph"
+msgid "100"
+msgstr ""
+
+#: bwgraph.ui:383
+msgctxt "BandwidthGraph"
+msgid "% Opaque"
+msgstr ""
+
+#: bwgraph.ui:443
+msgctxt "BandwidthGraph"
+msgid "Save"
+msgstr ""
+
+#: bwgraph.ui:450
+msgctxt "BandwidthGraph"
+msgid "Cancel"
+msgstr ""
+
+#: circuit.cpp:112
+msgctxt "Circuit"
+msgid "New"
+msgstr ""
+
+#: circuit.cpp:113
+msgctxt "Circuit"
+msgid "Open"
+msgstr ""
+
+#: circuit.cpp:114
+msgctxt "Circuit"
+msgid "Building"
+msgstr ""
+
+#: circuit.cpp:115
+msgctxt "Circuit"
+msgid "Failed"
+msgstr ""
+
+#: circuit.cpp:116
+msgctxt "Circuit"
+msgid "Closed"
+msgstr ""
+
+#: circuit.cpp:117
+msgctxt "Circuit"
+msgid "Unknown"
+msgstr ""
+
+#: circuititem.cpp:39
+msgctxt "CircuitItem"
+msgid "<Path Empty>"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Connection"
+msgstr ""
+
+#: circuitlistwidget.cpp:55
+msgctxt "CircuitListWidget"
+msgid "Status"
+msgstr ""
+
+#: circuitlistwidget.cpp:87
+msgctxt "CircuitListWidget"
+msgid "Zoom to Circuit"
+msgstr ""
+
+#: circuitlistwidget.cpp:89
+msgctxt "CircuitListWidget"
+msgid "Close Circuit (Del)"
+msgstr ""
+
+#: circuitlistwidget.cpp:110
+msgctxt "CircuitListWidget"
+msgid "Close Stream (Del)"
+msgstr ""
+
+#: configdialog.cpp:77
+msgctxt "ConfigDialog"
+msgid "General"
+msgstr ""
+
+#: configdialog.cpp:81
+msgctxt "ConfigDialog"
+msgid "Network"
+msgstr ""
+
+#: configdialog.cpp:85
+msgctxt "ConfigDialog"
+msgid "Sharing"
+msgstr ""
+
+#: configdialog.cpp:89
+msgctxt "ConfigDialog"
+msgid "Services"
+msgstr ""
+
+#: configdialog.cpp:93
+msgctxt "ConfigDialog"
+msgid "Appearance"
+msgstr ""
+
+#: configdialog.cpp:97
+msgctxt "ConfigDialog"
+msgid "Advanced"
+msgstr ""
+
+#: configdialog.cpp:111
+msgctxt "ConfigDialog"
+msgid "Help"
+msgstr ""
+
+#: configdialog.cpp:196
+msgctxt "ConfigDialog"
+msgid "Error Saving Settings"
+msgstr ""
+
+#: configdialog.cpp:198
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to save your %1 settings."
+msgstr ""
+
+#: configdialog.cpp:225
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr ""
+
+#: configdialog.cpp:227
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr ""
+
+#: configdialog.ui:16
+msgctxt "ConfigDialog"
+msgid "Settings"
+msgstr ""
+
+#: controlconnection.cpp:134
+msgctxt "ControlConnection"
+msgid "Vidalia was unable to connect to Tor. (%1)"
+msgstr ""
+
+#: controlconnection.cpp:331
+msgctxt "ControlConnection"
+msgid "Control socket is not connected."
+msgstr ""
+
+#: controlpasswordinputdialog.ui:28
+msgctxt "ControlPasswordInputDialog"
+msgid "Password Required"
+msgstr ""
+
+#: controlpasswordinputdialog.ui:80
+msgctxt "ControlPasswordInputDialog"
+msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password: "
+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 ""
+
+#: generalpage.cpp:62
+msgctxt "GeneralPage"
+msgid "Executables (*.exe)"
+msgstr ""
+
+#: generalpage.cpp:75
+msgctxt "GeneralPage"
+msgid "Select Path to 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 ""
+
+#: generalpage.ui:57
+msgctxt "GeneralPage"
+msgid "Start the Tor software when Vidalia starts"
+msgstr ""
+
+#: generalpage.ui:51
+msgctxt "GeneralPage"
+msgid "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 ""
+
+#: graphframe.cpp:238
+msgctxt "GraphFrame"
+msgid "Recv: "
+msgstr ""
+
+#: graphframe.cpp:298
+msgctxt "GraphFrame"
+msgid "%1 KB/s"
+msgstr ""
+
+#: graphframe.cpp:247
+msgctxt "GraphFrame"
+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 ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: helptextbrowser.cpp:78
+msgctxt "HelpTextBrowser"
+msgid "Do you want Vidalia to open the link in your Web browser?"
+msgstr ""
+
+#: helptextbrowser.cpp:88
+msgctxt "HelpTextBrowser"
+msgid "Unable to Open Link"
+msgstr ""
+
+#: helptextbrowser.cpp:90
+msgctxt "HelpTextBrowser"
+msgid "Vidalia was unable to open the selected link in your Web browser. You can still copy the URL and paste it into your browser."
+msgstr ""
+
+#: licensedialog.ui:13
+msgctxt "LicenseDialog"
+msgid "License Information"
+msgstr ""
+
+#: licensedialog.ui:43
+msgctxt "LicenseDialog"
+msgid "License"
+msgstr ""
+
+#: licensedialog.ui:76
+msgctxt "LicenseDialog"
+msgid "Credits"
+msgstr ""
+
+#: logevent.cpp:57
+msgctxt "LogEvent"
+msgid "Debug"
+msgstr ""
+
+#: logevent.cpp:58
+msgctxt "LogEvent"
+msgid "Info"
+msgstr ""
+
+#: logevent.cpp:59
+msgctxt "LogEvent"
+msgid "Notice"
+msgstr ""
+
+#: logevent.cpp:60
+msgctxt "LogEvent"
+msgid "Warning"
+msgstr ""
+
+#: logevent.cpp:61
+msgctxt "LogEvent"
+msgid "Error"
+msgstr ""
+
+#: logevent.cpp:62
+msgctxt "LogEvent"
+msgid "Unknown"
+msgstr ""
+
+#: mainwindow.ui:233
+msgctxt "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 ""
+
+#: 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."
+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."
+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."
+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."
+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."
+msgstr ""
+
+#: mainwindow.cpp:1409
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr ""
+
+#: mainwindow.cpp:1458
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr ""
+
+#: mainwindow.cpp:1459
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr ""
+
+#: mainwindow.ui:19
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr ""
+
+#: mainwindow.ui:49
+msgctxt "MainWindow"
+msgid "Status"
+msgstr ""
+
+#: mainwindow.ui:218
+msgctxt "MainWindow"
+msgid "Vidalia Shortcuts"
+msgstr ""
+
+#: mainwindow.ui:243
+msgctxt "MainWindow"
+msgid "Setup Relaying"
+msgstr ""
+
+#: mainwindow.ui:246
+msgctxt "MainWindow"
+msgid "Set up a relay and help the network grow"
+msgstr ""
+
+#: mainwindow.ui:256
+msgctxt "MainWindow"
+msgid "View the Network"
+msgstr ""
+
+#: mainwindow.ui:259
+msgctxt "MainWindow"
+msgid "View a map of the Tor network"
+msgstr ""
+
+#: mainwindow.ui:272
+msgctxt "MainWindow"
+msgid "Use a New Identity"
+msgstr ""
+
+#: mainwindow.ui:275
+msgctxt "MainWindow"
+msgid "Make subsequent connections appear new"
+msgstr ""
+
+#: mainwindow.ui:307
+msgctxt "MainWindow"
+msgid "View recent bandwidth usage"
+msgstr ""
+
+#: mainwindow.ui:320
+msgctxt "MainWindow"
+msgid "View log message history"
+msgstr ""
+
+#: mainwindow.ui:370
+msgctxt "MainWindow"
+msgid "View help documentation"
+msgstr ""
+
+#: mainwindow.ui:383
+msgctxt "MainWindow"
+msgid "Configure Vidalia"
+msgstr ""
+
+#: mainwindow.ui:433
+msgctxt "MainWindow"
+msgid "View version and license information"
+msgstr ""
+
+#: mainwindow.ui:446
+msgctxt "MainWindow"
+msgid "Exit Vidalia"
+msgstr ""
+
+#: mainwindow.ui:498
+msgctxt "MainWindow"
+msgid "Show this window on startup"
+msgstr ""
+
+#: mainwindow.ui:517
+msgctxt "MainWindow"
+msgid "Hide"
+msgstr ""
+
+#: mainwindow.ui:520
+msgctxt "MainWindow"
+msgid "Hide this window"
+msgstr ""
+
+#: mainwindow.cpp:1210
+msgctxt "MainWindow"
+msgid "Password Reset Failed"
+msgstr ""
+
+#: mainwindow.cpp:1213
+msgctxt "MainWindow"
+msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+#: messagelog.cpp:126
+msgctxt "MessageLog"
+msgid "Messages that appear when something has "
+"gone very wrong and Tor cannot proceed."
+msgstr ""
+
+#: messagelog.cpp:128
+msgctxt "MessageLog"
+msgid "Messages that only appear when "
+"something has gone wrong with Tor."
+msgstr ""
+
+#: messagelog.cpp:132
+msgctxt "MessageLog"
+msgid "Messages that appear infrequently "
+"during normal Tor operation and are "
+"not considered errors, but you may "
+"care about."
+msgstr ""
+
+#: messagelog.cpp:134
+msgctxt "MessageLog"
+msgid "Messages that appear frequently "
+"during normal Tor operation."
+msgstr ""
+
+#: 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 ""
+
+#: messagelog.ui:356
+msgctxt "MessageLog"
+msgid "Always Save New Log Messages"
+msgstr ""
+
+#: messagelog.ui:371
+msgctxt "MessageLog"
+msgid "Browse"
+msgstr ""
+
+#: messagelog.ui:394
+msgctxt "MessageLog"
+msgid "Enable automatically saving all new log messages to a file"
+msgstr ""
+
+#: messagelog.ui:397
+msgctxt "MessageLog"
+msgid "Automatically save new log messages to a file"
+msgstr ""
+
+#: netviewer.ui:24
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr ""
+
+#: netviewer.ui:239
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr ""
+
+#: netviewer.ui:245
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr ""
+
+#: netviewer.ui:248
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr ""
+
+#: netviewer.ui:256
+msgctxt "NetViewer"
+msgid "Help"
+msgstr ""
+
+#: netviewer.ui:259
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr ""
+
+#: netviewer.ui:262
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr ""
+
+#: netviewer.ui:265
+msgctxt "NetViewer"
+msgid "F1"
+msgstr ""
+
+#: netviewer.ui:273
+msgctxt "NetViewer"
+msgid "Close"
+msgstr ""
+
+#: netviewer.ui:279
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr ""
+
+#: netviewer.ui:282
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr ""
+
+#: netviewer.ui:290
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr ""
+
+#: netviewer.ui:296
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr ""
+
+#: netviewer.ui:299
+msgctxt "NetViewer"
+msgid "+"
+msgstr ""
+
+#: netviewer.ui:307
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr ""
+
+#: netviewer.ui:313
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr ""
+
+#: netviewer.ui:316
+msgctxt "NetViewer"
+msgid "-"
+msgstr ""
+
+#: netviewer.ui:324
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr ""
+
+#: netviewer.ui:330
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr ""
+
+#: netviewer.ui:333
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr ""
+
+#: networkpage.cpp:193
+msgctxt "NetworkPage"
+msgid "Invalid Bridge"
+msgstr ""
+
+#: networkpage.cpp:194
+msgctxt "NetworkPage"
+msgid "The specified bridge identifier is not valid."
+msgstr ""
+
+#: networkpage.cpp:241
+msgctxt "NetworkPage"
+msgid "Copy (Ctrl+C)"
+msgstr ""
+
+#: networkpage.cpp:272
+msgctxt "NetworkPage"
+msgid "You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet."
+msgstr ""
+
+#: networkpage.cpp:278
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr ""
+
+#: networkpage.cpp:314
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr ""
+
+#: networkpage.ui:25
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:28
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr ""
+
+#: networkpage.ui:58
+msgctxt "NetworkPage"
+msgid "Proxy Settings"
+msgstr ""
+
+#: networkpage.ui:70
+msgctxt "NetworkPage"
+msgid "HTTP Proxy:"
+msgstr ""
+
+#: networkpage.ui:80
+msgctxt "NetworkPage"
+msgid "Username:"
+msgstr ""
+
+#: networkpage.ui:90
+msgctxt "NetworkPage"
+msgid "Use this proxy for HTTPS also"
+msgstr ""
+
+#: networkpage.ui:108
+msgctxt "NetworkPage"
+msgid "Password:"
+msgstr ""
+
+#: networkpage.ui:135
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr ""
+
+#: networkpage.ui:176
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+#: networkpage.ui:179
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr ""
+
+#: networkpage.ui:203
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr ""
+
+#: networkpage.ui:215
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr ""
+
+#: networkpage.ui:225
+msgctxt "NetworkPage"
+msgid "80, 443"
+msgstr ""
+
+#: networkpage.ui:235
+msgctxt "NetworkPage"
+msgid "Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network"
+msgstr ""
+
+#: networkpage.ui:238
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr ""
+
+#: networkpage.ui:262
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr ""
+
+#: networkpage.ui:274
+msgctxt "NetworkPage"
+msgid "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 "Add a Bridge:"
+msgstr ""
+
+#: networkpage.ui:318
+msgctxt "NetworkPage"
+msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>"
+msgstr ""
+
+#: networkpage.ui:383
+msgctxt "NetworkPage"
+msgid "Remove the selected bridges from the list"
+msgstr ""
+
+#: networkpage.ui:399
+msgctxt "NetworkPage"
+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 "%1 days "
+msgstr ""
+
+#: routerdescriptorview.cpp:103
+msgctxt "RouterDescriptorView"
+msgid "%1 hours "
+msgstr ""
+
+#: routerdescriptorview.cpp:106
+msgctxt "RouterDescriptorView"
+msgid "%1 mins "
+msgstr ""
+
+#: routerdescriptorview.cpp:109
+msgctxt "RouterDescriptorView"
+msgid "%1 secs"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: serverpage.cpp:145
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: serverpage.ui:466
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr ""
+
+#: serverpage.ui:471
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr ""
+
+#: serverpage.ui:476
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr ""
+
+#: serverpage.ui:481
+msgctxt "ServerPage"
+msgid "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:486
+msgctxt "ServerPage"
+msgid "> 1.5 Mbps"
+msgstr ""
+
+#: serverpage.ui:491
+msgctxt "ServerPage"
+msgid "Custom"
+msgstr ""
+
+#: serverpage.ui:456
+msgctxt "ServerPage"
+msgid "Select the entry that most closely resembles your Internet connection"
+msgstr ""
+
+#: serverpage.ui:502
+msgctxt "ServerPage"
+msgid "Show help topic on bandwidth rate limits"
+msgstr ""
+
+#: serverpage.ui:591
+msgctxt "ServerPage"
+msgid "Average Rate"
+msgstr ""
+
+#: serverpage.ui:620
+msgctxt "ServerPage"
+msgid "Long-term average bandwidth limit"
+msgstr ""
+
+#: serverpage.ui:708
+msgctxt "ServerPage"
+msgid "KB/s"
+msgstr ""
+
+#: serverpage.ui:666
+msgctxt "ServerPage"
+msgid "Maximum Rate"
+msgstr ""
+
+#: serverpage.ui:695
+msgctxt "ServerPage"
+msgid "Peak bandwidth rate limit"
+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 ""
+
+#: serverpage.ui:400
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr ""
+
+#: serverpage.ui:802
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr ""
+
+#: serverpage.ui:805
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr ""
+
+#: serverpage.ui:815
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr ""
+
+#: serverpage.ui:818
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr ""
+
+#: serverpage.ui:828
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr ""
+
+#: serverpage.ui:831
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr ""
+
+#: serverpage.ui:841
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr ""
+
+#: serverpage.ui:844
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr ""
+
+#: serverpage.ui:854
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr ""
+
+#: serverpage.ui:857
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr ""
+
+#: serverpage.ui:867
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr ""
+
+#: serverpage.ui:870
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr ""
+
+#: serverpage.ui:896
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr ""
+
+#: serverpage.ui:969
+msgctxt "ServerPage"
+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 ""
+
+#: serverpage.ui:764
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr ""
+
+#: serverpage.ui:1015
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+#: serverpage.ui:1039
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+#: serverpage.ui:1061
+msgctxt "ServerPage"
+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."
+msgstr ""
+
+#: servicepage.cpp:597
+msgctxt "ServicePage"
+msgid "Error"
+msgstr ""
+
+#: servicepage.cpp:452
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr ""
+
+#: servicepage.cpp:458
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr ""
+
+#: servicepage.cpp:547
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr ""
+
+#: servicepage.cpp:578
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+#: servicepage.cpp:598
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr ""
+
+#: servicepage.ui:19
+msgctxt "ServicePage"
+msgid "Form"
+msgstr ""
+
+#: servicepage.ui:31
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+#: servicepage.ui:56
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr ""
+
+#: servicepage.ui:61
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr ""
+
+#: servicepage.ui:66
+msgctxt "ServicePage"
+msgid "Target"
+msgstr ""
+
+#: servicepage.ui:71
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr ""
+
+#: servicepage.ui:76
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr ""
+
+#: servicepage.ui:84
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr ""
+
+#: servicepage.ui:97
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr ""
+
+#: servicepage.ui:110
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+#: servicepage.ui:123
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+#: servicepage.cpp:384
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+#: stream.cpp:131
+msgctxt "Stream"
+msgid "New"
+msgstr ""
+
+#: stream.cpp:133
+msgctxt "Stream"
+msgid "Resolving"
+msgstr ""
+
+#: stream.cpp:134
+msgctxt "Stream"
+msgid "Connecting"
+msgstr ""
+
+#: stream.cpp:135
+msgctxt "Stream"
+msgid "Open"
+msgstr ""
+
+#: stream.cpp:136
+msgctxt "Stream"
+msgid "Failed"
+msgstr ""
+
+#: stream.cpp:137
+msgctxt "Stream"
+msgid "Closed"
+msgstr ""
+
+#: stream.cpp:138
+msgctxt "Stream"
+msgid "Retrying"
+msgstr ""
+
+#: stream.cpp:139
+msgctxt "Stream"
+msgid "Remapped"
+msgstr ""
+
+#: stream.cpp:140
+msgctxt "Stream"
+msgid "Unknown"
+msgstr ""
+
+#: torprocess.cpp:107
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr ""
+
+#: torservice.cpp:143
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr ""
+
+#: torservice.cpp:161
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr ""
+
+#: torsettings.cpp:103
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr ""
+
+#: upnpcontrol.cpp:139
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr ""
+
+#: upnpcontrol.cpp:141
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:143
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+#: upnpcontrol.cpp:145
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr ""
+
+#: upnpcontrol.cpp:147
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:149
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:151
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr ""
+
+#: upnpcontrol.cpp:153
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr ""
+
+#: upnptestdialog.cpp:112
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr ""
+
+#: upnptestdialog.cpp:117
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:122
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr ""
+
+#: upnptestdialog.cpp:127
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr ""
+
+#: upnptestdialog.ui:13
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr ""
+
+#: upnptestdialog.ui:92
+msgctxt "UPNPTestDialog"
+msgid "Testing Universal Plug & Play Support"
+msgstr ""
+
+#: vmessagebox.cpp:77
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr ""
+
+#: vmessagebox.cpp:78
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr ""
+
+#: vmessagebox.cpp:79
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr ""
+
+#: vmessagebox.cpp:80
+msgctxt "VMessageBox"
+msgid "No"
+msgstr ""
+
+#: vmessagebox.cpp:81
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr ""
+
+#: vmessagebox.cpp:82
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr ""
+
+#: vmessagebox.cpp:83
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr ""
+
+#: vmessagebox.cpp:84
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr ""
+
+#: vmessagebox.cpp:85
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr ""
+
+#: vmessagebox.cpp:86
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr ""
+
+#: vmessagebox.cpp:87
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr ""
+
+#: main.cpp:75
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr ""
+
+#: main.cpp:89
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr ""
+
+#: main.cpp:95
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway."
+""
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+#: vidalia.cpp:169
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr ""
+
+#: vidalia.cpp:171
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr ""
+
+#: vidalia.cpp:173
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr ""
+
+#: vidalia.cpp:175
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr ""
+
+#: vidalia.cpp:177
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr ""
+
+#: vidalia.cpp:180
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr ""
+
+#: vidalia.cpp:183
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr ""
+
+#: vidalia.cpp:186
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr ""
+
+#: vidalia.cpp:190
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr ""
+
+#: vidalia.cpp:238
+msgctxt "Vidalia"
+msgid "Invalid language code specified: "
+msgstr ""
+
+#: vidalia.cpp:245
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified: "
+msgstr ""
+
+#: vidalia.cpp:251
+msgctxt "Vidalia"
+msgid "Invalid log level specified: "
+msgstr ""
+
+#: vidalia.cpp:257
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr ""
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_TW/qt_zh_TW.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_TW/qt_zh_TW.po
new file mode 100644
index 0000000..e39c0c5
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_TW/qt_zh_TW.po
@@ -0,0 +1,436 @@
+msgid ""
+msgstr ""
+"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: 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"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+#: qaccessibleobject.cpp:348
+msgctxt "QApplication"
+msgid "Activate"
+msgstr "啟動"
+
+#: qmessagebox.h:319
+msgctxt "QApplication"
+msgid "Executable '%1' requires Qt %2, found Qt %3."
+msgstr "執行檔 %1 需要 Qt %2，但只找到 Qt %3。"
+
+#: qmessagebox.h:321
+msgctxt "QApplication"
+msgid "Incompatible Qt Library Error"
+msgstr "Qt 函式庫不相容的錯誤"
+
+#: qapplication.cpp:2095
+msgctxt "QApplication"
+msgid "QT_LAYOUT_DIRECTION"
+msgstr "LTR"
+
+#: qaccessibleobject.cpp:350
+msgctxt "QApplication"
+msgid "Activates the program's main window"
+msgstr "啟動程式的主視窗"
+
+#: qmessagebox.cpp:2104
+msgctxt "QDialogButtonBox"
+msgid "OK"
+msgstr "確定"
+
+#: qdialogbuttonbox.cpp:528
+msgctxt "QDialogButtonBox"
+msgid "Save"
+msgstr "儲存"
+
+#: qdialogbuttonbox.cpp:531
+msgctxt "QDialogButtonBox"
+msgid "Open"
+msgstr "開啟"
+
+#: qdialogbuttonbox.cpp:534
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
+msgstr "取消"
+
+#: qdialogbuttonbox.cpp:537
+msgctxt "QDialogButtonBox"
+msgid "Close"
+msgstr "關閉"
+
+#: qdialogbuttonbox.cpp:540
+msgctxt "QDialogButtonBox"
+msgid "Apply"
+msgstr "套用"
+
+#: qdialogbuttonbox.cpp:543
+msgctxt "QDialogButtonBox"
+msgid "Reset"
+msgstr "重置"
+
+#: qdialogbuttonbox.cpp:546
+msgctxt "QDialogButtonBox"
+msgid "Help"
+msgstr "說明"
+
+#: qdialogbuttonbox.cpp:550
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
+msgstr "不要儲存"
+
+#: qdialogbuttonbox.cpp:554
+msgctxt "QDialogButtonBox"
+msgid "Discard"
+msgstr "丟棄"
+
+#: qdialogbuttonbox.cpp:557
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
+msgstr "是(&Y)"
+
+#: qdialogbuttonbox.cpp:560
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
+msgstr "全部回答是(&A)"
+
+#: qdialogbuttonbox.cpp:563
+msgctxt "QDialogButtonBox"
+msgid "&No"
+msgstr "否(&N)"
+
+#: qdialogbuttonbox.cpp:566
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
+msgstr "全部回答否(&O)"
+
+#: qdialogbuttonbox.cpp:569
+msgctxt "QDialogButtonBox"
+msgid "Save All"
+msgstr "全部儲存"
+
+#: qdialogbuttonbox.cpp:572
+msgctxt "QDialogButtonBox"
+msgid "Abort"
+msgstr "中止"
+
+#: qdialogbuttonbox.cpp:575
+msgctxt "QDialogButtonBox"
+msgid "Retry"
+msgstr "重試"
+
+#: qdialogbuttonbox.cpp:578
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
+msgstr "忽略"
+
+#: qdialogbuttonbox.cpp:581
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
+msgstr "回復預設值"
+
+#: qdialogbuttonbox.cpp:552
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
+msgstr "關閉而不儲存"
+
+#: qdialogbuttonbox.cpp:525
+msgctxt "QDialogButtonBox"
+msgid "&OK"
+msgstr "確定(&O)"
+
+#: qdirmodel.cpp:423
+msgctxt "QDirModel"
+msgid "Name"
+msgstr "名稱"
+
+#: qdirmodel.cpp:424
+msgctxt "QDirModel"
+msgid "Size"
+msgstr "大小"
+
+#: qdirmodel.cpp:427
+msgctxt "QDirModel"
+msgid "Kind"
+msgstr "種類"
+
+#: qdirmodel.cpp:429
+msgctxt "QDirModel"
+msgid "Type"
+msgstr "型態"
+
+#: qdirmodel.cpp:435
+msgctxt "QDirModel"
+msgid "Date Modified"
+msgstr "變更日期"
+
+#: qfiledialog_win.cpp:126
+msgctxt "QFileDialog"
+msgid "All Files (*)"
+msgstr "所有檔案（*）"
+
+#: qfiledialog.cpp:881
+msgctxt "QFileDialog"
+msgid "Directories"
+msgstr "目錄"
+
+#: qfiledialog.cpp:2408
+msgctxt "QFileDialog"
+msgid "&Open"
+msgstr "開啟(&O)"
+
+#: qfiledialog.cpp:919
+msgctxt "QFileDialog"
+msgid "&Save"
+msgstr "儲存(&S)"
+
+#: qfiledialog.cpp:435
+msgctxt "QFileDialog"
+msgid "Open"
+msgstr "開啟"
+
+#: qfiledialog.cpp:1670
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"%1 already exists.\n"
+"Do you want to replace it?"
+msgstr "%1 已存在您要取代它嗎？"
+
+#: qfiledialog.cpp:1690
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"File not found.\n"
+"Please verify the correct file name was given."
+msgstr "%1找不到檔案。請檢查檔名是否正確。"
+
+#: qdirmodel.cpp:833
+msgctxt "QFileDialog"
+msgid "My Computer"
+msgstr "我的電腦"
+
+#: qfiledialog.cpp:462
+msgctxt "QFileDialog"
+msgid "&Rename"
+msgstr "重新命名(&R)"
+
+#: qfiledialog.cpp:463
+msgctxt "QFileDialog"
+msgid "&Delete"
+msgstr "刪除(&D)"
+
+#: qfiledialog.cpp:464
+msgctxt "QFileDialog"
+msgid "Show &hidden files"
+msgstr "顯示隱藏檔(&H)"
+
+#: ui_qfiledialog.h:264
+msgctxt "QFileDialog"
+msgid "Back"
+msgstr "返回"
+
+#: ui_qfiledialog.h:274
+msgctxt "QFileDialog"
+msgid "Parent Directory"
+msgstr "父目錄"
+
+#: ui_qfiledialog.h:284
+msgctxt "QFileDialog"
+msgid "List View"
+msgstr "列表檢視"
+
+#: ui_qfiledialog.h:289
+msgctxt "QFileDialog"
+msgid "Detail View"
+msgstr "詳細檢視"
+
+#: ui_qfiledialog.h:292
+msgctxt "QFileDialog"
+msgid "Files of type:"
+msgstr "檔案型態："
+
+#: qfiledialog.cpp:883
+msgctxt "QFileDialog"
+msgid "Directory:"
+msgstr "目錄："
+
+#: qfiledialog.cpp:2476
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"%1\n"
+"Directory not found.\n"
+"Please verify the correct directory name was given."
+msgstr "%1找不到目錄。請檢查目錄名稱是否正確。"
+
+#: qfiledialog.cpp:2281
+#, fuzzy
+msgctxt "QFileDialog"
+msgid ""
+"'%1' is write protected.\n"
+"Do you want to delete it anyway?"
+msgstr "%1 有寫入保護。您確定要刪除它嗎？"
+
+#: qfiledialog.cpp:2286
+msgctxt "QFileDialog"
+msgid "Are sure you want to delete '%1'?"
+msgstr "您確定要刪除 %1 嗎？"
+
+#: qfiledialog.cpp:2299
+msgctxt "QFileDialog"
+msgid "Could not delete directory."
+msgstr "無法刪除目錄。"
+
+#: qfiledialog_win.cpp:128
+msgctxt "QFileDialog"
+msgid "All Files (*.*)"
+msgstr "所有檔案（*.*）"
+
+#: qfiledialog.cpp:437
+msgctxt "QFileDialog"
+msgid "Save As"
+msgstr "另存新檔"
+
+#: qfileiconprovider.cpp:379
+msgctxt "QFileDialog"
+msgid "Drive"
+msgstr "磁碟"
+
+#: qfileiconprovider.cpp:383
+msgctxt "QFileDialog"
+msgid "File"
+msgstr "檔案"
+
+#: qfileiconprovider.cpp:412
+msgctxt "QFileDialog"
+msgid "Unknown"
+msgstr "未知"
+
+#: qfiledialog.cpp:439
+msgctxt "QFileDialog"
+msgid "Find Directory"
+msgstr "尋找目錄"
+
+#: qfiledialog.cpp:458
+msgctxt "QFileDialog"
+msgid "Show "
+msgstr "顯示 "
+
+#: ui_qfiledialog.h:269
+msgctxt "QFileDialog"
+msgid "Forward"
+msgstr "往前"
+
+#: qfiledialog.cpp:2137
+msgctxt "QFileDialog"
+msgid "New Folder"
+msgstr "新資料夾"
+
+#: qfiledialog.cpp:465
+msgctxt "QFileDialog"
+msgid "&New Folder"
+msgstr "新增資料夾(&N)"
+
+#: qfiledialog.cpp:917
+msgctxt "QFileDialog"
+msgid "&Choose"
+msgstr "選擇(&C)"
+
+#: qsidebar.cpp:388
+msgctxt "QFileDialog"
+msgid "Remove"
+msgstr "移除"
+
+#: qfiledialog.cpp:886
+msgctxt "QFileDialog"
+msgid "File &name:"
+msgstr "檔名(&N)："
+
+#: ui_qfiledialog.h:261
+msgctxt "QFileDialog"
+msgid "Look in:"
+msgstr "尋找於："
+
+#: ui_qfiledialog.h:279
+msgctxt "QFileDialog"
+msgid "Create New Folder"
+msgstr "建立新資料夾"
+
+#: qfilesystemmodel.cpp:761
+msgctxt "QFileSystemModel"
+msgid "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."
+msgstr ""
+"<b>無法使用名稱 \"%1\"。</b><p>請使用其它名稱，字元數少一點，或是不要有標點符"
+"號。"
+
+#: qfilesystemmodel.cpp:832
+msgctxt "QFileSystemModel"
+msgid "Name"
+msgstr "名稱"
+
+#: qfilesystemmodel.cpp:834
+msgctxt "QFileSystemModel"
+msgid "Size"
+msgstr "大小"
+
+#: qfilesystemmodel.cpp:838
+msgctxt "QFileSystemModel"
+msgid "Kind"
+msgstr "種類"
+
+#: qfilesystemmodel.cpp:840
+msgctxt "QFileSystemModel"
+msgid "Type"
+msgstr "型態"
+
+#: qfilesystemmodel.cpp:847
+msgctxt "QFileSystemModel"
+msgid "Date Modified"
+msgstr "變更日期"
+
+#: qfilesystemmodel_p.h:198
+msgctxt "QFileSystemModel"
+msgid "My Computer"
+msgstr "我的電腦"
+
+#: qfilesystemmodel_p.h:200
+msgctxt "QFileSystemModel"
+msgid "Computer"
+msgstr "電腦"
+
+#: 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 位元組"
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_TW/vidalia_zh_TW.po b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_TW/vidalia_zh_TW.po
new file mode 100644
index 0000000..d555d3c
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/i18n/zh_TW/vidalia_zh_TW.po
@@ -0,0 +1,3293 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia\n"
+"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
+"POT-Creation-Date: 2009-05-19 23:56+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"X-Generator: Vidalia ts2po 0.2\n"
+
+msgctxt "AboutDialog"
+msgid "About Vidalia"
+msgstr "關於 Vidalia"
+
+msgctxt "AboutDialog"
+msgid "License"
+msgstr "授權"
+
+msgctxt "AboutDialog"
+msgid "Vidalia 0.2.0"
+msgstr "Vidalia"
+
+msgctxt "AboutDialog"
+msgid "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' 並非有效 IP 地址."
+
+msgctxt "AdvancedPage"
+msgid "You selected 'Password' authentication, but did not specify a password."
+msgstr "你選擇了 '密碼' 驗證方式,但是你並未指定密碼。"
+
+msgctxt "AdvancedPage"
+msgid "Select Tor Configuration File"
+msgstr "請選擇 Tor 配置文件"
+
+msgctxt "AdvancedPage"
+msgid "File Not Found"
+msgstr "查無此檔"
+
+msgctxt "AdvancedPage"
+msgid "%1 does not exist. Would you like to create it?"
+msgstr "%1 不存在。請問是否要新增該文件?"
+
+msgctxt "AdvancedPage"
+msgid "Failed to Create File"
+msgstr "新增檔案失敗"
+
+msgctxt "AdvancedPage"
+msgid "Unable to create %1 [%2]"
+msgstr "無法新增 %1 [%2]"
+
+msgctxt "AdvancedPage"
+msgid "Select a Directory to Use for Tor Data"
+msgstr "請選擇一個用於保存 Tor 數據的檔案夾"
+
+msgctxt "AdvancedPage"
+msgid "Unable to remove Tor Service"
+msgstr "無法移除 Tor 服務"
+
+msgctxt "AdvancedPage"
+msgid "Unable to install Tor Service"
+msgstr "無法安裝 Tor 服務"
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to install the Tor service."
+msgstr "Vidalia 無法安裝 Tor 服務。"
+
+msgctxt "AdvancedPage"
+msgid "Control Port"
+msgstr "控制連接埠"
+
+msgctxt "AdvancedPage"
+msgid "Authentication:"
+msgstr "驗證:"
+
+msgctxt "AdvancedPage"
+msgid "Address:"
+msgstr "地址:"
+
+msgctxt "AdvancedPage"
+msgid "None"
+msgstr "無"
+
+msgctxt "AdvancedPage"
+msgid "Cookie"
+msgstr "Cookie"
+
+msgctxt "AdvancedPage"
+msgid "Password"
+msgstr "密碼"
+
+msgctxt "AdvancedPage"
+msgid "Randomly Generate"
+msgstr "隨機產生"
+
+msgctxt "AdvancedPage"
+msgid ":"
+msgstr ":"
+
+msgctxt "AdvancedPage"
+msgid "Tor Configuration File"
+msgstr "Tor 初始設定檔"
+
+msgctxt "AdvancedPage"
+msgid "Start the Tor software with the specified configuration file (torrc)"
+msgstr ""
+
+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 ""
+
+msgctxt "AdvancedPage"
+msgid "Vidalia was unable to remove the Tor service.\n"
+"\n"
+"You may need to remove it manually."
+msgstr ""
+
+msgctxt "AppearancePage"
+msgid "Language"
+msgstr "語言"
+
+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 "BandwidthGraph"
+msgid "Since:"
+msgstr "起始時間:"
+
+msgctxt "BandwidthGraph"
+msgid "Hide Settings"
+msgstr "隱藏設定"
+
+msgctxt "BandwidthGraph"
+msgid "Show Settings"
+msgstr "顯示設定"
+
+msgctxt "BandwidthGraph"
+msgid "Tor Bandwidth Usage"
+msgstr "Tor 可使用的頻寬"
+
+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 ""
+
+msgctxt "BridgeDownloader"
+msgid "Connecting to %1:%2..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Sending an HTTPS request for bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloader"
+msgid "Downloading a list of bridges..."
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Downloading Bridges"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Unable to download bridges: %1"
+msgstr ""
+
+msgctxt "BridgeDownloaderProgressDialog"
+msgid "Retrying bridge request..."
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Country"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "# Clients"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Clients from the following countries have used your relay since %1"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Bridge Usage Summary"
+msgstr ""
+
+msgctxt "BridgeUsageDialog"
+msgid "Client Summary"
+msgstr ""
+
+msgctxt "Circuit"
+msgid "New"
+msgstr "新建"
+
+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 "Vidalia 無法保存你的 %1 設定."
+
+msgctxt "ConfigDialog"
+msgid "Error Applying Settings"
+msgstr "套用設定時發生錯誤"
+
+msgctxt "ConfigDialog"
+msgid "Vidalia was unable to apply your %1 settings to Tor."
+msgstr "Vidalia 無法應用你的 %1 設定於 Tor."
+
+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 ""
+
+msgctxt "ControlSocket"
+msgid "Control socket is not connected."
+msgstr "控制接口當前未連接."
+
+msgctxt "ControlSocket"
+msgid "Error sending control command. [%1]"
+msgstr "發送控制命令時發生錯誤. [%1]"
+
+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 "關於 Vidalia"
+
+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"
+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 "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 "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 "The proxy arguments specified are not properly formatted."
+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 "在 Vadalia 啟動時一併啟動 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 "Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Forward"
+msgstr "往後"
+
+msgctxt "HelpBrowser"
+msgid "Move to next page (Shift+Backspace)"
+msgstr "移動至下一頁(Shift+Backspace)"
+
+msgctxt "HelpBrowser"
+msgid "Shift+Backspace"
+msgstr "Shift+Backspace"
+
+msgctxt "HelpBrowser"
+msgid "Home"
+msgstr "主頁"
+
+msgctxt "HelpBrowser"
+msgid "Move to the Home page (Ctrl+H)"
+msgstr "回到主頁(Ctrl+H)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+H"
+msgstr "Ctrl+H"
+
+msgctxt "HelpBrowser"
+msgid "Find"
+msgstr "尋找"
+
+msgctxt "HelpBrowser"
+msgid "Search for a word or phrase on current page (Ctrl+F)"
+msgstr "在目前的頁面搜索關鍵詞或語句(Ctrl+F)"
+
+msgctxt "HelpBrowser"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "HelpBrowser"
+msgid "Close"
+msgstr "關閉"
+
+msgctxt "HelpBrowser"
+msgid "Close Vidalia Help"
+msgstr "關閉 Vidalia 說明"
+
+msgctxt "HelpBrowser"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "HelpBrowser"
+msgid "Find:"
+msgstr "搜尋:"
+
+msgctxt "HelpBrowser"
+msgid "Find Previous"
+msgstr "向前搜尋"
+
+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 "你要 Vidalia 啟動你的瀏覽器以開啟連結嗎?"
+
+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 "MainWindow"
+msgid "Start Tor"
+msgstr "啟動 Tor"
+
+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 "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 "查看"
+
+msgctxt "MainWindow"
+msgid "Vidalia Help"
+msgstr "Vidalia 說明"
+
+msgctxt "MainWindow"
+msgid "Error starting web browser"
+msgstr "啟動網頁瀏覽器時發生錯誤"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured web browser"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error starting IM client"
+msgstr "啟動 IM 客戶端時發生錯誤"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured IM client"
+msgstr "Vidalia 無法啟動已初始設定之 IM 客戶端"
+
+msgctxt "MainWindow"
+msgid "Error starting proxy server"
+msgstr "啟動代理伺服器時發生錯誤"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start the configured proxy server"
+msgstr "Vidalia 無法啟動已初始設定的代理伺服器"
+
+msgctxt "MainWindow"
+msgid "Connecting to a relay directory"
+msgstr "正在連線至中繼站目錄"
+
+msgctxt "MainWindow"
+msgid "Establishing an encrypted directory connection"
+msgstr "正在建立加密的目錄連線"
+
+msgctxt "MainWindow"
+msgid "Retrieving network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading network status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Loading authority certificates"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Requesting relay information"
+msgstr "正在要求中繼站資訊"
+
+msgctxt "MainWindow"
+msgid "Loading relay information"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Connecting to the Tor network"
+msgstr "正在連線至 Tor 網路"
+
+msgctxt "MainWindow"
+msgid "Establishing a Tor circuit"
+msgstr "正在建立 Tor 迴路"
+
+msgctxt "MainWindow"
+msgid "Connected to the Tor network!"
+msgstr "已連線到 Tor 網路!"
+
+msgctxt "MainWindow"
+msgid "Unrecognized startup status"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "miscellaneous"
+msgstr "雜項"
+
+msgctxt "MainWindow"
+msgid "identity mismatch"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "done"
+msgstr "完成"
+
+msgctxt "MainWindow"
+msgid "connection refused"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "connection timeout"
+msgstr "連線逾時"
+
+msgctxt "MainWindow"
+msgid "read/write error"
+msgstr "讀寫錯誤"
+
+msgctxt "MainWindow"
+msgid "no route to host"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "insufficient resources"
+msgstr "資源不足"
+
+msgctxt "MainWindow"
+msgid "unknown"
+msgstr "未知"
+
+msgctxt "MainWindow"
+msgid "Tor is not running"
+msgstr "Tor 沒有運作"
+
+msgctxt "MainWindow"
+msgid "Tor is shutting down"
+msgstr "正在關閉 Tor"
+
+msgctxt "MainWindow"
+msgid "Stop Tor Now"
+msgstr "立刻停用 Tor"
+
+msgctxt "MainWindow"
+msgid "Stop Tor"
+msgstr "停用 Tor"
+
+msgctxt "MainWindow"
+msgid "Starting the Tor software"
+msgstr "正在啟動 Tor 軟體"
+
+msgctxt "MainWindow"
+msgid "Starting Tor"
+msgstr "正在啟動 Tor"
+
+msgctxt "MainWindow"
+msgid "Error Starting Tor"
+msgstr "啟動 Tor 時發生錯誤"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified."
+msgstr "Vidalia 無法啟動 Tor.請檢查 Tor 可執行程序的路徑以及設定是否正確."
+
+msgctxt "MainWindow"
+msgid "Connecting to Tor"
+msgstr "正在連線至 Tor"
+
+msgctxt "MainWindow"
+msgid "Connection Error"
+msgstr "連線錯誤"
+
+msgctxt "MainWindow"
+msgid "Relaying is Enabled"
+msgstr "中繼功能已啟用"
+
+msgctxt "MainWindow"
+msgid "Error Shutting Down"
+msgstr "關閉時發生錯誤"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to stop the Tor software."
+msgstr "Vidalia 無法停止 Tor 軟體。"
+
+msgctxt "MainWindow"
+msgid "Unexpected Error"
+msgstr "無可預期之錯誤"
+
+msgctxt "MainWindow"
+msgid "Authenticating to Tor"
+msgstr "正在登入 Tor"
+
+msgctxt "MainWindow"
+msgid "Cookie Authentication Required"
+msgstr "需要 Cookie 驗證"
+
+msgctxt "MainWindow"
+msgid "The Tor software requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
+msgstr "你要自己瀏覽 'control_auth_cookie' 文件嗎?"
+
+msgctxt "MainWindow"
+msgid "Data Directory"
+msgstr "資料目錄"
+
+msgctxt "MainWindow"
+msgid "Control 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."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Authentication Error"
+msgstr "驗證錯誤"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Please check your control port authentication settings."
+msgstr "請檢查控制端口驗證設定."
+
+msgctxt "MainWindow"
+msgid "Tor Update Available"
+msgstr "Tor 有新版本"
+
+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 的官網，下載最新版本。"
+
+msgctxt "MainWindow"
+msgid "Tor website: %1"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "All subsequent connections will appear to be different than your old connections."
+msgstr "所有接下來的連接將會不同於之前的連接."
+
+msgctxt "MainWindow"
+msgid "Failed to Create New Identity"
+msgstr "無法更換新身份"
+
+msgctxt "MainWindow"
+msgid "Port Forwarding Failed"
+msgstr "轉送連接埠失敗"
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to configure automatic port forwarding."
+msgstr "Vidalia 無法設定自動連接埠轉送功能"
+
+msgctxt "MainWindow"
+msgid "Vidalia Control Panel"
+msgstr "Vidalia 控制面板"
+
+msgctxt "MainWindow"
+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 "讓自己的電腦成為中繼站，協助 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 ""
+
+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 "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 "Tor 有新版本"
+
+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 "Vidalia 無法停止 Tor 軟體。"
+
+msgctxt "MainWindow"
+msgid "The following error occurred:"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
+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 ""
+
+msgctxt "MainWindow"
+msgid ", probably Telnet,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ", probably an email client,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MainWindow"
+msgid "File"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "About Vidalia"
+msgstr "關於 Vidalia"
+
+msgctxt "MainWindow"
+msgid "Home"
+msgstr "主頁"
+
+msgctxt "MainWindow"
+msgid "Check For Updates"
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Error Setting Filter"
+msgstr "設定過濾條件時發生錯誤"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to register for Tor's log events."
+msgstr "Vidalia 無法註冊 Tor 日誌事件."
+
+msgctxt "MessageLog"
+msgid "Error Opening Log File"
+msgstr "打開日誌文件時發生錯誤"
+
+msgctxt "MessageLog"
+msgid "Vidalia was unable to open the specified log file."
+msgstr "Vidalia 無法打開指定的日誌文件."
+
+msgctxt "MessageLog"
+msgid "Log Filename Required"
+msgstr "必須指定日誌文件名"
+
+msgctxt "MessageLog"
+msgid "You must enter a filename to be able to save log messages to a file."
+msgstr "必須指定保存消息文件的文件名."
+
+msgctxt "MessageLog"
+msgid "Select Log File"
+msgstr "請選擇日誌文件"
+
+msgctxt "MessageLog"
+msgid "Save Log Messages"
+msgstr "保存日誌內容"
+
+msgctxt "MessageLog"
+msgid "Text Files (*.txt)"
+msgstr "文字檔 (*.txt)"
+
+msgctxt "MessageLog"
+msgid "Vidalia"
+msgstr "Vidalia"
+
+msgctxt "MessageLog"
+msgid "Find in Message Log"
+msgstr "查找於消息日誌"
+
+msgctxt "MessageLog"
+msgid "Find:"
+msgstr "查找:"
+
+msgctxt "MessageLog"
+msgid "Not Found"
+msgstr "未找到"
+
+msgctxt "MessageLog"
+msgid "Search found 0 matches."
+msgstr "找到 0 個匹配結果."
+
+msgctxt "MessageLog"
+msgid "Message Log"
+msgstr "消息日誌"
+
+msgctxt "MessageLog"
+msgid "Message Filters..."
+msgstr "消息過濾..."
+
+msgctxt "MessageLog"
+msgid "Set message filters"
+msgstr "設定消息過濾條件"
+
+msgctxt "MessageLog"
+msgid "History Size..."
+msgstr "日誌大小..."
+
+msgctxt "MessageLog"
+msgid "Set maximum number of messages to display"
+msgstr "設定消息最大顯示的條數"
+
+msgctxt "MessageLog"
+msgid "Clear"
+msgstr "清空"
+
+msgctxt "MessageLog"
+msgid "Clear all messages from the Message Log (Ctrl+E)"
+msgstr "清空消息日誌中的全部內容(Ctrl+E)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+E"
+msgstr "Ctrl+E"
+
+msgctxt "MessageLog"
+msgid "Copy"
+msgstr "複製"
+
+msgctxt "MessageLog"
+msgid "Copy the selected messages to the clipboard (Ctrl+C)"
+msgstr "複製選中消息至剪貼板(Ctrl+C)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+C"
+msgstr "Ctrl+C"
+
+msgctxt "MessageLog"
+msgid "Select All"
+msgstr "選擇全部"
+
+msgctxt "MessageLog"
+msgid "Select all messages (Ctrl+A)"
+msgstr "選擇全部消息(Ctrl+A)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+A"
+msgstr "Ctrl+A"
+
+msgctxt "MessageLog"
+msgid "Save All"
+msgstr "保存全部"
+
+msgctxt "MessageLog"
+msgid "Save all messages to a file"
+msgstr "保存全部消息至文件"
+
+msgctxt "MessageLog"
+msgid "Save Selected"
+msgstr "保存所選"
+
+msgctxt "MessageLog"
+msgid "Save selected messages to a file"
+msgstr "保存所選消息至文件"
+
+msgctxt "MessageLog"
+msgid "Settings"
+msgstr "設定"
+
+msgctxt "MessageLog"
+msgid "Adjust Message Log Settings"
+msgstr "調整消息日誌設定"
+
+msgctxt "MessageLog"
+msgid "Ctrl+T"
+msgstr "Ctrl+T"
+
+msgctxt "MessageLog"
+msgid "Help"
+msgstr "幫助"
+
+msgctxt "MessageLog"
+msgid "Show the help browser"
+msgstr "顯示幫助瀏覽器"
+
+msgctxt "MessageLog"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "MessageLog"
+msgid "Close"
+msgstr "關閉"
+
+msgctxt "MessageLog"
+msgid "Close the Message Log"
+msgstr "關閉消息日誌"
+
+msgctxt "MessageLog"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "MessageLog"
+msgid "Find"
+msgstr "查找"
+
+msgctxt "MessageLog"
+msgid "Find all messages containing the search text (Ctrl+F)"
+msgstr "從消息中查找文字(Ctrl+F)"
+
+msgctxt "MessageLog"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+msgctxt "MessageLog"
+msgid "Time"
+msgstr "時間"
+
+msgctxt "MessageLog"
+msgid "Type"
+msgstr "類型"
+
+msgctxt "MessageLog"
+msgid "Message"
+msgstr "內容"
+
+msgctxt "MessageLog"
+msgid "Saves the current Message Log settings"
+msgstr "保存當前消息日誌設定"
+
+msgctxt "MessageLog"
+msgid "Save Settings"
+msgstr "保存設定"
+
+msgctxt "MessageLog"
+msgid "Cancels changes made to settings"
+msgstr "放棄保存已更改的設定"
+
+msgctxt "MessageLog"
+msgid "Cancel"
+msgstr "取消"
+
+msgctxt "MessageLog"
+msgid "Message Filter"
+msgstr "消息過濾"
+
+msgctxt "MessageLog"
+msgid "Error"
+msgstr "錯誤"
+
+msgctxt "MessageLog"
+msgid "Warning"
+msgstr "警告"
+
+msgctxt "MessageLog"
+msgid "Notice"
+msgstr "注意"
+
+msgctxt "MessageLog"
+msgid "Info"
+msgstr "資訊"
+
+msgctxt "MessageLog"
+msgid "Debug"
+msgstr "除錯"
+
+msgctxt "MessageLog"
+msgid "Message Log History"
+msgstr "日誌歷史記錄"
+
+msgctxt "MessageLog"
+msgid "Number of messages to display in the message log window"
+msgstr "在日誌窗口顯示的消息條數"
+
+msgctxt "MessageLog"
+msgid "messages"
+msgstr "訊息"
+
+msgctxt "MessageLog"
+msgid "Always Save New Log 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 "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."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Hyper-verbose messages primarily of \n"
+"interest to Tor developers."
+msgstr ""
+
+msgctxt "MessageLog"
+msgid "Cannot write file %1\n"
+"\n"
+"%2."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Tor Network Map"
+msgstr "Tor 網絡地圖"
+
+msgctxt "NetViewer"
+msgid "Refresh"
+msgstr "刷新"
+
+msgctxt "NetViewer"
+msgid "Refresh the list of Tor relays and connections"
+msgstr "刷新 Tor 中繼服務器和連接信息"
+
+msgctxt "NetViewer"
+msgid "Ctrl+R"
+msgstr "Ctrl+R"
+
+msgctxt "NetViewer"
+msgid "Help"
+msgstr "說明"
+
+msgctxt "NetViewer"
+msgid "Show the network map help"
+msgstr "顯示關於網絡地圖的幫助信息"
+
+msgctxt "NetViewer"
+msgid "Show network map help"
+msgstr "顯示網絡地圖幫助"
+
+msgctxt "NetViewer"
+msgid "F1"
+msgstr "F1"
+
+msgctxt "NetViewer"
+msgid "Close"
+msgstr "關閉"
+
+msgctxt "NetViewer"
+msgid "Close the network map"
+msgstr "關閉網絡地圖"
+
+msgctxt "NetViewer"
+msgid "Esc"
+msgstr "Esc"
+
+msgctxt "NetViewer"
+msgid "Zoom In"
+msgstr "放大"
+
+msgctxt "NetViewer"
+msgid "Zoom in on the network map"
+msgstr "放大網絡地圖"
+
+msgctxt "NetViewer"
+msgid "+"
+msgstr "+"
+
+msgctxt "NetViewer"
+msgid "Zoom Out"
+msgstr "縮小"
+
+msgctxt "NetViewer"
+msgid "Zoom out on the network map"
+msgstr "縮小網絡地圖"
+
+msgctxt "NetViewer"
+msgid "-"
+msgstr "-"
+
+msgctxt "NetViewer"
+msgid "Zoom To Fit"
+msgstr "適合圖像"
+
+msgctxt "NetViewer"
+msgid "Zooms to fit all currently displayed circuits"
+msgstr "縮放網絡地圖以顯示完整回路"
+
+msgctxt "NetViewer"
+msgid "Ctrl+Z"
+msgstr "Ctrl+Z"
+
+msgctxt "NetViewer"
+msgid "Relay Not Found"
+msgstr "查無此檔"
+
+msgctxt "NetViewer"
+msgid "No details on the selected relay are available."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr "未知"
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr "Ctrl+F"
+
+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."
+msgstr "你必須指定 Tor 用於訪問網絡的 IP 地址或主機名,以及端口."
+
+msgctxt "NetworkPage"
+msgid "You must specify one or more ports to which your firewall allows you to connect."
+msgstr "你必須指定一個或多個端口用於連接防火牆."
+
+msgctxt "NetworkPage"
+msgid "'%1' is not a valid port number."
+msgstr "'%1' 不是一個有效的端口."
+
+msgctxt "NetworkPage"
+msgid "Check if your local network requires a proxy to access the Internet"
+msgstr "請勾選本項，如果你的本地網路透過代理伺服器連線至網路。"
+
+msgctxt "NetworkPage"
+msgid "I use a proxy to access the Internet"
+msgstr "我使用代理服務連線到網際網路"
+
+msgctxt "NetworkPage"
+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 "密碼:"
+
+msgctxt "NetworkPage"
+msgid "Port:"
+msgstr "連接埠:"
+
+msgctxt "NetworkPage"
+msgid "Check to only connect to relays using ports allowed by your firewall"
+msgstr ""
+
+msgctxt "NetworkPage"
+msgid "My firewall only lets me connect to certain ports"
+msgstr "我的防火牆只允許我連線至特定的連接埠"
+
+msgctxt "NetworkPage"
+msgid "Firewall Settings"
+msgstr "防火牆設定"
+
+msgctxt "NetworkPage"
+msgid "Allowed Ports:"
+msgstr "允許的連接埠 :"
+
+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 ""
+
+msgctxt "NetworkPage"
+msgid "My ISP blocks connections to the Tor network"
+msgstr "我的 ISP 不讓我連線至 Tor 網路"
+
+msgctxt "NetworkPage"
+msgid "Bridge Settings"
+msgstr "橋接設定"
+
+msgctxt "NetworkPage"
+msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted."
+msgstr ""
+
+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 "從列表中移除選中的網橋"
+
+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 "Policy"
+msgid "accept"
+msgstr "接受"
+
+msgctxt "Policy"
+msgid "reject"
+msgstr "拒絕"
+
+msgctxt "RouterDescriptor"
+msgid "Online"
+msgstr "上線"
+
+msgctxt "RouterDescriptor"
+msgid "Hibernating"
+msgstr "休眠"
+
+msgctxt "RouterDescriptor"
+msgid "Offline"
+msgstr "離線"
+
+msgctxt "RouterDescriptorView"
+msgid "Location:"
+msgstr "地理位置"
+
+msgctxt "RouterDescriptorView"
+msgid "IP Address:"
+msgstr "IP 地址:"
+
+msgctxt "RouterDescriptorView"
+msgid "Platform:"
+msgstr "系統平台:"
+
+msgctxt "RouterDescriptorView"
+msgid "Bandwidth:"
+msgstr "頻寬："
+
+msgctxt "RouterDescriptorView"
+msgid "Uptime:"
+msgstr "運行時間："
+
+msgctxt "RouterDescriptorView"
+msgid "Last Updated:"
+msgstr "最後更新:"
+
+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:"
+msgstr "狀態"
+
+msgctxt "RouterInfoDialog"
+msgid "Location:"
+msgstr "地理位置"
+
+msgctxt "RouterInfoDialog"
+msgid "IP Address:"
+msgstr "IP 地址:"
+
+msgctxt "RouterInfoDialog"
+msgid "Platform:"
+msgstr "系統平台:"
+
+msgctxt "RouterInfoDialog"
+msgid "Bandwidth:"
+msgstr "頻寬："
+
+msgctxt "RouterInfoDialog"
+msgid "Uptime:"
+msgstr "運行時間："
+
+msgctxt "RouterInfoDialog"
+msgid "Contact:"
+msgstr "信息:"
+
+msgctxt "RouterInfoDialog"
+msgid "Last Updated:"
+msgstr "最後更新:"
+
+msgctxt "RouterInfoDialog"
+msgid "Descriptor"
+msgstr ""
+
+msgctxt "RouterListItem"
+msgid "Offline"
+msgstr "離線"
+
+msgctxt "RouterListItem"
+msgid "Hibernating"
+msgstr "休眠"
+
+msgctxt "RouterListItem"
+msgid "%1 KB/s"
+msgstr "%1 KB/s"
+
+msgctxt "RouterListWidget"
+msgid "Relay"
+msgstr "中繼"
+
+msgctxt "RouterListWidget"
+msgid "Zoom to Relay"
+msgstr "移動至中繼"
+
+msgctxt "RouterListWidget"
+msgid "%1 relays online"
+msgstr "%1 上線的中繼站"
+
+msgctxt "RouterListWidget"
+msgid "Copy"
+msgstr "複製"
+
+msgctxt "RouterListWidget"
+msgid "Nickname"
+msgstr "別名"
+
+msgctxt "RouterListWidget"
+msgid "Fingerprint"
+msgstr "指紋"
+
+msgctxt "ServerPage"
+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."
+msgstr "你已將 Tor 設定為網橋中繼服務器,然而你的 Tor 版本並不支持此功能."
+
+msgctxt "ServerPage"
+msgid "Please upgrade your Tor software or configure Tor to act as a normal Tor relay."
+msgstr "請升級你的 Tor 軟件或者將 Tor 設定為普通中繼服務器."
+
+msgctxt "ServerPage"
+msgid "Your bridge relay is not running."
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "You must specify at least a relay nickname and port."
+msgstr "你必須指定至少一個中繼站名稱與連接埠。"
+
+msgctxt "ServerPage"
+msgid "Run as a client only"
+msgstr "我只想當用戶端"
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network"
+msgstr "Tor 網絡中繼"
+
+msgctxt "ServerPage"
+msgid "Relay Port:"
+msgstr "中繼連接埠:"
+
+msgctxt "ServerPage"
+msgid "Enable to mirror the relay directory"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Attempt to automatically configure port forwarding"
+msgstr "正在嘗試自動設定連接埠轉送"
+
+msgctxt "ServerPage"
+msgid "Test"
+msgstr "測試"
+
+msgctxt "ServerPage"
+msgid "Show help topic on port forwarding"
+msgstr "顯示連接埠轉送的說明內容"
+
+msgctxt "ServerPage"
+msgid "Directory Port:"
+msgstr "目錄端口:"
+
+msgctxt "ServerPage"
+msgid "Directory Port Number"
+msgstr "請指定目錄端口"
+
+msgctxt "ServerPage"
+msgid "Contact Info:"
+msgstr "信息:"
+
+msgctxt "ServerPage"
+msgid "Name of your relay"
+msgstr "你的中繼站名稱"
+
+msgctxt "ServerPage"
+msgid "Port on which users and other relays can communicate with your relay"
+msgstr "請輸入連接埠範圍以便其他使用者與中繼站能夠與你的中繼站通訊"
+
+msgctxt "ServerPage"
+msgid "Nickname:"
+msgstr "名稱:"
+
+msgctxt "ServerPage"
+msgid "Basic Settings"
+msgstr "基本設定"
+
+msgctxt "ServerPage"
+msgid "For Internet connections with fast download speed but slow upload, please list your upload speed here."
+msgstr "如網絡連接的下行速率較大,而上行速度較慢,請選擇適用的網絡連接類型(主要適用於 DSL 用戶)"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 256 Kbps"
+msgstr "寬頻/DSL 256 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 512 Kbps"
+msgstr "寬頻/DSL 512 Kbps"
+
+msgctxt "ServerPage"
+msgid "Cable/DSL 768 Kbps"
+msgstr "寬頻/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 "自定義"
+
+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 "KB/s"
+
+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 "你的最大帶寬速率必須大於或等於你的平均帶寬速率.兩個數值必須至少 20KB/s"
+
+msgctxt "ServerPage"
+msgid "Bandwidth Limits"
+msgstr "帶寬限制"
+
+msgctxt "ServerPage"
+msgid "Ports 6660 - 6669 and 6697"
+msgstr "連接埠範圍: 6660-6669 和 6697"
+
+msgctxt "ServerPage"
+msgid "Internet Relay Chat (IRC)"
+msgstr "IRC 聊天服務"
+
+msgctxt "ServerPage"
+msgid "Ports 110, 143, 993 and 995"
+msgstr "連接埠範圍: 110,143,993 和 995"
+
+msgctxt "ServerPage"
+msgid "Retrieve Mail (POP, IMAP)"
+msgstr "郵件接收服務(POP,IMAP)"
+
+msgctxt "ServerPage"
+msgid "Ports unspecified by other checkboxes"
+msgstr "除以上指定端口外的其它所有端口"
+
+msgctxt "ServerPage"
+msgid "Misc Other Services"
+msgstr "其它服務"
+
+msgctxt "ServerPage"
+msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
+msgstr "連接埠範圍: 706,1863,5050,5190,5222,8300 和 8888"
+
+msgctxt "ServerPage"
+msgid "Instant Messaging (IM)"
+msgstr "即時通訊服務(IM)"
+
+msgctxt "ServerPage"
+msgid "Port 443"
+msgstr "端口: 443"
+
+msgctxt "ServerPage"
+msgid "Secure Websites (SSL)"
+msgstr "加密網站(SSL)"
+
+msgctxt "ServerPage"
+msgid "Port 80"
+msgstr "連接埠 80"
+
+msgctxt "ServerPage"
+msgid "Websites"
+msgstr "未加密網站"
+
+msgctxt "ServerPage"
+msgid "Show help topic on exit policies"
+msgstr "顯示關於服務策略的相關幫助主題"
+
+msgctxt "ServerPage"
+msgid "What Internet resources should users be able to access from your relay?"
+msgstr "你要讓其他使用者從你的 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 仍然會阻擋某些外送郵件與檔案分享軟體，以免遭到濫用。"
+
+msgctxt "ServerPage"
+msgid "Exit Policies"
+msgstr "服務策略"
+
+msgctxt "ServerPage"
+msgid "Let others access your bridge by giving them this line:"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "This is the identity of your bridge relay that you can give to other people"
+msgstr ""
+
+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 無法保存你的 %1 設定."
+
+msgctxt "ServerPage"
+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 ""
+
+msgctxt "ServerPage"
+msgid "Help censored users reach the Tor network"
+msgstr "幫助用戶訪問 Tor 網絡(限於 Tor 0.2.0.3-alpha 或更高版本) {0.2.0.8-?}"
+
+msgctxt "ServerPage"
+msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
+msgstr "我要如何找到橋接?"
+
+msgctxt "ServerPage"
+msgid "Mirror the Relay Directory"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Email address at which you may be reached if there is a\n"
+"problem with your relay. You might also include your PGP or GPG fingerprint."
+msgstr ""
+
+msgctxt "ServicePage"
+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."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Error"
+msgstr "錯誤"
+
+msgctxt "ServicePage"
+msgid "Please select a Service."
+msgstr "請選擇一個服務。"
+
+msgctxt "ServicePage"
+msgid "Select Service Directory"
+msgstr "選擇服務目錄"
+
+msgctxt "ServicePage"
+msgid "Virtual Port may only contain valid port numbers [1..65535]."
+msgstr "虛擬連接埠只能使用有效的連接埠數值 [1...65535]。"
+
+msgctxt "ServicePage"
+msgid "Target may only contain address:port, address, or port."
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Directory already in use by another service."
+msgstr "另一個服務已經正在使用此目錄了。"
+
+msgctxt "ServicePage"
+msgid "Form"
+msgstr "表格"
+
+msgctxt "ServicePage"
+msgid "Provided Hidden Services"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Onion Address"
+msgstr "Onion 位址"
+
+msgctxt "ServicePage"
+msgid "Virtual Port"
+msgstr "虛擬連接埠"
+
+msgctxt "ServicePage"
+msgid "Target"
+msgstr "目標"
+
+msgctxt "ServicePage"
+msgid "Directory Path"
+msgstr "目錄路徑"
+
+msgctxt "ServicePage"
+msgid "Enabled"
+msgstr "已啟用"
+
+msgctxt "ServicePage"
+msgid "Add new service to list"
+msgstr "加入新的服務至清單"
+
+msgctxt "ServicePage"
+msgid "Remove selected service from list"
+msgstr "從清單移除選擇的服務"
+
+msgctxt "ServicePage"
+msgid "Copy onion address of selected service to clipboard"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Browse in local file system and choose directory for selected service"
+msgstr ""
+
+msgctxt "ServicePage"
+msgid "Created by Tor"
+msgstr ""
+
+msgctxt "Stream"
+msgid "New"
+msgstr "新建"
+
+msgctxt "Stream"
+msgid "Resolving"
+msgstr "正在解析"
+
+msgctxt "Stream"
+msgid "Connecting"
+msgstr "正在連接"
+
+msgctxt "Stream"
+msgid "Open"
+msgstr "開啟"
+
+msgctxt "Stream"
+msgid "Failed"
+msgstr "失敗"
+
+msgctxt "Stream"
+msgid "Closed"
+msgstr "關閉"
+
+msgctxt "Stream"
+msgid "Retrying"
+msgstr "正在重試"
+
+msgctxt "Stream"
+msgid "Remapped"
+msgstr "重新映射"
+
+msgctxt "Stream"
+msgid "Unknown"
+msgstr "未知"
+
+msgctxt "TorProcess"
+msgid "Process %1 failed to stop. [%2]"
+msgstr "進程 %1 停止失敗. [%2]"
+
+msgctxt "TorService"
+msgid "The Tor service is not installed."
+msgstr "未安裝 Tor 服務."
+
+msgctxt "TorService"
+msgid "Unable to start the Tor service."
+msgstr "無法啟動 Tor 服務."
+
+msgctxt "TorSettings"
+msgid "Failed to hash the control password."
+msgstr "無法切細主密碼。"
+
+msgctxt "UPNPControl"
+msgid "Success"
+msgstr "成功"
+
+msgctxt "UPNPControl"
+msgid "No UPnP-enabled devices found"
+msgstr "沒找到啟用 UPnP的裝置"
+
+msgctxt "UPNPControl"
+msgid "No valid UPnP-enabled Internet gateway devices found"
+msgstr ""
+
+msgctxt "UPNPControl"
+msgid "WSAStartup failed"
+msgstr "WSAStartup 失敗"
+
+msgctxt "UPNPControl"
+msgid "Failed to add a port mapping"
+msgstr "無法新增連接埠映射"
+
+msgctxt "UPNPControl"
+msgid "Failed to retrieve a port mapping"
+msgstr "無法取得連接埠映射"
+
+msgctxt "UPNPControl"
+msgid "Failed to remove a port mapping"
+msgstr "無法移除連接埠映射"
+
+msgctxt "UPNPControl"
+msgid "Unknown error"
+msgstr "未知的錯誤"
+
+msgctxt "UPNPTestDialog"
+msgid "Discovering UPnP-enabled devices"
+msgstr "正在尋找啟用 UPnP的裝置"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating directory port mapping"
+msgstr "正在更新目錄連接埠映射"
+
+msgctxt "UPNPTestDialog"
+msgid "Updating relay port mapping"
+msgstr "正在更新中繼站連接埠映射"
+
+msgctxt "UPNPTestDialog"
+msgid "Test completed successfully!"
+msgstr "測試成功完成!"
+
+msgctxt "UPNPTestDialog"
+msgid "Testing UPnP Support"
+msgstr "正在測試 UPnP 是否支援"
+
+msgctxt "UPNPTestDialog"
+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'."
+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 "正在啟動 Tor 軟體"
+
+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 "Tor 有新版本"
+
+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 "Backspace"
+
+msgctxt "UpdatesAvailableDialog"
+msgid "Version"
+msgstr "版本"
+
+msgctxt "VMessageBox"
+msgid "OK"
+msgstr "確定"
+
+msgctxt "VMessageBox"
+msgid "Cancel"
+msgstr "取消"
+
+msgctxt "VMessageBox"
+msgid "Yes"
+msgstr "是"
+
+msgctxt "VMessageBox"
+msgid "No"
+msgstr "否"
+
+msgctxt "VMessageBox"
+msgid "Help"
+msgstr "說明"
+
+msgctxt "VMessageBox"
+msgid "Retry"
+msgstr "重試"
+
+msgctxt "VMessageBox"
+msgid "Show Log"
+msgstr "顯示日誌"
+
+msgctxt "VMessageBox"
+msgid "Show Settings"
+msgstr "顯示設定"
+
+msgctxt "VMessageBox"
+msgid "Continue"
+msgstr "繼續"
+
+msgctxt "VMessageBox"
+msgid "Quit"
+msgstr "退出"
+
+msgctxt "VMessageBox"
+msgid "Browse"
+msgstr "瀏覽"
+
+msgctxt "Vidalia"
+msgid "Invalid Argument"
+msgstr "無效參數"
+
+msgctxt "Vidalia"
+msgid "Vidalia is already running"
+msgstr "Vidalia 已經在運作了"
+
+msgctxt "Vidalia"
+msgid "Displays this usage message and exits."
+msgstr "顯示使用信息和退出"
+
+msgctxt "Vidalia"
+msgid "Resets ALL stored Vidalia settings."
+msgstr "復位所有儲存的 Vidalia 設定."
+
+msgctxt "Vidalia"
+msgid "Sets the directory Vidalia uses for data files."
+msgstr "設定 Vidalia 數據保存位置."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's pidfile."
+msgstr "設定 Vidalia 進程文件的名稱和保存位置."
+
+msgctxt "Vidalia"
+msgid "Sets the name and location of Vidalia's logfile."
+msgstr "設定 Vidalia 日誌文件的名稱和保存位置"
+
+msgctxt "Vidalia"
+msgid "Sets the verbosity of Vidalia's logging."
+msgstr "設定 Vidalia 的日誌冗余."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's interface style."
+msgstr "設定 Vidalia 的界面樣式."
+
+msgctxt "Vidalia"
+msgid "Sets Vidalia's language."
+msgstr "設定 Vidalia 的界面語言."
+
+msgctxt "Vidalia"
+msgid "Vidalia Usage Information"
+msgstr "Vidalia 使用信息"
+
+msgctxt "Vidalia"
+msgid "Unable to open log file '%1': %2"
+msgstr "無法打開日誌文件 '%1': %2"
+
+msgctxt "Vidalia"
+msgid "Invalid language code specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid GUI style specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Invalid log level specified:"
+msgstr ""
+
+msgctxt "Vidalia"
+msgid "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n"
+"\n"
+"Would you like to continue starting Vidalia?"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 secs"
+msgstr "%1 秒"
+
+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 ""
+
+msgctxt "stringutil.h"
+msgid "%1 hours"
+msgstr ""
+
+msgctxt "stringutil.h"
+msgid "%1 mins"
+msgstr ""
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogFile.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogFile.cpp
new file mode 100644
index 0000000..dd05fef
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogFile.cpp
@@ -0,0 +1,117 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 LogFile.cpp
+** \version $Id: LogFile.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Logs messages from Tor to a file
+*/
+
+#include "LogFile.h"
+
+#include "stringutil.h"
+
+#include <QDir>
+
+
+/** Default constructor. */
+LogFile::LogFile()
+{
+ _file = 0;
+}
+
+/** Destructor. */
+LogFile::~LogFile()
+{
+ if (_file) {
+ delete _file;
+ }
+}
+
+/** Creates a path to the given log file. */
+bool
+LogFile::createPathToFile(QString filename)
+{
+ QDir dir = QFileInfo(filename).absoluteDir();
+ if (!dir.exists()) {
+ return dir.mkpath(dir.absolutePath());
+ }
+ return true;
+}
+
+/** Opens a log file for writing. */
+bool
+LogFile::open(QString filename, QString *errmsg)
+{
+ QFile *newLogFile;
+
+ /* If the file is already open, then no need to open it again */
+ if (_file && _file->isOpen()) {
+ if (_file->fileName() == filename) {
+ return true;
+ }
+ }
+
+ /* Create the path to the log file, if necessary */
+ if (!createPathToFile(filename)) {
+ return err(errmsg, "Unable to create path to log file.");
+ }
+
+ /* Try to open the new log file */
+ newLogFile = new QFile(filename);
+ if (!newLogFile->open(QFile::WriteOnly|QIODevice::Append|QIODevice::Text)) {
+ delete newLogFile;
+ return err(errmsg, newLogFile->errorString());
+ }
+
+ /* Rotate the new log file in place of the old one */
+ if (_file) {
+ delete _file;
+ }
+ _file = newLogFile;
+ _stream.setDevice(_file);
+ return true;
+}
+
+/** Closes an open log file. */
+void
+LogFile::close()
+{
+ if (_file) {
+ delete _file;
+ _file = 0;
+ }
+}
+
+/** Returns true if the logfile is currently open. */
+bool
+LogFile::isOpen()
+{
+ return (_file && _file->isOpen());
+}
+
+/** Returns the filename of the current log file. */
+QString
+LogFile::filename()
+{
+ return (_file ? _file->fileName() : QString());;
+}
+
+/** Overloaded ostream operator. */
+LogFile&
+LogFile::operator<<(const QString &s)
+{
+ if (_file) {
+ _stream << s;
+ _stream.flush();
+ }
+ return *this;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogFile.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogFile.h
new file mode 100644
index 0000000..7a9a4bf
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogFile.h
@@ -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.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 LogFile.h
+** \version $Id: LogFile.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Logs messages from Tor to a file
+*/
+
+#ifndef _LOGFILE_H
+#define _LOGFILE_H
+
+#include <QFile>
+#include <QObject>
+#include <QString>
+#include <QTextStream>
+
+
+class LogFile : QObject
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. */
+ LogFile();
+ /** Destructor. */
+ ~LogFile();
+
+ /** Opens a log file for writing. */
+ bool open(QString filename, QString *errmsg = 0);
+ /** Closes an open log file. */
+ void close();
+
+ /** Returns true if the logfile is currently open. */
+ bool isOpen();
+ /** Returns the filename of the current log file. */
+ QString filename();
+
+ /** Overloaded ostream operator. */
+ LogFile& operator<<(const QString &s);
+
+private:
+ /** Creates a path to the given log file */
+ bool createPathToFile(QString filename);
+
+ QFile* _file; /**< The log file. */
+ QTextStream _stream; /**< Stream used to write to the log file. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogHeaderView.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogHeaderView.cpp
new file mode 100644
index 0000000..96433c2
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogHeaderView.cpp
@@ -0,0 +1,45 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 LogHeaderView.cpp
+** \version $Id: LogHeaderView.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Header for the message log QTreeView
+*/
+
+#include "LogHeaderView.h"
+#include "LogTreeWidget.h"
+
+/* Column indices */
+#define COL_TIME LogTreeWidget::TimeColumn
+#define COL_TYPE LogTreeWidget::TypeColumn
+#define COL_MESG LogTreeWidget::MessageColumn
+
+/* Default column widths */
+#define COL_TIME_WIDTH 135
+#define COL_TYPE_WIDTH 70
+
+
+/** Default constructor. */
+LogHeaderView::LogHeaderView(QWidget *parent)
+ : QHeaderView(Qt::Horizontal, parent)
+{
+}
+
+/** Resets all column widths back to their defaults. */
+void
+LogHeaderView::resetColumnWidths()
+{
+ resizeSection(COL_TIME, COL_TIME_WIDTH);
+ resizeSection(COL_TYPE, COL_TYPE_WIDTH);
+ setStretchLastSection(true);
+}
+
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogHeaderView.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogHeaderView.h
new file mode 100644
index 0000000..704022e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogHeaderView.h
@@ -0,0 +1,36 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 LogHeaderView.h
+** \version $Id: LogHeaderView.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Header for the message log QTreeView
+*/
+
+#ifndef _LOGHEADERVIEW_H
+#define _LOGHEADERVIEW_H
+
+#include <QHeaderView>
+
+
+class LogHeaderView : public QHeaderView
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. */
+ LogHeaderView(QWidget *parent);
+
+ /** Resets all column widths back to their defaults. */
+ void resetColumnWidths();
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogMessageColumnDelegate.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogMessageColumnDelegate.cpp
new file mode 100644
index 0000000..d57d6dd
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogMessageColumnDelegate.cpp
@@ -0,0 +1,39 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 LogMessageColumnDelegate.cpp
+** \version $Id: LogMessageColumnDelegate.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Delegate responsible for rendering the log message column
+*/
+
+#include "LogMessageColumnDelegate.h"
+
+
+/** Default constructor. */
+LogMessageColumnDelegate::LogMessageColumnDelegate(QObject *parent)
+ : QItemDelegate(parent)
+{
+}
+
+/** Overrides the default paint() method so that we can prevent Qt from
+ * munging Tor's log messages when using a Right-to-Left layout (e.g. when
+ * viewing Vidalia in Farsi). */
+void
+LogMessageColumnDelegate::paint(QPainter *painter,
+ const QStyleOptionViewItem &option,
+ const QModelIndex &index) const
+{
+ QStyleOptionViewItem styleOption = option;
+ styleOption.direction = Qt::LeftToRight;
+
+ QItemDelegate::paint(painter, styleOption, index);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogMessageColumnDelegate.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogMessageColumnDelegate.h
new file mode 100644
index 0000000..39ec554
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogMessageColumnDelegate.h
@@ -0,0 +1,38 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 LogMessageColumnDelegate.h
+** \version $Id: LogMessageColumnDelegate.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Delegate responsible for rendering the log message column
+*/
+
+#ifndef _LOGMESSAGECOLUMNDELEGATE_H
+#define _LOGMESSAGECOLUMNDELEGATE_H
+
+#include <QItemDelegate>
+
+
+class LogMessageColumnDelegate : public QItemDelegate
+{
+public:
+ /** Default constructor. */
+ LogMessageColumnDelegate(QObject *parent = 0);
+
+ /** Overrides the default paint() method so that we can prevent Qt from
+ * munging Tor's log messages when using a Right-to-Left layout (e.g. when
+ * viewing Vidalia in Farsi). */
+ virtual void paint(QPainter *painter,
+ const QStyleOptionViewItem &option,
+ const QModelIndex &index) const;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogTreeItem.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogTreeItem.cpp
new file mode 100644
index 0000000..4cbb266
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogTreeItem.cpp
@@ -0,0 +1,167 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 LogTreeItem.cpp
+** \version $Id: LogTreeItem.cpp 4091 2009-08-30 03:10:07Z edmanm $
+** \brief Item representing a single message in the message log
+*/
+
+#include "LogTreeItem.h"
+#include "LogTreeWidget.h"
+
+#include "stringutil.h"
+
+/** Defines the format used for displaying the date and time of a log message.*/
+#define DATETIME_FMT "MMM dd hh:mm:ss.zzz"
+
+/* Column index values */
+#define COL_TIME LogTreeWidget::TimeColumn
+#define COL_TYPE LogTreeWidget::TypeColumn
+#define COL_MESG LogTreeWidget::MessageColumn
+#define ROLE_TYPE Qt::UserRole
+
+
+/** Default constructor. */
+LogTreeItem::LogTreeItem(tc::Severity type, const QString &message,
+ const QDateTime ×tamp)
+ : QTreeWidgetItem()
+{
+ static quint32 seqnum = 0;
+
+ /* Set this message's sequence number */
+ _seqnum = seqnum++;
+ /* Set the item's log time */
+ setTimestamp(timestamp);
+ /* Set the item's severity and appropriate color. */
+ setSeverity(type);
+ /* Set the item's message text. */
+ setMessage(message);
+}
+
+/** Returns a printable string representing the fields of this item. */
+QString
+LogTreeItem::toString() const
+{
+ return QString("%1 [%2] %3").arg(text(COL_TIME))
+ .arg(text(COL_TYPE))
+ .arg(text(COL_MESG).trimmed());
+}
+
+/** Sets the item's log time. */
+void
+LogTreeItem::setTimestamp(const QDateTime ×tamp)
+{
+ QString strtime = timestamp.toString(DATETIME_FMT);
+ setText(COL_TIME, strtime);
+ setToolTip(COL_TIME, strtime);
+}
+
+/** Sets the item's severity and the appropriate background color. */
+void
+LogTreeItem::setSeverity(tc::Severity type)
+{
+ /* Change row and text color for serious warnings and errors. */
+ if (type == tc::ErrorSeverity) {
+ /* Critical messages are red with white text. */
+ for (int i = 0; i < 3; i++) {
+ setBackgroundColor(i, Qt::red);
+ setTextColor(i, Qt::white);
+ }
+ } else if (type == tc::WarnSeverity) {
+ /* Warning messages are yellow with black text. */
+ for (int i = 0; i < 3; i++) {
+ setBackgroundColor(i, Qt::yellow);
+ }
+ }
+
+ setTextAlignment(COL_TYPE, Qt::AlignCenter);
+ setText(COL_TYPE, severityToString(type));
+ setData(COL_TYPE, ROLE_TYPE, (uint)type);
+}
+
+/** Sets the item's message text. */
+void
+LogTreeItem::setMessage(const QString &message)
+{
+ setText(COL_MESG, message);
+ setToolTip(COL_MESG, string_wrap(message, 80, " ", "\r\n"));
+}
+
+/** Returns the severity associated with this log item. */
+tc::Severity
+LogTreeItem::severity() const
+{
+ return (tc::Severity)data(COL_TYPE, ROLE_TYPE).toUInt();
+}
+
+/** Returns the timestamp for this log message. */
+QDateTime
+LogTreeItem::timestamp() const
+{
+ return QDateTime::fromString(text(COL_TIME), DATETIME_FMT);
+}
+
+/** Returns the message for this log item. */
+QString
+LogTreeItem::message() const
+{
+ return text(COL_MESG);
+}
+
+/** Converts a tc::Severity enum value to a localized string description. */
+QString
+LogTreeItem::severityToString(tc::Severity severity)
+{
+ QString str;
+ switch (severity) {
+ case tc::DebugSeverity: str = tr("Debug"); break;
+ case tc::InfoSeverity: str = tr("Info"); break;
+ case tc::NoticeSeverity: str = tr("Notice"); break;
+ case tc::WarnSeverity: str = tr("Warning"); break;
+ case tc::ErrorSeverity: str = tr("Error"); break;
+ default: str = tr("Unknown"); break;
+ }
+ return str;
+}
+
+/** Compares <b>other</b> to this log message item based on the current sort
+ * column. */
+bool
+LogTreeItem::operator<(const QTreeWidgetItem &other) const
+{
+ LogTreeItem *that = (LogTreeItem *)&other;
+ int sortColumn = (treeWidget() ? treeWidget()->sortColumn() : COL_TIME);
+
+ switch (sortColumn) {
+ case COL_TIME:
+ /* Sort chronologically */
+ return (this->_seqnum < that->_seqnum);
+ case COL_TYPE:
+ /* Sort by severity, then chronologically */
+ if (this->severity() == that->severity()) {
+ return (this->_seqnum < that->_seqnum);
+ }
+ /* The comparison is flipped because higher severities have
+ * lower numeric values */
+ return (this->severity() > that->severity());
+ default:
+ /* Sort by message, then chronologically */
+ QString thisMessage = this->message().toLower();
+ QString thatMessage = that->message().toLower();
+
+ if (thisMessage == thatMessage) {
+ return (this->_seqnum < that->_seqnum);
+ }
+ return (thisMessage < thatMessage);
+ }
+ return QTreeWidgetItem::operator<(other);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogTreeItem.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogTreeItem.h
new file mode 100644
index 0000000..d4868a6
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogTreeItem.h
@@ -0,0 +1,67 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 LogTreeItem.h
+** \version $Id: LogTreeItem.h 4054 2009-08-17 02:25:08Z edmanm $
+** \brief Item representing a single message in the message log
+*/
+
+#ifndef _LOGTREEITEM_H
+#define _LOGTREEITEM_H
+
+#include "TorControl.h"
+
+#include <QTreeWidgetItem>
+#include <QDateTime>
+#include <QString>
+
+
+class LogTreeItem : public QTreeWidgetItem
+{
+ Q_DECLARE_TR_FUNCTIONS(LogTreeItem)
+
+public:
+ /** Default constructor. */
+ LogTreeItem(tc::Severity type, const QString &message,
+ const QDateTime ×tamp = QDateTime::currentDateTime());
+
+ /** Sets the item's log time. */
+ void setTimestamp(const QDateTime ×tamp);
+ /** Sets the item's severity and appropriate background color. */
+ void setSeverity(tc::Severity type);
+ /** Sets the item's message text. */
+ void setMessage(const QString &message);
+
+ /** Returns this message's sequence number. */
+ quint32 id() const { return _seqnum; }
+ /** Returns the timestamp for this log message. */
+ QDateTime timestamp() const;
+ /** Returns the severity associated with this log item. */
+ tc::Severity severity() const;
+ /** Returns the message associated with this log item. */
+ QString message() const;
+
+ /** Returns a printable string representation of the item's contents.*/
+ QString toString() const;
+ /** Compares <b>other</b> to this log message item based on the current sort
+ * column and order. */
+ virtual bool operator<(const QTreeWidgetItem &other) const;
+
+ /** Converts a tc::Severity enum value to a localized string description.*/
+ static QString severityToString(tc::Severity severity);
+
+private:
+ quint32 _seqnum; /**< Sequence number used to disambiguate messages with
+ the same timestamp. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogTreeWidget.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogTreeWidget.cpp
new file mode 100644
index 0000000..e02b04a
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogTreeWidget.cpp
@@ -0,0 +1,267 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 LogTreeWidget.cpp
+** \version $Id: LogTreeWidget.cpp 4089 2009-08-30 01:46:25Z edmanm $
+** \brief Contains a collection of log messages as LogTreeItems
+*/
+
+#include "LogTreeWidget.h"
+#include "LogHeaderView.h"
+#include "LogMessageColumnDelegate.h"
+
+#include <QScrollBar>
+
+
+/** Default constructor. */
+LogTreeWidget::LogTreeWidget(QWidget *parent)
+ : QTreeWidget(parent)
+{
+ setHeader(new LogHeaderView(this));
+
+ /* Tor's log messages are always in English, so stop Qt from futzing with
+ * the message text if we're currently using a non-English RTL layout. */
+ if (layoutDirection() == Qt::RightToLeft) {
+ setItemDelegateForColumn(LogTreeWidget::MessageColumn,
+ new LogMessageColumnDelegate(this));
+ }
+
+ /* Explicitly default to sorting messages chronologically */
+ sortItems(LogTreeWidget::TimeColumn, Qt::AscendingOrder);
+
+ /* Default to always scrolling to the most recent item added */
+ _scrollOnNewItem = true;
+ setVerticalScrollMode(QAbstractItemView::ScrollPerItem);
+ connect(verticalScrollBar(), SIGNAL(sliderReleased()),
+ this, SLOT(verticalSliderReleased()));
+}
+
+/** Called when the user moves the vertical scrollbar. If the user has the
+ * scrollbar at within one step of its maximum, then always scroll to new
+ * items when added. Otherwise, leave the scrollbar alone since they are
+ * probably looking at something in their history. */
+void
+LogTreeWidget::verticalSliderReleased()
+{
+ QScrollBar *scrollBar = verticalScrollBar();
+ if (header()->sortIndicatorOrder() == Qt::AscendingOrder)
+ _scrollOnNewItem = (scrollBar->value() == scrollBar->maximum());
+ else
+ _scrollOnNewItem = (scrollBar->value() == scrollBar->minimum());
+}
+
+/** 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)
+{
+ QList<LogTreeItem *> outlist;
+ foreach (QTreeWidgetItem *item, inlist) {
+ outlist << (LogTreeItem *)item;
+ }
+ return outlist;
+}
+
+/** Sorts the list of pointers to log tree items by timestamp. */
+QList<LogTreeItem *>
+LogTreeWidget::qlist_sort(QList<LogTreeItem *> inlist)
+{
+ QMap<quint32, LogTreeItem *> outlist;
+ foreach (LogTreeItem *item, inlist) {
+ outlist.insert(item->id(), item);
+ }
+ return outlist.values();
+}
+
+/** The first time the log tree is shown, we need to set the default column
+ * widths. */
+void
+LogTreeWidget::showEvent(QShowEvent *event)
+{
+ static bool shown = false;
+ QTreeWidget::showEvent(event);
+ if (!shown) {
+ /* Set the default column widths the first time this is shown */
+ ((LogHeaderView *)header())->resetColumnWidths();
+ shown = true;
+ }
+}
+
+/** Clears all items from the message log and resets the counter in the status
+ * bar. */
+void
+LogTreeWidget::clearMessages()
+{
+ /* Clear the messages */
+ _itemHistory.clear();
+ clear();
+}
+
+/** Returns a list of all currently selected items. */
+QStringList
+LogTreeWidget::selectedMessages()
+{
+ QStringList messages;
+
+ /* Get all selected log items */
+ QList<LogTreeItem *> items =
+ qlist_cast(selectedItems());
+
+ /* Format the message items as strings and put them in a list */
+ foreach (LogTreeItem *item, qlist_sort(items)) {
+ messages << item->toString();
+ }
+ return messages;
+}
+
+/** Returns a list of all items in the tree. */
+QStringList
+LogTreeWidget::allMessages()
+{
+ QStringList messages;
+
+ /* Format the message items as strings and put them in a list */
+ foreach (LogTreeItem *item, _itemHistory) {
+ messages << item->toString();
+ }
+ return messages;
+}
+
+/** Returns the number of items currently shown. */
+int
+LogTreeWidget::messageCount()
+{
+ return topLevelItemCount();
+}
+
+/** Sets the maximum number of items in the tree. */
+void
+LogTreeWidget::setMaximumMessageCount(int max)
+{
+ while (max < messageCount() && _itemHistory.size() > 0) {
+ /* If the new max is less than the currently displayed number of
+ * items, then we'll get rid of some. */
+ int index = indexOfTopLevelItem(_itemHistory.takeFirst());
+ if (index != -1)
+ delete takeTopLevelItem(index);
+ }
+ _maxItemCount = max;
+}
+
+/** Deselects all currently selected items. */
+void
+LogTreeWidget::deselectAll()
+{
+ foreach(QTreeWidgetItem *item, selectedItems()) {
+ item->setSelected(false);
+ }
+}
+
+/** Adds a log item to the tree and returns a pointer to the new item. */
+LogTreeItem*
+LogTreeWidget::log(tc::Severity type, const QString &message)
+{
+ int oldScrollValue;
+ QScrollBar *scrollBar = verticalScrollBar();
+ LogTreeItem *item = new LogTreeItem(type, message);
+
+ /* Remember the current scrollbar position */
+ oldScrollValue = scrollBar->value();
+
+ /* If we need to make room, then make some room */
+ if (messageCount() >= _maxItemCount && _itemHistory.size()) {
+ int index = indexOfTopLevelItem(_itemHistory.takeFirst());
+ if (index != -1)
+ delete takeTopLevelItem(index);
+ }
+
+ /* Add the new message item.
+ * NOTE: We disable sorting, add the new item, and then re-enable sorting
+ * to force the result to be sorted immediately. Otherwise, the new
+ * message is not sorted until the message log has focus again. This
+ * is totally lame.
+ */
+ setSortingEnabled(false);
+ addLogTreeItem(item);
+ setSortingEnabled(true);
+
+ /* The intended vertical scrolling behavior is as follows:
+ *
+ * 1) If the message log is sorted in chronological order, and the user
+ * previously had the vertical scroll bar at its maximum position, then
+ * reposition the vertical scroll bar to the new maximum value.
+ *
+ * 2) If the message log is sorted in reverse chronological order, and the
+ * user previously had the vertical scroll bar at its minimum position,
+ * then reposition the vertical scroll bar to the new minimum value
+ * (which is always just 0 anyway).
+ *
+ * 3) If the message log is sorted by severity level or lexicographically
+ * by log message, or if the user manually repositioned the scroll bar,
+ * then leave the vertical scroll bar at its previous position.
+ */
+ if (_scrollOnNewItem && sortColumn() == LogTreeWidget::TimeColumn) {
+ if (header()->sortIndicatorOrder() == Qt::AscendingOrder)
+ scrollBar->setValue(scrollBar->maximum());
+ else
+ scrollBar->setValue(scrollBar->minimum());
+ } else {
+ scrollBar->setValue(oldScrollValue);
+ }
+
+ return item;
+}
+
+/** Adds <b>item</b> as a top-level item in the tree. */
+void
+LogTreeWidget::addLogTreeItem(LogTreeItem *item)
+{
+ addTopLevelItem(item);
+ _itemHistory.append(item);
+}
+
+/** Filters the message log based on the given filter. */
+void
+LogTreeWidget::filter(uint filter)
+{
+ int itemsShown = 0;
+ for (int i = _itemHistory.size()-1; i >= 0; i--) {
+ LogTreeItem *item = _itemHistory.at(i);
+ if ((itemsShown < _maxItemCount) && (filter & item->severity())) {
+ itemsShown++;
+ } else {
+ int itemIndex = indexOfTopLevelItem(item);
+ if (itemIndex != -1)
+ delete takeTopLevelItem(itemIndex);
+ _itemHistory.removeAt(i);
+ }
+ }
+}
+
+/** Searches the log for entries that contain the given text. */
+QList<LogTreeItem *>
+LogTreeWidget::find(QString text, bool highlight)
+{
+ QList<LogTreeItem *> items =
+ qlist_cast(findItems(text, Qt::MatchContains|Qt::MatchWrap, MessageColumn));
+
+ if (highlight) {
+ /* Deselect all items before highlighting our search results. */
+ deselectAll();
+ foreach (LogTreeItem *item, items) {
+ /* Highlight a matched item */
+ item->setSelected(true);
+ }
+ }
+
+ /* Return the results, sorted by timestamp */
+ return qlist_sort(items);
+}
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogTreeWidget.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogTreeWidget.h
new file mode 100644
index 0000000..a039416
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/LogTreeWidget.h
@@ -0,0 +1,95 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not receive the LICENSE file with this file, you may obtain it from the
+** Vidalia source package distributed by the Vidalia Project at
+** http://www.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 LogTreeWidget.h
+** \version $Id: LogTreeWidget.h 4054 2009-08-17 02:25:08Z edmanm $
+** \brief Contains a collection of log messages as LogTreeItems
+*/
+
+#ifndef _LOGTREEWIDGET_H
+#define _LOGTREEWIDGET_H
+
+#include "LogTreeItem.h"
+
+#include "TorControl.h"
+
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <QTreeWidget>
+#include <QHeaderView>
+#include <QShowEvent>
+
+
+class LogTreeWidget : public QTreeWidget
+{
+ Q_OBJECT
+
+public:
+ /** Log tree column indices. */
+ enum LogColumns {
+ TimeColumn = 0, /**< Timestamp column. */
+ TypeColumn = 1, /**< Message severity type column. */
+ MessageColumn = 2 /**< Message text column. */
+ };
+
+ /** Default constructor. */
+ LogTreeWidget(QWidget *parent = 0);
+
+ /** Returns a list of all currently selected messages. */
+ QStringList selectedMessages();
+ /** Returns a list of all messages in the tree. */
+ QStringList allMessages();
+ /** Deselects all currently selected messages. */
+ void deselectAll();
+
+ /** Returns the number of items currently in the tree. */
+ int messageCount();
+ /** 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);
+
+ /** Adds a log item to the tree. */
+ LogTreeItem* log(tc::Severity severity, const QString &message);
+
+ /** Searches the log for entries that contain the given text. */
+ QList<LogTreeItem *> find(QString text, bool highlight = true);
+
+public slots:
+ /** Clears all contents on the message log and resets the counter. */
+ void clearMessages();
+
+protected:
+ /** Sets the default, initial column header widths. */
+ void showEvent(QShowEvent *event);
+
+private slots:
+ /** Called when the user moves the vertical scroll bar. */
+ void verticalSliderReleased();
+
+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);
+ /** Sortrs a QList of pointers to tree items. */
+ QList<LogTreeItem *> qlist_sort(QList<LogTreeItem *> inlist);
+
+ /**< List of pointers to all log message items currently in the tree. */
+ QList<LogTreeItem *> _itemHistory;
+ int _maxItemCount; /**< Maximum number of items in the tree. */
+ bool _scrollOnNewItem; /**< Set to true if we are to scroll to the new item
+ after adding a message to the log. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/MessageLog.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/MessageLog.cpp
new file mode 100644
index 0000000..17308fb
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/MessageLog.cpp
@@ -0,0 +1,483 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 MessageLog.cpp
+** \version $Id: MessageLog.cpp 4091 2009-08-30 03:10:07Z edmanm $
+** \brief Displays log messages and message log settings
+*/
+
+#include "MessageLog.h"
+#include "StatusEventItem.h"
+#include "Vidalia.h"
+#include "VMessageBox.h"
+
+#include "html.h"
+
+#include <QMessageBox>
+#include <QFileDialog>
+#include <QInputDialog>
+#include <QMessageBox>
+#include <QClipboard>
+
+/* Message log settings */
+#define SETTING_MSG_FILTER "MessageFilter"
+#define SETTING_MAX_MSG_COUNT "MaxMsgCount"
+#define SETTING_ENABLE_LOGFILE "EnableLogFile"
+#define SETTING_LOGFILE "LogFile"
+#define DEFAULT_MSG_FILTER \
+ (tc::ErrorSeverity|tc::WarnSeverity|tc::NoticeSeverity)
+#define DEFAULT_MAX_MSG_COUNT 50
+#define DEFAULT_ENABLE_LOGFILE false
+#if defined(Q_OS_WIN32)
+
+/** Default location of the log file to which log messages will be written. */
+#define DEFAULT_LOGFILE \
+ (win32_program_files_folder()+"\\Tor\\tor-log.txt")
+#else
+#define DEFAULT_LOGFILE (QDir::homePath() + "/.tor/tor-log.txt")
+#endif
+
+#define ADD_TO_FILTER(f,v,b) (f = ((b) ? ((f) | (v)) : ((f) & ~(v))))
+
+
+/** Constructor. The constructor will load the message log's settings from
+ * VidaliSettings and register for log events according to the most recently
+ * set severity filter.
+ * \param torControl A TorControl object used to register for log events.
+ * \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)
+{
+ /* Invoke Qt Designer generated QObject setup routine */
+ ui.setupUi(this);
+
+ /* Create necessary Message Log QObjects */
+ _torControl = Vidalia::torControl();
+ connect(_torControl, SIGNAL(logMessage(tc::Severity, QString)),
+ this, SLOT(log(tc::Severity, QString)));
+
+ /* Bind events to actions */
+ createActions();
+
+ /* Set tooltips for necessary widgets */
+ setToolTips();
+
+ /* Load the message log's stored settings */
+ loadSettings();
+
+ /* Sort in ascending chronological order */
+ ui.listMessages->sortItems(LogTreeWidget::TimeColumn,
+ Qt::AscendingOrder);
+ ui.listNotifications->sortItems(0, Qt::AscendingOrder);
+}
+
+/** Default Destructor. Simply frees up any memory allocated for member
+ * variables. */
+MessageLog::~MessageLog()
+{
+ _logFile.close();
+}
+
+/** Binds events (signals) to actions (slots). */
+void
+MessageLog::createActions()
+{
+ connect(ui.actionSave_Selected, SIGNAL(triggered()),
+ this, SLOT(saveSelected()));
+
+ connect(ui.actionSave_All, SIGNAL(triggered()),
+ this, SLOT(saveAll()));
+
+ connect(ui.actionSelect_All, SIGNAL(triggered()),
+ this, SLOT(selectAll()));
+
+ connect(ui.actionCopy, SIGNAL(triggered()),
+ this, SLOT(copy()));
+
+ connect(ui.actionFind, SIGNAL(triggered()),
+ this, SLOT(find()));
+
+ connect(ui.actionClear, SIGNAL(triggered()),
+ this, SLOT(clear()));
+
+ connect(ui.actionHelp, SIGNAL(triggered()),
+ this, SLOT(help()));
+
+ connect(ui.btnSaveSettings, SIGNAL(clicked()),
+ this, SLOT(saveSettings()));
+
+ connect(ui.btnCancelSettings, SIGNAL(clicked()),
+ this, SLOT(cancelChanges()));
+
+ connect(ui.btnBrowse, SIGNAL(clicked()),
+ this, SLOT(browse()));
+
+#if defined(Q_WS_MAC)
+ ui.actionHelp->setShortcut(QString("Ctrl+?"));
+#endif
+ ui.actionClose->setShortcut(QString("Esc"));
+ Vidalia::createShortcut("Ctrl+W", this, ui.actionClose, SLOT(trigger()));
+}
+
+/** Set tooltips for Message Filter checkboxes in code because they are long
+ * and Designer wouldn't let us insert newlines into the text. */
+void
+MessageLog::setToolTips()
+{
+ ui.chkTorErr->setToolTip(tr("Messages that appear when something has \n"
+ "gone very wrong and Tor cannot proceed."));
+ ui.chkTorWarn->setToolTip(tr("Messages that only appear when \n"
+ "something has gone wrong with Tor."));
+ ui.chkTorNote->setToolTip(tr("Messages that appear infrequently \n"
+ "during normal Tor operation and are \n"
+ "not considered errors, but you may \n"
+ "care about."));
+ ui.chkTorInfo->setToolTip(tr("Messages that appear frequently \n"
+ "during normal Tor operation."));
+ ui.chkTorDebug->setToolTip(tr("Hyper-verbose messages primarily of \n"
+ "interest to Tor developers."));
+}
+
+/** Called when the user changes the UI translation. */
+void
+MessageLog::retranslateUi()
+{
+ ui.retranslateUi(this);
+ setToolTips();
+}
+
+/** Loads the saved Message Log settings */
+void
+MessageLog::loadSettings()
+{
+ /* Set Max Count widget */
+ uint maxMsgCount = getSetting(SETTING_MAX_MSG_COUNT,
+ 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,
+ DEFAULT_ENABLE_LOGFILE).toBool();
+ QString logfile = getSetting(SETTING_LOGFILE,
+ DEFAULT_LOGFILE).toString();
+ ui.lineFile->setText(QDir::convertSeparators(logfile));
+ rotateLogFile(logfile);
+ ui.chkEnableLogFile->setChecked(_logFile.isOpen());
+
+ /* Set the checkboxes accordingly */
+ _filter = getSetting(SETTING_MSG_FILTER, DEFAULT_MSG_FILTER).toUInt();
+ ui.chkTorErr->setChecked(_filter & tc::ErrorSeverity);
+ ui.chkTorWarn->setChecked(_filter & tc::WarnSeverity);
+ ui.chkTorNote->setChecked(_filter & tc::NoticeSeverity);
+ ui.chkTorInfo->setChecked(_filter & tc::InfoSeverity);
+ ui.chkTorDebug->setChecked(_filter & tc::DebugSeverity);
+ registerLogEvents();
+
+ /* Filter the message log */
+ QApplication::setOverrideCursor(Qt::WaitCursor);
+ ui.listMessages->filter(_filter);
+ QApplication::restoreOverrideCursor();
+}
+
+/** Attempts to register the selected message filter with Tor and displays an
+ * error if setting the events fails. */
+void
+MessageLog::registerLogEvents()
+{
+ _filter = getSetting(SETTING_MSG_FILTER, DEFAULT_MSG_FILTER).toUInt();
+ _torControl->setEvent(TorEvents::LogDebug,
+ _filter & tc::DebugSeverity, false);
+ _torControl->setEvent(TorEvents::LogInfo,
+ _filter & tc::InfoSeverity, false);
+ _torControl->setEvent(TorEvents::LogNotice,
+ _filter & tc::NoticeSeverity, false);
+ _torControl->setEvent(TorEvents::LogWarn,
+ _filter & tc::WarnSeverity, false);
+ _torControl->setEvent(TorEvents::LogError,
+ _filter & tc::ErrorSeverity, false);
+
+ QString errmsg;
+ if (_torControl->isConnected() && !_torControl->setEvents(&errmsg)) {
+ VMessageBox::warning(this, tr("Error Setting Filter"),
+ p(tr("Vidalia was unable to register for Tor's log events.")) + p(errmsg),
+ VMessageBox::Ok);
+ }
+}
+
+/** Opens a log file if necessary, or closes it if logging is disabled. If a
+ * log file is already opened and a new filename is specified, then the log
+ * file will be rotated to the new filename. In the case that the new filename
+ * can not be openend, the old file will remain open and writable. */
+bool
+MessageLog::rotateLogFile(const QString &filename)
+{
+ QString errmsg;
+ if (_enableLogging) {
+ if (!_logFile.open(filename, &errmsg)) {
+ VMessageBox::warning(this, tr("Error Opening Log File"),
+ p(tr("Vidalia was unable to open the specified log file."))+p(errmsg),
+ VMessageBox::Ok);
+ return false;
+ }
+ } else {
+ /* Close the log file. */
+ _logFile.close();
+ }
+ return true;
+}
+
+/** Saves the Message Log settings, adjusts the message list if required, and
+ * then hides the settings frame. */
+void
+MessageLog::saveSettings()
+{
+ /* Update the logging status */
+ _enableLogging = ui.chkEnableLogFile->isChecked();
+ if (_enableLogging && ui.lineFile->text().isEmpty()) {
+ /* The user chose to enable logging messages to a file, but didn't specify
+ * a log filename. */
+ VMessageBox::warning(this, tr("Log Filename Required"),
+ p(tr("You must enter a filename to be able to save log "
+ "messages to a file.")), VMessageBox::Ok);
+ return;
+ }
+ if (rotateLogFile(ui.lineFile->text())) {
+ saveSetting(SETTING_LOGFILE, ui.lineFile->text());
+ saveSetting(SETTING_ENABLE_LOGFILE, _logFile.isOpen());
+ }
+ ui.lineFile->setText(QDir::convertSeparators(ui.lineFile->text()));
+ ui.chkEnableLogFile->setChecked(_logFile.isOpen());
+
+ /* 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;
+ ADD_TO_FILTER(filter, tc::ErrorSeverity, ui.chkTorErr->isChecked());
+ ADD_TO_FILTER(filter, tc::WarnSeverity, ui.chkTorWarn->isChecked());
+ ADD_TO_FILTER(filter, tc::NoticeSeverity, ui.chkTorNote->isChecked());
+ ADD_TO_FILTER(filter, tc::InfoSeverity, ui.chkTorInfo->isChecked());
+ ADD_TO_FILTER(filter, tc::DebugSeverity, ui.chkTorDebug->isChecked());
+ saveSetting(SETTING_MSG_FILTER, filter);
+ registerLogEvents();
+
+ /* Filter the message log */
+ QApplication::setOverrideCursor(Qt::WaitCursor);
+ ui.listMessages->filter(_filter);
+ QApplication::restoreOverrideCursor();
+
+ /* Hide the settings frame and reset toggle button*/
+ ui.actionSettings->toggle();
+}
+
+/** Simply restores the previously saved settings and hides the settings
+ * frame. */
+void
+MessageLog::cancelChanges()
+{
+ /* Hide the settings frame and reset toggle button */
+ ui.actionSettings->toggle();
+ /* Reload the settings */
+ loadSettings();
+}
+
+/** Called when the user clicks "Browse" to select a new log file. */
+void
+MessageLog::browse()
+{
+ /* Strangely, QFileDialog returns a non seperator converted path. */
+ QString filename = QDir::convertSeparators(
+ QFileDialog::getSaveFileName(this,
+ tr("Select Log File"), "tor-log.txt"));
+ if (!filename.isEmpty()) {
+ ui.lineFile->setText(filename);
+ }
+}
+
+/** Saves the given list of items to a file.
+ * \param items A list of log message items to save.
+ */
+void
+MessageLog::save(const QStringList &messages)
+{
+ if (!messages.size()) {
+ return;
+ }
+
+ QString fileName = QFileDialog::getSaveFileName(this,
+ tr("Save Log Messages"),
+ "VidaliaLog-" +
+ QDateTime::currentDateTime().toString("MM.dd.yyyy")
+ + ".txt", tr("Text Files (*.txt)"));
+
+ /* If the choose to save */
+ if (!fileName.isEmpty()) {
+ LogFile logFile;
+ QString errmsg;
+
+ /* If can't write to file, show error message */
+ if (!logFile.open(fileName, &errmsg)) {
+ VMessageBox::warning(this, tr("Vidalia"),
+ p(tr("Cannot write file %1\n\n%2."))
+ .arg(fileName)
+ .arg(errmsg),
+ VMessageBox::Ok);
+ return;
+ }
+
+ /* Write out the message log to the file */
+ QApplication::setOverrideCursor(Qt::WaitCursor);
+ foreach (QString msg, messages) {
+ logFile << msg << "\n";
+ }
+ QApplication::restoreOverrideCursor();
+ }
+}
+
+/** Saves currently selected messages to a file. */
+void
+MessageLog::saveSelected()
+{
+ if (ui.tabWidget->currentIndex() == 0)
+ save(ui.listNotifications->selectedEvents());
+ else
+ 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());
+}
+
+void
+MessageLog::selectAll()
+{
+ if (ui.tabWidget->currentIndex() == 0)
+ ui.listNotifications->selectAll();
+ else
+ ui.listMessages->selectAll();
+}
+
+/** Copies contents of currently selected messages to the 'clipboard'. */
+void
+MessageLog::copy()
+{
+ QString contents;
+
+ if (ui.tabWidget->currentIndex() == 0)
+ contents = ui.listNotifications->selectedEvents().join("\n");
+ else
+ contents = ui.listMessages->selectedMessages().join("\n");
+
+ if (!contents.isEmpty()) {
+ /* Copy the selected messages to the clipboard */
+ QApplication::clipboard()->setText(contents);
+ }
+}
+
+/** Clears all log messages or status notifications, depending on which tab
+ * is currently visible. */
+void
+MessageLog::clear()
+{
+ if (ui.tabWidget->currentIndex() == 0)
+ ui.listNotifications->clear();
+ else
+ ui.listMessages->clearMessages();
+}
+
+/** Prompts the user for a search string. If the search string is not found in
+ * any of the currently displayed log entires, then a message will be
+ * displayed for the user informing them that no matches were found.
+ * \sa search()
+ */
+void
+MessageLog::find()
+{
+ bool ok;
+ QString text = QInputDialog::getText(this, tr("Find in Message Log"),
+ tr("Find:"), QLineEdit::Normal, QString(), &ok);
+
+ if (ok && !text.isEmpty()) {
+ QTreeWidget *tree;
+ 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));
+ }
+ }
+
+ if (! firstItem) {
+ VMessageBox::information(this, tr("Not Found"),
+ p(tr("Search found 0 matches.")),
+ VMessageBox::Ok);
+ } else {
+ tree->scrollToItem(firstItem);
+ }
+ }
+}
+
+/** Writes a message to the Message History and tags it with
+ * the proper date, time and type.
+ * \param type The message's severity type.
+ * \param message The log message to be added.
+ */
+void
+MessageLog::log(tc::Severity type, const QString &message)
+{
+ /* Only add the message if it's not being filtered out */
+ if (_filter & (uint)type) {
+ /* 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);
+ }
+
+ /* If we're saving log messages to a file, go ahead and do that now */
+ if (_enableLogging) {
+ _logFile << item->toString() << "\n";
+ }
+ }
+}
+
+/** Displays help information about the message log. */
+void
+MessageLog::help()
+{
+ emit helpRequested("log");
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/MessageLog.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/MessageLog.h
new file mode 100644
index 0000000..0e7ad0e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/MessageLog.h
@@ -0,0 +1,99 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 MessageLog.h
+** \version $Id: MessageLog.h 4091 2009-08-30 03:10:07Z edmanm $
+** \brief Displays log messages and message log settings
+*/
+
+#ifndef _MESSAGELOG_H
+#define _MESSAGELOG_H
+
+#include "ui_MessageLog.h"
+#include "VidaliaWindow.h"
+#include "LogFile.h"
+#include "TorControl.h"
+#include "VidaliaSettings.h"
+
+class LogTreeItem;
+class QStringList;
+
+class MessageLog : public VidaliaWindow
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor **/
+ MessageLog(QWidget *parent = 0, Qt::WFlags flags = 0);
+ /** Default destructor **/
+ ~MessageLog();
+
+protected:
+ /** Called when the user changes the UI translation. */
+ virtual void retranslateUi();
+
+private slots:
+ /** Adds the passed message to the message log as the specified type **/
+ void log(tc::Severity severity, const QString &msg);
+ /** Called when the user triggers the "Save All" action. */
+ void saveAll();
+ /** Called when the user triggers "Save Selected" action. */
+ void saveSelected();
+ /** Called when the user triggers the "Select All" action. */
+ void selectAll();
+ /** Called when the user triggers the "Copy" action. */
+ void copy();
+ /** Called when the user triggers the "Clear" action. */
+ void clear();
+ /** Called when the user triggers the "Find" action. This will search
+ * through all currently displayed log entries for text specified by the
+ * user, highlighting the entries that contain a match. */
+ void find();
+ /** Called when user saves settings **/
+ void saveSettings();
+ /** Called when user cancels changed settings **/
+ void cancelChanges();
+ /** Called when the user clicks "Browse" to select a new log file. */
+ void browse();
+ /** Called when the user clicks "Help" to see help info about the log. */
+ void help();
+
+private:
+ /** Create and bind actions to events **/
+ void createActions();
+ /** Set Tool Tips for various widgets **/
+ void setToolTips();
+ /** Loads the saved Message Log settings **/
+ void loadSettings();
+ /** Registers the current message filter with Tor */
+ void registerLogEvents();
+ /** Saves the given list of items to a file */
+ void save(const QStringList &messages);
+ /** Rotates the log file based on the filename and the current logging status. */
+ bool rotateLogFile(const QString &filename);
+
+ /** 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 */
+ uint _filter;
+ /** Set to true if we will log all messages to a file. */
+ bool _enableLogging;
+ /* The log file used to store log messages. */
+ LogFile _logFile;
+
+ /** Qt Designer generatated QObject **/
+ Ui::MessageLog ui;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/MessageLog.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/MessageLog.ui
new file mode 100644
index 0000000..eaa751e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/MessageLog.ui
@@ -0,0 +1,745 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MessageLog</class>
+ <widget class="QMainWindow" name="MessageLog">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>698</width>
+ <height>625</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>
+ </property>
+ <property name="unifiedTitleAndToolBarOnMac">
+ <bool>false</bool>
+ </property>
+ <widget class="QWidget" name="centralwidget">
+ <layout class="QVBoxLayout">
+ <property name="leftMargin">
+ <number>12</number>
+ </property>
+ <property name="topMargin">
+ <number>12</number>
+ </property>
+ <property name="rightMargin">
+ <number>12</number>
+ </property>
+ <item>
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="tabBasic">
+ <attribute name="title">
+ <string>Basic</string>
+ </attribute>
+ <layout class="QGridLayout" name="basicTabLayout">
+ <property name="margin">
+ <number>12</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="StatusEventWidget" name="listNotifications">
+ <property name="contextMenuPolicy">
+ <enum>Qt::CustomContextMenu</enum>
+ </property>
+ <property name="horizontalScrollBarPolicy">
+ <enum>Qt::ScrollBarAsNeeded</enum>
+ </property>
+ <property name="showDropIndicator" stdset="0">
+ <bool>false</bool>
+ </property>
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
+ <property name="selectionBehavior">
+ <enum>QAbstractItemView::SelectRows</enum>
+ </property>
+ <property name="indentation">
+ <number>0</number>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <property name="itemsExpandable">
+ <bool>false</bool>
+ </property>
+ <property name="sortingEnabled">
+ <bool>true</bool>
+ </property>
+ <attribute name="headerShowSortIndicator" stdset="0">
+ <bool>true</bool>
+ </attribute>
+ <attribute name="headerShowSortIndicator" stdset="0">
+ <bool>true</bool>
+ </attribute>
+ <column>
+ <property name="text">
+ <string>Tor Status</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tabAdvanced">
+ <attribute name="title">
+ <string>Advanced</string>
+ </attribute>
+ <layout class="QGridLayout" name="advancedTabLayout">
+ <property name="margin">
+ <number>12</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="LogTreeWidget" name="listMessages">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="autoFillBackground">
+ <bool>false</bool>
+ </property>
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <property name="uniformRowHeights">
+ <bool>true</bool>
+ </property>
+ <property name="itemsExpandable">
+ <bool>false</bool>
+ </property>
+ <property name="sortingEnabled">
+ <bool>true</bool>
+ </property>
+ <column>
+ <property name="text">
+ <string>Time</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Type</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Message</string>
+ </property>
+ </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" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="QPushButton" name="btnSaveSettings">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Saves the current Message Log settings</string>
+ </property>
+ <property name="text">
+ <string>Save Settings</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnCancelSettings">
+ <property name="minimumSize">
+ <size>
+ <width>90</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Cancels changes made to settings</string>
+ </property>
+ <property name="text">
+ <string>Cancel</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="0" rowspan="2">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="title">
+ <string>Message Filter</string>
+ </property>
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="QCheckBox" name="chkTorErr">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Error</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/emblem-important.png</normaloff>:/images/16x16/emblem-important.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkTorWarn">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Warning</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/dialog-warning.png</normaloff>:/images/16x16/dialog-warning.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkTorNote">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Notice</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/preferences-desktop-notification.png</normaloff>:/images/16x16/preferences-desktop-notification.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkTorInfo">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Info</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/dialog-information.png</normaloff>:/images/16x16/dialog-information.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkTorDebug">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Debug</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/applications-system.png</normaloff>:/images/16x16/applications-system.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QGroupBox" name="grou">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="title">
+ <string>Message Log History</string>
+ </property>
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QSpinBox" name="spnbxMaxCount">
+ <property name="minimumSize">
+ <size>
+ <width>50</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Number of messages to display in the message log window</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight</set>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>99999</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="lblMessageCount">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text">
+ <string>messages</string>
+ </property>
+ <property name="textFormat">
+ <enum>Qt::AutoText</enum>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="1" colspan="2">
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="title">
+ <string>Always Save New Log Messages </string>
+ </property>
+ <layout class="QGridLayout">
+ <property name="margin">
+ <number>6</number>
+ </property>
+ <item row="1" column="1">
+ <widget class="QPushButton" name="btnBrowse">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text">
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLineEdit" name="lineFile">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="chkEnableLogFile">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Enable automatically saving all new log messages to a file</string>
+ </property>
+ <property name="text">
+ <string>Automatically save new log messages to a file</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QStatusBar" name="statusbar"/>
+ <widget class="QToolBar" name="toolBar">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="movable">
+ <bool>false</bool>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="toolButtonStyle">
+ <enum>Qt::ToolButtonTextUnderIcon</enum>
+ </property>
+ <attribute name="toolBarArea">
+ <enum>TopToolBarArea</enum>
+ </attribute>
+ <attribute name="toolBarBreak">
+ <bool>false</bool>
+ </attribute>
+ <addaction name="actionSave_All"/>
+ <addaction name="actionSave_Selected"/>
+ <addaction name="separator"/>
+ <addaction name="actionCopy"/>
+ <addaction name="actionSelect_All"/>
+ <addaction name="actionFind"/>
+ <addaction name="actionClear"/>
+ <addaction name="separator"/>
+ <addaction name="actionSettings"/>
+ <addaction name="actionHelp"/>
+ <addaction name="actionClose"/>
+ </widget>
+ <action name="actionMessage_Filters">
+ <property name="text">
+ <string>Message Filters...</string>
+ </property>
+ <property name="statusTip">
+ <string>Set message filters</string>
+ </property>
+ <property name="shortcut">
+ <string/>
+ </property>
+ </action>
+ <action name="actionHistory_Size">
+ <property name="text">
+ <string>History Size...</string>
+ </property>
+ <property name="statusTip">
+ <string>Set maximum number of messages to display</string>
+ </property>
+ </action>
+ <action name="actionClear">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/edit-clear.png</normaloff>:/images/32x32/edit-clear.png</iconset>
+ </property>
+ <property name="text">
+ <string>Clear</string>
+ </property>
+ <property name="iconText">
+ <string>Clear</string>
+ </property>
+ <property name="statusTip">
+ <string>Clear all messages from the Message Log (Ctrl+E)</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+E</string>
+ </property>
+ </action>
+ <action name="actionCopy">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/edit-copy.png</normaloff>:/images/32x32/edit-copy.png</iconset>
+ </property>
+ <property name="text">
+ <string>Copy</string>
+ </property>
+ <property name="iconText">
+ <string>Copy</string>
+ </property>
+ <property name="toolTip">
+ <string>Copy</string>
+ </property>
+ <property name="statusTip">
+ <string>Copy the selected messages to the clipboard (Ctrl+C)</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+C</string>
+ </property>
+ </action>
+ <action name="actionSelect_All">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/edit-select-all.png</normaloff>:/images/32x32/edit-select-all.png</iconset>
+ </property>
+ <property name="text">
+ <string>Select All</string>
+ </property>
+ <property name="iconText">
+ <string>Select All</string>
+ </property>
+ <property name="statusTip">
+ <string>Select all messages (Ctrl+A)</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+A</string>
+ </property>
+ </action>
+ <action name="actionSave_All">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/document-save-all.png</normaloff>:/images/32x32/document-save-all.png</iconset>
+ </property>
+ <property name="text">
+ <string>Save All</string>
+ </property>
+ <property name="statusTip">
+ <string>Save all messages to a file</string>
+ </property>
+ </action>
+ <action name="actionSave_Selected">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/document-save.png</normaloff>:/images/32x32/document-save.png</iconset>
+ </property>
+ <property name="text">
+ <string>Save Selected</string>
+ </property>
+ <property name="statusTip">
+ <string>Save selected messages to a file</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 Message Log Settings</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+T</string>
+ </property>
+ </action>
+ <action name="actionHelp">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/system-help.png</normaloff>:/images/32x32/system-help.png</iconset>
+ </property>
+ <property name="text">
+ <string>Help</string>
+ </property>
+ <property name="statusTip">
+ <string>Show the help browser</string>
+ </property>
+ <property name="shortcut">
+ <string>F1</string>
+ </property>
+ </action>
+ <action name="actionClose">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/window-close.png</normaloff>:/images/32x32/window-close.png</iconset>
+ </property>
+ <property name="text">
+ <string>Close</string>
+ </property>
+ <property name="statusTip">
+ <string>Close the Message Log</string>
+ </property>
+ <property name="shortcut">
+ <string>Esc</string>
+ </property>
+ </action>
+ <action name="actionFind">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/edit-find.png</normaloff>:/images/32x32/edit-find.png</iconset>
+ </property>
+ <property name="text">
+ <string>Find</string>
+ </property>
+ <property name="iconText">
+ <string>Find</string>
+ </property>
+ <property name="statusTip">
+ <string>Find all messages containing the search text (Ctrl+F)</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+F</string>
+ </property>
+ </action>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>LogTreeWidget</class>
+ <extends>QTreeWidget</extends>
+ <header>log/LogTreeWidget.h</header>
+ </customwidget>
+ <customwidget>
+ <class>StatusEventWidget</class>
+ <extends>QTreeWidget</extends>
+ <header>StatusEventWidget.h</header>
+ </customwidget>
+ </customwidgets>
+ <resources>
+ <include location="../res/vidalia.qrc"/>
+ </resources>
+ <connections>
+ <connection>
+ <sender>actionClose</sender>
+ <signal>triggered()</signal>
+ <receiver>MessageLog</receiver>
+ <slot>close()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>-1</x>
+ <y>-1</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>407</x>
+ <y>378</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>actionSettings</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>frmSettings</receiver>
+ <slot>setVisible(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>-1</x>
+ <y>-1</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>407</x>
+ <y>393</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>chkEnableLogFile</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>lineFile</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>373</x>
+ <y>491</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>348</x>
+ <y>516</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>chkEnableLogFile</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>btnBrowse</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventItem.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventItem.cpp
new file mode 100644
index 0000000..2209471
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventItem.cpp
@@ -0,0 +1,110 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 StatusEventItem.cpp
+** \version $Id: StatusEventItem.cpp 4091 2009-08-30 03:10:07Z edmanm $
+** \brief Represents a single status event item in a StatusEventWidget
+*/
+
+#include "StatusEventItem.h"
+
+#include <QTime>
+#include <QPixmap>
+#include <QString>
+
+StatusEventItem::StatusEventItem(QTreeWidget *parent)
+ : QTreeWidgetItem(parent, QTreeWidgetItem::UserType)
+{
+}
+
+void
+StatusEventItem::setTimestamp(const QTime ×tamp)
+{
+ setData(0, TimestampRole, timestamp);
+}
+
+QTime
+StatusEventItem::timestamp() const
+{
+ return data(0, TimestampRole).toTime();
+}
+
+void
+StatusEventItem::setIcon(const QPixmap &pixmap)
+{
+ setData(0, IconRole, pixmap);
+}
+
+QPixmap
+StatusEventItem::icon() const
+{
+ return data(0, IconRole).value<QPixmap>();
+}
+
+void
+StatusEventItem::setTitle(const QString &title)
+{
+ setData(0, TitleRole, title);
+}
+
+QString
+StatusEventItem::title() const
+{
+ return data(0, TitleRole).toString();
+}
+
+void
+StatusEventItem::setDescription(const QString &description)
+{
+ setData(0, DescriptionRole, description);
+}
+
+QString
+StatusEventItem::description() const
+{
+ return data(0, DescriptionRole).toString();
+}
+
+void
+StatusEventItem::setHelpUrl(const QString &url)
+{
+ setData(0, HelpUrlRole, url);
+}
+
+QString
+StatusEventItem::helpUrl() const
+{
+ return data(0, HelpUrlRole).toString();
+}
+
+void
+StatusEventItem::setToolTip(const QString &toolTip)
+{
+ QTreeWidgetItem::setToolTip(0, toolTip);
+}
+
+QString
+StatusEventItem::toString() const
+{
+ return QString("[%1] %2 - %3").arg(timestamp().toString())
+ .arg(title())
+ .arg(description());
+}
+
+bool
+StatusEventItem::operator<(const QTreeWidgetItem &other) const
+{
+ QTime a = data(0, TimestampRole).toTime();
+ QTime b = other.data(0, TimestampRole).toTime();
+
+ return (a < b);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventItem.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventItem.h
new file mode 100644
index 0000000..ba72a50
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventItem.h
@@ -0,0 +1,121 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 StatusEventItem.cpp
+** \version $Id: StatusEventItem.h 4091 2009-08-30 03:10:07Z edmanm $
+** \brief Represents a single status event item in a StatusEventWidget
+*/
+
+#ifndef _STATUSEVENTITEM_H
+#define _STATUSEVENTITEM_H
+
+#include <QTreeWidgetItem>
+
+class QTime;
+class QPixmap;
+class QString;
+
+class StatusEventItem : public QTreeWidgetItem
+{
+public:
+ /** QModelIndex data roles used to store information with this status
+ * event item, allowing it to be retrieved by StatusEventItemDelegate for
+ * painting.
+ */
+ enum DataRole {
+ IconRole = Qt::UserRole,
+ TimestampRole,
+ TitleRole,
+ DescriptionRole,
+ HelpUrlRole,
+ };
+
+ /** Default constructor.
+ */
+ StatusEventItem(QTreeWidget *parent = 0);
+
+ /** Sets the <b>timestamp</b> at which this status event occurred.
+ * \sa timestamp()
+ */
+ void setTimestamp(const QTime ×tamp);
+
+ /** Returns the timestamp at which this status event occurred.
+ * \sa setTimestamp()
+ */
+ QTime timestamp() const;
+
+ /** Sets the icon to be drawn along with this status event to <b>pixmap</b>.
+ * \sa icon()
+ */
+ void setIcon(const QPixmap &pixmap);
+
+ /** Returns the icon draw along with this status event.
+ * \sa setIcon()
+ */
+ QPixmap icon() const;
+
+ /** Sets the <b>title</b> text for this status event. The title is a short
+ * (fewer than 10 words or so) summary of the event.
+ * \sa title()
+ */
+ void setTitle(const QString &title);
+
+ /** Returns the title text for this status event.
+ * \sa setTitle()
+ */
+ QString title() const;
+
+ /** Sets the detailed <b>description</b> text for this status event. The
+ * text should explain what the event means to the user, and any corrective
+ * action they might need to take.
+ * \sa description()
+ */
+ void setDescription(const QString &description);
+
+ /** Returns the detailed description text for this status event.
+ * \sa setDescription()
+ */
+ QString description() const;
+
+ /** Sets the help topic URL that contains more information about this
+ * particular status event.
+ * \sa helpUrl
+ */
+ void setHelpUrl(const QString &url);
+
+ /** Returns the help topic URL associated with this event item.
+ * \sa setHelpUrl
+ */
+ QString helpUrl() const;
+
+ /** Sets <b>toolTip</b> as the text displayed when the user hovers the mouse
+ * over a StatusEventItem. It is more useful for particularly long item
+ * descriptions.
+ */
+ void setToolTip(const QString &toolTip);
+
+ /** Returns a formatted QString containing this item's timestamp, title
+ * and description text.
+ * \sa timestamp()
+ * \sa title()
+ * \sa description()
+ */
+ QString toString() const;
+
+ /** Overloaded comparison operator that allows sorting StatusEventItem
+ * objects based on timestamp. Returns true if <i>this</i> StatusEventItem
+ * occurred before <b>other</b>.
+ */
+ virtual bool operator<(const QTreeWidgetItem &other) const;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventItemDelegate.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventItemDelegate.cpp
new file mode 100644
index 0000000..b6099bc
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventItemDelegate.cpp
@@ -0,0 +1,180 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not receive the LICENSE file with this file, you may obtain it from the
+** Vidalia source package distributed by the Vidalia Project at
+** 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 StatusEventItemDelegate.cpp
+** \version $Id: StatusEventItemDelegate.cpp 4080 2009-08-28 18:14:48Z edmanm $
+** \brief Handles custom painting of items in a StatusEventWidget
+*/
+
+#include "StatusEventItemDelegate.h"
+#include "StatusEventItem.h"
+
+#include "Vidalia.h"
+
+#include <QPainter>
+#include <QTextLine>
+#include <QTextLayout>
+
+StatusEventItemDelegate::StatusEventItemDelegate(QObject *parent)
+ : QItemDelegate(parent)
+{
+ _helpIcon = QPixmap(":/images/16x16/system-help.png");
+}
+
+void
+StatusEventItemDelegate::paint(QPainter *painter,
+ const QStyleOptionViewItem &option,
+ const QModelIndex &index) const
+{
+ QItemDelegate::paint(painter, option, index);
+
+ painter->save();
+ if (option.state & QStyle::State_Selected)
+ painter->setPen(option.palette.highlightedText().color());
+
+ QPixmap icon = index.data(StatusEventItem::IconRole).value<QPixmap>();
+ QTime tstamp = index.data(StatusEventItem::TimestampRole).toTime();
+ QString title = index.data(StatusEventItem::TitleRole).toString();
+ QString text = index.data(StatusEventItem::DescriptionRole).toString();
+ QFont font = option.font;
+ QFontMetrics fm = option.fontMetrics;
+
+ /* XXX: Handle right-to-left layouts here. */
+ QRect iconRect(option.rect.x(),
+ option.rect.y(),
+ qMax(fm.width(tstamp.toString()), icon.width()) + 16,
+ option.rect.height());
+ QRect textRect(iconRect.topRight(), option.rect.bottomRight());
+
+ // Draw the status icon
+ QPoint center = iconRect.center();
+ int x = center.x() - qRound(icon.width() / 2.0);
+ int y = center.y() - qRound((icon.height() + fm.lineSpacing()) / 2.0);
+ painter->drawPixmap(x, y, icon);
+
+ // Draw the timestamp text underneath the status icon
+ x = iconRect.x();
+ y = y + icon.height();
+ painter->drawText(x, y,
+ iconRect.width(),
+ fm.lineSpacing(),
+ Qt::AlignCenter,
+ tstamp.toString());
+
+ // Draw the event's title in a bold font. If the current item has an
+ // associated help URL, draw the little "?" icon to the right of the
+ // title text
+ font.setBold(true);
+ painter->setFont(font);
+ if (! index.data(StatusEventItem::HelpUrlRole).isNull()) {
+ // Draw the little "?" icon in the corner of the list item and
+ // account for it when eliding the title
+ title = fm.elidedText(title,
+ Qt::ElideRight,
+ textRect.width() - _helpIcon.width() - 24);
+
+ x = textRect.topRight().x() - _helpIcon.width() - 8;
+ y = textRect.y() + 8;
+ painter->drawPixmap(x, y, _helpIcon);
+ } else {
+ title = fm.elidedText(title, Qt::ElideRight, textRect.width() - 16);
+ }
+ painter->drawText(textRect.x(),
+ textRect.y() + 8,
+ textRect.width(),
+ fm.lineSpacing(),
+ Qt::AlignVCenter | Qt::AlignLeft, title);
+
+ // Draw the rest of the event text, up to a maximum of 2 lines for
+ // unselected items or 5 lines for selected items. Any extra text will
+ // be elided.
+ font.setBold(false);
+ painter->setFont(font);
+ if (option.state & QStyle::State_Selected)
+ text = layoutText(text, font, textRect.width(), 6).join("\n");
+ else
+ text = layoutText(text, font, textRect.width(), 3).join("\n");
+
+ x = textRect.x();
+ y = textRect.y() + 8 + fm.leading() + fm.lineSpacing();
+ painter->drawText(x, y,
+ textRect.width(),
+ textRect.height() - (y - textRect.y()),
+ Qt::AlignTop | Qt::AlignLeft, text);
+
+ painter->restore();
+}
+
+QSize
+StatusEventItemDelegate::sizeHint(const QStyleOptionViewItem &option,
+ const QModelIndex &index) const
+{
+ int iconHeight, iconWidth;
+ int textWidth, textHeight;
+ QFontMetrics fontMetrics = option.fontMetrics;
+
+ QPixmap icon = index.data(StatusEventItem::IconRole).value<QPixmap>();
+ QString text = index.data(StatusEventItem::DescriptionRole).toString();
+ QTime tstamp = index.data(StatusEventItem::TimestampRole).toTime();
+
+ iconHeight = icon.height() + fontMetrics.lineSpacing() + 16;
+ iconWidth = qMax(fontMetrics.width(tstamp.toString()), icon.width()) + 16;
+ textWidth = option.rect.width() - iconWidth;
+
+ if (option.state & QStyle::State_Selected)
+ layoutText(text, option.font, textWidth, 6, &textHeight);
+ else
+ layoutText(text, option.font, textWidth, 3, &textHeight);
+ textHeight += 8 + fontMetrics.leading() + fontMetrics.lineSpacing();
+
+ return QSize(option.rect.width(), qMax(iconHeight, textHeight));
+}
+
+QStringList
+StatusEventItemDelegate::layoutText(const QString &text,
+ const QFont &font,
+ int maxLineWidth,
+ int maxLines,
+ int *textHeight)
+{
+ QTextLayout textLayout(text, font);
+ QFontMetrics fontMetrics(font);
+ QStringList lines;
+ qreal height = 0.0;
+
+ textLayout.beginLayout();
+ while (lines.size() < maxLines) {
+ QTextLine line = textLayout.createLine();
+ if (! line.isValid())
+ break;
+ if (maxLines <= 0 || lines.size() < maxLines-1) {
+ // Wrap the current line at or below the maximum line width
+ line.setLineWidth(maxLineWidth);
+ lines.append(text.mid(line.textStart(), line.textLength()));
+ } else {
+ // Set the line width beyond the max line width, and then elide it
+ // so the user has a visible indication that the full message is
+ // longer than what is visible.
+ line.setLineWidth(2 * maxLineWidth);
+ lines.append(fontMetrics.elidedText(text.mid(line.textStart()),
+ Qt::ElideRight,
+ maxLineWidth));
+ }
+ height += fontMetrics.leading() + line.height();
+ }
+ textLayout.endLayout();
+
+ if (textHeight)
+ *textHeight = qRound(height);
+
+ return lines;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventItemDelegate.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventItemDelegate.h
new file mode 100644
index 0000000..a4ec295
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventItemDelegate.h
@@ -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.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 StatusEventItemDelegate.h
+** \version $Id: StatusEventItemDelegate.h 4074 2009-08-28 05:36:43Z edmanm $
+** \brief Handles custom painting of items in a StatusEventWidget
+*/
+
+#ifndef _STATUSEVENTITEMDELEGATE_H
+#define _STATUSEVENTITEMDELEGATE_H
+
+#include <QItemDelegate>
+#include <QPixmap>
+
+class QStringList;
+
+class StatusEventItemDelegate : public QItemDelegate
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor.
+ */
+ StatusEventItemDelegate(QObject *parent = 0);
+
+ /** Paints a status event item for <b>index</b> using the given paint
+ * device <b>painter</b> and current style <b>option</b>s.
+ */
+ virtual void paint(QPainter *painter,
+ const QStyleOptionViewItem &option,
+ const QModelIndex &index) const;
+
+ /** Returns a QSize representing the desired dimensions needed to paint
+ * a status event item for <b>index</b> using the specified style
+ * <b>option</b>s.
+ */
+ virtual QSize sizeHint(const QStyleOptionViewItem &option,
+ const QModelIndex &index) const;
+
+protected:
+ /** Splits <b>text</b> at <b>maxLineWidth</b> pixels computed using the
+ * font dimensions given by <b>fontMetrics</b> and returns a QStringList
+ * containing at most <b>maxLines</b> of text. If the number of wrapped
+ * lines is greater than or equal to <b>maxLines</b>, the last line of
+ * text will be elided. If <b>maxLines</b> is less than or equal to 0, no
+ * eliding will be done. If <b>textHeight</b> is not NULL, it will be set
+ * to the height (in pixels) required to display the returned wrapped
+ * lines.
+ */
+ static QStringList layoutText(const QString &text,
+ const QFont &fontMetrics,
+ int maxLineWidth,
+ int maxLines = -1,
+ int *textHeight = 0);
+
+private:
+ /** Small icon image drawn in the upper-right (or upper-left in RTL
+ * layouts) for status events that have associated help URLs. */
+ QPixmap _helpIcon;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventWidget.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventWidget.cpp
new file mode 100644
index 0000000..7e533ad
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventWidget.cpp
@@ -0,0 +1,614 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 StatusEventWidget.h
+** \version $Id: StatusEventWidget.cpp 4180 2009-12-13 21:29:25Z edmanm $
+** \brief Displays information on Tor status events
+*/
+
+#include "StatusEventWidget.h"
+#include "StatusEventItem.h"
+#include "StatusEventItemDelegate.h"
+#include "Vidalia.h"
+
+#include "TorEvents.h"
+#include "stringutil.h"
+
+#include <QTime>
+#include <QMenu>
+#include <QPainter>
+#include <QPixmap>
+#include <QStringList>
+#include <QObject>
+#include <QHeaderView>
+#include <QClipboard>
+
+bool compareStatusEventItems(const QTreeWidgetItem *a,
+ const QTreeWidgetItem *b)
+{
+ return (*a < *b);
+}
+
+StatusEventWidget::StatusEventWidget(QWidget *parent)
+ : QTreeWidget(parent)
+{
+ TorControl *tc = Vidalia::torControl();
+ tc->setEvent(TorEvents::GeneralStatus);
+ tc->setEvent(TorEvents::ClientStatus);
+ tc->setEvent(TorEvents::ServerStatus);
+
+ connect(this, SIGNAL(customContextMenuRequested(QPoint)),
+ this, SLOT(customContextMenuRequested(QPoint)));
+ connect(tc, SIGNAL(authenticated()), this, SLOT(authenticated()));
+ connect(tc, SIGNAL(disconnected()), this, SLOT(disconnected()));
+ connect(tc, SIGNAL(dangerousTorVersion(tc::TorVersionStatus, QString,
+ QStringList)),
+ this, SLOT(dangerousTorVersion(tc::TorVersionStatus, QString,
+ QStringList)));
+ connect(tc, SIGNAL(circuitEstablished()), this, SLOT(circuitEstablished()));
+ connect(tc, SIGNAL(bug(QString)), this, SLOT(bug(QString)));
+ connect(tc, SIGNAL(clockSkewed(int, QString)),
+ this, SLOT(clockSkewed(int, QString)));
+ connect(tc, SIGNAL(dangerousPort(quint16, bool)),
+ this, SLOT(dangerousPort(quint16, bool)));
+ connect(tc, SIGNAL(socksError(tc::SocksError, QString)),
+ this, SLOT(socksError(tc::SocksError, QString)));
+ connect(tc, SIGNAL(externalAddressChanged(QHostAddress, QString)),
+ this, SLOT(externalAddressChanged(QHostAddress, QString)));
+ connect(tc, SIGNAL(dnsHijacked()), this, SLOT(dnsHijacked()));
+ connect(tc, SIGNAL(dnsUseless()), this, SLOT(dnsUseless()));
+ connect(tc, SIGNAL(checkingOrPortReachability(QHostAddress, quint16)),
+ this, SLOT(checkingOrPortReachability(QHostAddress, quint16)));
+ connect(tc, SIGNAL(orPortReachabilityFinished(QHostAddress, quint16, bool)),
+ this, SLOT(orPortReachabilityFinished(QHostAddress, quint16, bool)));
+ connect(tc, SIGNAL(checkingDirPortReachability(QHostAddress, quint16)),
+ this, SLOT(checkingDirPortReachability(QHostAddress, quint16)));
+ connect(tc, SIGNAL(dirPortReachabilityFinished(QHostAddress, quint16, bool)),
+ this, SLOT(dirPortReachabilityFinished(QHostAddress, quint16, bool)));
+ connect(tc, SIGNAL(serverDescriptorRejected(QHostAddress, quint16, QString)),
+ this, SLOT(serverDescriptorRejected(QHostAddress, quint16, QString)));
+ connect(tc, SIGNAL(serverDescriptorAccepted(QHostAddress, quint16)),
+ this, SLOT(serverDescriptorAccepted(QHostAddress, quint16)));
+
+ setItemDelegate(new StatusEventItemDelegate(this));
+}
+
+void
+StatusEventWidget::retranslateUi()
+{
+ /* XXX: We need to store the untranslated text for each of the status
+ * event items, iterate through all items in the list, and then
+ * retranslate them. The trick is that some of the messages are
+ * generated dynamically based on data sent by Tor (which is NOT
+ * translated). Those messages we can't retranslate correctly
+ * without also storing the variables used to generate the message.
+ */
+}
+
+void
+StatusEventWidget::setMaximumItemCount(int maximumItemCount)
+{
+ _maximumItemCount = maximumItemCount;
+
+ QTreeWidgetItem *item;
+ Qt::SortOrder order = header()->sortIndicatorOrder();
+ while (topLevelItemCount() > _maximumItemCount) {
+ if (order == Qt::AscendingOrder)
+ item = takeTopLevelItem(0);
+ else
+ item = takeTopLevelItem(topLevelItemCount()-1);
+ if (item)
+ delete item;
+ }
+}
+
+int
+StatusEventWidget::maximumItemCount() const
+{
+ return _maximumItemCount;
+}
+
+QStringList
+StatusEventWidget::selectedEvents() const
+{
+ QString text;
+ QStringList out;
+ QList<QTreeWidgetItem *> items = selectedItems();
+
+ // We have to sort the items since selectedItems() returns the order in
+ // which the items were selected, not the order in which they appear in the
+ // current list.
+ qStableSort(items.begin(), items.end(), compareStatusEventItems);
+
+ for (int i = 0; i < items.size(); i++) {
+ StatusEventItem *event = dynamic_cast<StatusEventItem *>(items.at(i));
+ if (event)
+ out.append(event->toString());
+ }
+ return out;
+}
+
+QStringList
+StatusEventWidget::allEvents() const
+{
+ QStringList out;
+ QList<QTreeWidgetItem *> items;
+
+ for (int i = 0; i < topLevelItemCount(); i++)
+ items.append(topLevelItem(i));
+
+ // Ensure the items are sorted in ascending order according to timestamp
+ qStableSort(items.begin(), items.end(), compareStatusEventItems);
+
+ for (int i = 0; i < items.size(); i++) {
+ StatusEventItem *event = dynamic_cast<StatusEventItem *>(items.at(i));
+ if (event)
+ out.append(event->toString());
+ }
+ return out;
+}
+
+void
+StatusEventWidget::customContextMenuRequested(const QPoint &pos)
+{
+ QMenu menu(this);
+
+ StatusEventItem *item = dynamic_cast<StatusEventItem *>(itemAt(pos));
+ if (! item || ! item->isSelected())
+ return;
+
+ QAction *copyAction = menu.addAction(QIcon(":/images/22x22/edit-copy.png"),
+ tr("Copy to Clipboard"));
+
+ QAction *action = menu.exec(mapToGlobal(pos));
+ if (action == copyAction) {
+ QStringList eventText = selectedEvents();
+ if (! eventText.isEmpty())
+ QApplication::clipboard()->setText(eventText.join("\n"));
+ }
+}
+
+QList<StatusEventItem *>
+StatusEventWidget::find(const QString &text, bool highlight)
+{
+ QList<StatusEventItem *> items;
+
+ for (int i = 0; i < topLevelItemCount(); i++) {
+ StatusEventItem *item = dynamic_cast<StatusEventItem *>(topLevelItem(i));
+ if (! item)
+ continue;
+
+ if (item->title().contains(text, Qt::CaseInsensitive)
+ || item->description().contains(text, Qt::CaseInsensitive)) {
+ items.append(item);
+ if (highlight)
+ item->setSelected(true);
+ } else if (highlight) {
+ item->setSelected(false);
+ }
+ }
+ return items;
+}
+
+void
+StatusEventWidget::addNotification(const QPixmap &icon,
+ const QString &title,
+ const QString &description,
+ const QString &helpUrl)
+{
+ // Check if we first need to remove the oldest item in the list in order
+ // to avoid exceeding the maximum number of notification items
+ if (topLevelItemCount() == maximumItemCount()) {
+ QTreeWidgetItem *item;
+ if (header()->sortIndicatorOrder() == Qt::AscendingOrder)
+ item = takeTopLevelItem(0);
+ else
+ item = takeTopLevelItem(topLevelItemCount()-1);
+ if (item)
+ delete item;
+ }
+
+ // Create the new notification item
+ StatusEventItem *item = new StatusEventItem(this);
+ item->setTimestamp(QTime::currentTime());
+ item->setIcon(icon);
+ item->setTitle(title);
+ item->setDescription(description);
+ item->setHelpUrl(helpUrl);
+ item->setToolTip(string_wrap(description, 80));
+
+ // Add the new item to the list and ensure it is visible
+ addTopLevelItem(item);
+ scrollToItem(item, QAbstractItemView::EnsureVisible);
+}
+
+QPixmap
+StatusEventWidget::addBadgeToPixmap(const QPixmap &pixmap,
+ const QPixmap &badge)
+{
+ QPixmap out = pixmap;
+ QPainter painter(&out);
+ painter.drawPixmap(pixmap.width() - badge.width(),
+ pixmap.height() - badge.height(),
+ badge);
+ return out;
+}
+
+QPixmap
+StatusEventWidget::addBadgeToPixmap(const QPixmap &pixmap,
+ const QString &badge)
+{
+ return StatusEventWidget::addBadgeToPixmap(pixmap, QPixmap(badge));
+}
+
+QPixmap
+StatusEventWidget::addBadgeToPixmap(const QString &pixmap,
+ const QString &badge)
+{
+ return StatusEventWidget::addBadgeToPixmap(QPixmap(pixmap), QPixmap(badge));
+}
+
+void
+StatusEventWidget::authenticated()
+{
+ TorControl *tc = Vidalia::torControl();
+
+ QString version = tc->getTorVersionString();
+ QPixmap icon = addBadgeToPixmap(":/images/48x48/tor-logo.png",
+ ":/images/32x32/dialog-ok-apply.png");
+ addNotification(icon,
+ tr("The Tor Software is Running"),
+ tr("You are currently running version \"%1\" of the Tor software.")
+ .arg(version));
+
+ // Check if Tor established a circuit before we were able to authenticate,
+ // in which case we missed the CIRCUIT_ESTABLISHED event. So fake it.
+ if (tc->isCircuitEstablished())
+ circuitEstablished();
+
+ // Check on the status of Tor's version, in case we missed that event too
+ QString status = tc->getInfo("status/version/current").toString();
+ if (! status.compare("old", Qt::CaseInsensitive)
+ || ! status.compare("obsolete", Qt::CaseInsensitive)) {
+ dangerousTorVersion(tc::ObsoleteTorVersion, version, QStringList());
+ } else if (! status.compare("unrecommended", Qt::CaseInsensitive)) {
+ dangerousTorVersion(tc::UnrecommendedTorVersion, version, QStringList());
+ }
+}
+
+void
+StatusEventWidget::disconnected()
+{
+ QPixmap icon = addBadgeToPixmap(":/images/48x48/tor-logo.png",
+ ":/images/32x32/edit-delete.png");
+
+ addNotification(icon,
+ tr("The Tor Software is not Running"),
+ tr("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."));
+
+ _squelchDescriptorAcceptedEvent = false;
+}
+
+void
+StatusEventWidget::dangerousTorVersion(tc::TorVersionStatus reason,
+ const QString &version,
+ const QStringList &recommended)
+{
+ Q_UNUSED(recommended);
+ QString description;
+ QPixmap icon;
+
+ if (reason == tc::UnrecommendedTorVersion) {
+ icon = addBadgeToPixmap(":/images/48x48/tor-logo.png",
+ ":/images/32x32/security-medium.png");
+
+ description =
+ tr("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.").arg(version);
+ } else if (reason == tc::ObsoleteTorVersion) {
+ icon = addBadgeToPixmap(":/images/48x48/tor-logo.png",
+ ":/images/32x32/security-low.png");
+
+ description =
+ tr("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.").arg(version);
+ }
+
+ addNotification(icon, tr("Your Tor Software is Out-of-date"), description);
+}
+
+void
+StatusEventWidget::circuitEstablished()
+{
+ addNotification(QPixmap(":/images/48x48/network-connect.png"),
+ tr("Connected to the Tor Network"),
+ tr("We were able to successfully establish a connection to the Tor "
+ "network. You can now configure your applications to use the Internet "
+ "anonymously."));
+}
+
+void
+StatusEventWidget::bug(const QString &description)
+{
+ QPixmap icon = addBadgeToPixmap(":/images/48x48/tor-logo.png",
+ ":/images/32x32/script-error.png");
+ addNotification(icon,
+ tr("Tor Software Error"),
+ tr("The Tor software encountered an internal bug. Please report the "
+ "following error message to the Tor developers at bugs.torproject.org: "
+ "\"%1\"").arg(description));
+}
+
+void
+StatusEventWidget::clockSkewed(int skew, const QString &source)
+{
+ if (source.startsWith("OR:", Qt::CaseInsensitive)) {
+ // Tor versions 0.2.1.19 and earlier, and 0.2.2.1 and earlier, throw
+ // this message a little too liberally in this case.
+ quint32 torVersion = Vidalia::torControl()->getTorVersion();
+ if (torVersion <= 0x00020113)
+ return;
+ QString str = Vidalia::torControl()->getTorVersionString();
+ if (str.startsWith("0.2.2.") && torVersion <= 0x00020201)
+ return;
+ }
+
+ QString description;
+ QPixmap icon = addBadgeToPixmap(":/images/48x48/chronometer.png",
+ ":/images/32x32/dialog-warning.png");
+
+ if (skew < 0) {
+ description =
+ tr("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.").arg(qAbs(skew))
+ .arg(source);
+ } else {
+ description =
+ tr("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.").arg(qAbs(skew))
+ .arg(source);
+ }
+ addNotification(icon, tr("Your Computer's Clock is Potentially Incorrect"),
+ description);
+}
+
+void
+StatusEventWidget::dangerousPort(quint16 port, bool rejected)
+{
+ QPixmap icon;
+ QString description;
+
+ if (rejected) {
+ icon = addBadgeToPixmap(":/images/48x48/applications-internet.png",
+ ":/images/32x32/security-low.png");
+
+ description =
+ tr("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.").arg(port);
+ } else {
+ icon = addBadgeToPixmap(":/images/48x48/applications-internet.png",
+ ":/images/32x32/security-medium.png");
+ description =
+ tr("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.").arg(port);
+ }
+
+ addNotification(icon, tr("Potentially Dangerous Connection!"), description);
+}
+
+void
+StatusEventWidget::socksError(tc::SocksError type, const QString &destination)
+{
+ QString title, description;
+ QPixmap icon = QPixmap(":/images/48x48/applications-internet.png");
+
+ if (type == tc::DangerousSocksTypeError) {
+ icon = addBadgeToPixmap(icon, ":/images/32x32/security-medium.png");
+
+ title = tr("Potentially Dangerous Connection!");
+ description =
+ tr("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.")
+ .arg(destination);
+ } else if (type == tc::UnknownSocksProtocolError) {
+ icon = addBadgeToPixmap(icon, ":/images/32x32/dialog-warning.png");
+
+ title = tr("Unknown SOCKS Protocol");
+ description =
+ tr("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.");
+ } else if (type == tc::BadSocksHostnameError) {
+ icon = addBadgeToPixmap(icon, ":/images/32x32/dialog-warning.png");
+
+ title = tr("Invalid Destination Hostname");
+ description =
+ tr("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.").arg(destination);
+ } else {
+ return;
+ }
+
+ addNotification(icon, title, description);
+}
+
+void
+StatusEventWidget::externalAddressChanged(const QHostAddress &ip,
+ const QString &hostname)
+{
+ QString hostString = hostname.isEmpty() ? QString()
+ : QString(" (%1)").arg(hostname);
+
+ addNotification(QPixmap(":/images/48x48/applications-internet.png"),
+ tr("External IP Address Changed"),
+ tr("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.").arg(ip.toString()).arg(hostString));
+}
+
+void
+StatusEventWidget::dnsHijacked()
+{
+ QPixmap icon = addBadgeToPixmap(":/images/48x48/applications-internet.png",
+ ":/images/32x32/dialog-warning.png");
+ addNotification(icon,
+ tr("DNS Hijacking Detected"),
+ tr("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."));
+}
+
+void
+StatusEventWidget::dnsUseless()
+{
+ QPixmap icon = addBadgeToPixmap(":/images/48x48/applications-internet.png",
+ ":/images/32x32/edit-delete.png");
+ addNotification(icon,
+ tr("DNS Hijacking Detected"),
+ tr("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."));
+}
+
+void
+StatusEventWidget::checkingOrPortReachability(const QHostAddress &ip,
+ quint16 port)
+{
+ addNotification(QPixmap(":/images/48x48/network-wired.png"),
+ tr("Checking Server Port Reachability"),
+ tr("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.").arg(ip.toString()).arg(port));
+}
+
+void
+StatusEventWidget::orPortReachabilityFinished(const QHostAddress &ip,
+ quint16 port,
+ bool reachable)
+{
+ QString title, description;
+ QPixmap icon = QPixmap(":/images/48x48/network-wired.png");
+ if (reachable) {
+ icon = addBadgeToPixmap(icon, ":/images/32x32/dialog-ok-apply.png");
+ title = tr("Server Port Reachability Test Successful!");
+ description =
+ tr("Your relay's server port is reachable from the Tor network!");
+ } else {
+ icon = addBadgeToPixmap(icon, ":/images/32x32/dialog-warning.png");
+ title = tr("Server Port Reachability Test Failed");
+ description =
+ tr("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.")
+ .arg(ip.toString()).arg(port);
+ }
+
+ addNotification(icon, title, description);
+}
+
+void
+StatusEventWidget::checkingDirPortReachability(const QHostAddress &ip,
+ quint16 port)
+{
+ addNotification(QPixmap(":/images/48x48/network-wired.png"),
+ tr("Checking Directory Port Reachability"),
+ tr("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.").arg(ip.toString()).arg(port));
+}
+
+void
+StatusEventWidget::dirPortReachabilityFinished(const QHostAddress &ip,
+ quint16 port,
+ bool reachable)
+{
+ QString title, description;
+ QPixmap icon = QPixmap(":/images/48x48/network-wired.png");
+ if (reachable) {
+ icon = addBadgeToPixmap(icon, ":/images/32x32/dialog-ok-apply.png");
+ title = tr("Directory Port Reachability Test Successful!");
+ description =
+ tr("Your relay's directory port is reachable from the Tor network!");
+ } else {
+ icon = addBadgeToPixmap(icon, ":/images/32x32/dialog-warning.png");
+ title = tr("Directory Port Reachability Test Failed");
+ description =
+ tr("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.")
+ .arg(ip.toString()).arg(port);
+ }
+
+ addNotification(icon, title, description);
+}
+
+void
+StatusEventWidget::serverDescriptorRejected(const QHostAddress &ip,
+ quint16 port,
+ const QString &reason)
+{
+ QPixmap icon =
+ addBadgeToPixmap(":/images/48x48/preferences-system-network-sharing.png",
+ ":/images/32x32/dialog-warning.png");
+
+ addNotification(icon,
+ tr("Relay Descriptor Rejected"),
+ tr("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").arg(ip.toString()).arg(port).arg(reason));
+}
+
+void
+StatusEventWidget::serverDescriptorAccepted(const QHostAddress &ip,
+ quint16 port)
+{
+ Q_UNUSED(ip);
+ Q_UNUSED(port);
+
+ if (_squelchDescriptorAcceptedEvent)
+ return;
+ _squelchDescriptorAcceptedEvent = true;
+
+ QPixmap icon =
+ addBadgeToPixmap(":/images/48x48/preferences-system-network-sharing.png",
+ ":/images/32x32/dialog-ok-apply.png");
+
+ addNotification(icon,
+ tr("Your Relay is Online"),
+ tr("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!"));
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventWidget.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventWidget.h
new file mode 100644
index 0000000..77df5ea
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/log/StatusEventWidget.h
@@ -0,0 +1,234 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 StatusEventWidget.h
+** \version $Id: StatusEventWidget.h 4122 2009-09-16 01:22:27Z edmanm $
+** \brief Displays information on Tor status events
+*/
+
+#ifndef _STATUSEVENTWIDGET_H
+#define _STATUSEVENTWIDGET_H
+
+#include <QTreeWidget>
+
+#include "TorControl.h"
+
+#include <QList>
+
+class QPixmap;
+class QString;
+class QPoint;
+class QStringList;
+
+class StatusEventItem;
+
+class StatusEventWidget : public QTreeWidget
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor.
+ */
+ StatusEventWidget(QWidget *parent = 0);
+
+ /** Sets the maximum number of status event items displayed to
+ * <b>maximumItemCount</b>. If the current number of items displayed
+ * exceeds <b>maximumItemCount</b>, the oldest items will be removed until
+ * topLevelItemCount() is equal to the new limit.
+ */
+ void setMaximumItemCount(int maximumItemCount);
+
+ /** Returns the maximum number of status items that can be displayed in
+ * this StatusEventWidget.
+ */
+ int maximumItemCount() const;
+
+ /** Returns a QStringList of the currently selected status events formatted
+ * as human-readable text. Each item in the returned QStringList represents
+ * a single status event.
+ */
+ QStringList selectedEvents() const;
+
+ /** Returns a QStringList of all current status events formatted as
+ * human-readable text. Each item in the returned QStringList represents
+ * a single status event.
+ */
+ QStringList allEvents() const;
+
+ /** Searches the list of current status event items for any items that
+ * contain <b>text</b> in either the event title or description. Searching
+ * is done case-insensitively. If <b>highlight</b> is true, any previously
+ * selected items will be deselected and the matching items will be
+ * highlighted. Returns a (possibly empty) list of matching items.
+ */
+ QList<StatusEventItem *> find(const QString &text, bool highlight = true);
+
+protected:
+ /** Called when the user has changed the UI display language in Vidalia
+ * indicating all the displayed text widgets need to be updated to
+ * display their value in the newly chosen language.
+ */
+ virtual void retranslateUi();
+
+private slots:
+ /** Copies the text for all selected event items to the system
+ * clipboard.
+ * \sa selectedEvents()
+ */
+ void customContextMenuRequested(const QPoint &pos);
+
+ /** Called when the control socket is connected and authenticated. */
+ void authenticated();
+
+ /** Called when the controller has disconnected from Tor */
+ void disconnected();
+
+ /** Indicates that Tor has decided the user's Tor software <b>version</b>
+ * is no longer recommended for some <b>reason</b>. <b>recommended</b> is
+ * a list of Tor software versions that are considered current.
+ */
+ void dangerousTorVersion(tc::TorVersionStatus reason,
+ const QString &version,
+ const QStringList &recommended);
+
+ /** Indicates Tor has been able to successfully establish one or more
+ * circuits.
+ */
+ void circuitEstablished();
+
+ /** Emitted when Tor has encountered an internal bug. <b>reason</b> is
+ * Tor's description of the bug.
+ */
+ void bug(const QString &reason);
+
+ /** Indicates that Tor has determined the client's clock is potentially
+ * skewed by <b>skew</b> seconds relative to <b>source</b>.
+ */
+ void clockSkewed(int skew, const QString &source);
+
+ /** Called when the user attempts to establish a connection to some
+ * destination on port <b>port</b>, which is a port known to use
+ * plaintext connections (as determined by Tor's WarnPlaintextPorts and
+ * RejectPlaintextPorts torrc options). <b>rejected</b> indicates whether
+ * Tor rejected the connection or permitted it to connect anyway.
+ */
+ void dangerousPort(quint16 port, bool rejected);
+
+ /** Called when Tor detects a problem with a SOCKS connection from the
+ * user, such as a bad hostname, dangerous SOCKS protocol type, or a bad
+ * hostname. <b>type</b> indicates the type of error encountered and
+ * <b>destination</b> (if non-empty) specifies the attempted connection
+ * destination address or hostname.
+ */
+ void socksError(tc::SocksError type, const QString &destination);
+
+ /** Called when Tor decides the client's external IP address has changed
+ * to <b>ip</b>. If <b>hostname</b> is non-empty, Tor obtained the new
+ * value for <b>ip</b> by resolving <b>hostname</b>.
+ */
+ void externalAddressChanged(const QHostAddress &ip, const QString &hostname);
+
+ /** Called when Tor determines that the user's DNS provider is providing
+ * an address for non-existent domains when it should really be saying
+ * "NXDOMAIN".
+ */
+ void dnsHijacked();
+
+ /** Called when Tor determines that the user's DNS provider is providing
+ * a hijacked address even for well-known websites.
+ */
+ void dnsUseless();
+
+ /** Indicates Tor has started testing the reachability of its OR port
+ * using the IP address <b>ip</b> and port <b>port</b>.
+ */
+ void checkingOrPortReachability(const QHostAddress &ip, quint16 port);
+
+ /** Tor has completed testing the reachability of its OR port using
+ * the IP address <b>ip</b> and port <b>port</b>. If the user's OR port
+ * was reachable, <b>reachable</b> will be set to true.
+ */
+ void orPortReachabilityFinished(const QHostAddress &ip, quint16 port,
+ bool reachable);
+
+ /** Indicates Tor has started testing the reachability of its directory
+ * port using the IP address <b>ip</b> and port <b>port</b>.
+ */
+ void checkingDirPortReachability(const QHostAddress &ip, quint16 port);
+
+ /** Tor has completed testing the reachability of its directory port using
+ * the IP address <b>ip</b> and port <b>port</b>. If the user's directory
+ * port was reachable, <b>reachable</b> will be set to true.
+ */
+ void dirPortReachabilityFinished(const QHostAddress &ip, quint16 port,
+ bool reachable);
+
+ /** Called when the directory authority with IP address <b>ip</b> and
+ * port <b>port</b> rejected the user's server descriptor. <b>reason</b>
+ * describes why the descriptor was rejected (e.g., malformed, skewed
+ * clock, etc.).
+ */
+ void serverDescriptorRejected(const QHostAddress &ip, quint16 port,
+ const QString &reason);
+
+ /** Emitted when the directory authority with IP address <b>ip</b> and
+ * port <b>port</b> accepted the user's server descriptor.
+ */
+ void serverDescriptorAccepted(const QHostAddress &ip, quint16 port);
+
+private:
+ /** Adds a new status event notification item to the widget. The item will
+ * be drawn using the specified <b>icon</b>, short event <b>title</b>,
+ * and a longer detailed <b>description</b>. If <b>helpUrl</b> is not
+ * empty, the item will also have a clickable question mark icon in the
+ * corner.
+ */
+ void addNotification(const QPixmap &icon,
+ const QString &title,
+ const QString &description,
+ const QString &helpUrl = QString());
+
+ /** Creates a new QPixmap using <b>pixmap</b> as the main image and
+ * overlays <b>badge</b> in the lower-right corner of the image.
+ */
+ static QPixmap addBadgeToPixmap(const QPixmap &pixmap,
+ const QPixmap &badge);
+
+ /** Overloaded method provided for convenience. Constructs QPixmap objects
+ * from the Qt resource URLs <b>pixmap</b> and <b>badge</b>.
+ * \sa addBadgeToPixmap(QPixmap, QPixmap)
+ */
+ static QPixmap addBadgeToPixmap(const QString &pixmap,
+ const QString &badge);
+
+ /** Overloaded method provided for convenience. Constructs a QPixmap object
+ * for the Qt resource URL <b>badge</b>, and applies it to <b>pixmap</b>.
+ * \sa addBadgeToPixmap(QPixmap, QPixmap)
+ */
+ static QPixmap addBadgeToPixmap(const QPixmap &pixmap,
+ const QString &badge);
+
+ /** Maximum number of event notifications contained in the StatusEventWidget
+ * at any given time.
+ * \sa setMaximumItemCount()
+ */
+ int _maximumItemCount;
+
+ /** Tor sends a ACCEPTED_SERVER_DESCRIPTOR event every time it manages to
+ * upload the user's relay's descriptor to a directory authority. So we
+ * squelch any such events after the first to avoid blasting the user with
+ * "Hey, your relay is working!" messages.
+ */
+ bool _squelchDescriptorAcceptedEvent;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/main.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/main.cpp
new file mode 100644
index 0000000..66eb98b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/main.cpp
@@ -0,0 +1,222 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 main.cpp
+** \version $Id: main.cpp 4062 2009-08-21 03:42:25Z edmanm $
+** \brief Main Vidalia entry point
+*/
+
+#include "config.h"
+#include "Vidalia.h"
+#include "MainWindow.h"
+#include "VMessageBox.h"
+#if defined(USE_BREAKPAD)
+#include "CrashReporter.h"
+#endif
+
+#include "procutil.h"
+#include "stringutil.h"
+
+#include <QObject>
+#if defined(Q_OS_WIN32)
+#include <QSysInfo>
+#endif
+#if defined(HAVE_SIGNAL_H)
+#include <signal.h>
+#endif
+
+#if defined(USE_BREAKPAD)
+void
+setup_crash_reporter()
+{
+ /* Set the crash reporting application used to submit minidumps. On Windows,
+ * crashreporter.exe is assumed to live in the same directory as vidalia.exe.
+ */
+#if defined(Q_OS_WIN32)
+ QString crashReporter = Vidalia::applicationDirPath() + "\\crashreporter.exe";
+#elif defined(Q_OS_MAC)
+ QString crashReporter = Vidalia::applicationDirPath() + "/CrashReporter.app";
+#endif
+ if (! QFileInfo(crashReporter).isExecutable()) {
+ vWarn("Unable to find crash reporting application. Crash reporting will "
+ "be unavailable.");
+ return;
+ }
+ if (! CrashReporter::set_crash_reporter(crashReporter)) {
+ vWarn("Vidalia found the crash reporting application, but the path is "
+ "longer than your platform supports. Skipping crash reporting.");
+ return;
+ }
+
+ /* Set the Vidalia executable and options used to restart Vidalia after a
+ * crash. We strip off the first argument in Vidalia::arguments(), since
+ * it's the application name again anyway. */
+ CrashReporter::set_restart_options(Vidalia::applicationFilePath(),
+ Vidalia::arguments().mid(1));
+
+ /* Set the build version that gets saved with a minidump. */
+ CrashReporter::set_build_version(VIDALIA_VERSION);
+
+ /* Install the exception handler and give it the location to which Breakpad
+ * should write its minidumps. */
+ QString dumpPath = Vidalia::dataDirectory() + "/crashreports";
+ if (! CrashReporter::install_exception_handler(dumpPath)) {
+ vWarn("Unable to setup Breakpad exception handler. Crash reporting "
+ "will be unavailable.");
+ } else {
+ vInfo("Installed Breakpad exception handler.");
+ }
+}
+#endif
+
+extern "C" void
+signal_handler(int signal)
+{
+#ifdef HAVE_SIGNAL_H
+ if (signal == SIGINT || signal == SIGTERM)
+ vApp->quit();
+#endif
+}
+
+void
+install_signal_handler()
+{
+#if defined(HAVE_SIGACTION)
+ struct sigaction action;
+
+ sigemptyset(&action.sa_mask);
+ action.sa_handler = signal_handler;
+ action.sa_flags = 0;
+
+ if (sigaction(SIGINT, &action, NULL) < 0)
+ vWarn("Failed to install SIGINT handler.");
+ if (sigaction(SIGTERM, &action, NULL) < 0)
+ vWarn("Failed to install SIGTERM handler.");
+#elif defined(HAVE_SIGNAL)
+ if (signal(SIGINT, signal_handler) == SIG_ERR)
+ vWarn("Failed to install SIGINT handler.");
+ if (signal(SIGTERM, signal_handler) == SIG_ERR)
+ vWarn("Failed to install SIGTERM handler.");
+#endif
+}
+
+/** Returns true if there is already another Vidalia process running. */
+bool
+is_vidalia_running(const QString &pidfile)
+{
+ /* Read the pidfile and find out if that process still exists */
+ qint64 pid = read_pidfile(pidfile);
+ if (pid > 0) {
+#if defined(Q_OS_WIN32)
+ if (QSysInfo::WindowsVersion == QSysInfo::WV_NT) {
+ /* We currently can't get a list of running processes on Windows NT, so
+ * be pessimistic and assume the existence of a nonzero pidfile means
+ * Vidalia is running. */
+ return true;
+ } else
+ return (is_process_running(pid));
+#else
+ return (is_process_running(pid));
+#endif
+ }
+ return false;
+}
+
+/** Main application entry point. */
+int
+main(int argc, char *argv[])
+{
+ Q_INIT_RESOURCE(vidalia);
+ QStringList args = char_array_to_stringlist(argv+1, argc-1);
+
+ /* Construct the application object. Qt strips any command-line arguments
+ * that it recognizes in argv, so we'll pass a stringlist of the original
+ * list of command-line arguments too. */
+ Vidalia vidalia(args, argc, argv);
+ vNotice("Vidalia %1 using Qt %2").arg(Vidalia::version())
+ .arg(QT_VERSION_STR);
+
+#if defined(USE_BREAKPAD)
+ /* Set up the crash reporting application and exception handlers. */
+ setup_crash_reporter();
+#endif
+#if defined(USE_MARBLE) && defined(Q_OS_WIN32)
+ vApp->addLibraryPath(vApp->applicationDirPath() + "/plugins/qt");
+#endif
+
+ /* Install a signal handler to clean up properly after a catching a
+ * SIGINT or SIGTERM. */
+ install_signal_handler();
+
+ /* Validate any command-line arguments, or show usage message box, if
+ * necessary. */
+ QString errmsg;
+ if (vidalia.showUsage()) {
+ Vidalia::showUsageMessageBox();
+ return 0;
+ } else if (!vidalia.validateArguments(errmsg)) {
+ vError("Unable to apply command-line arguments: %1").arg(errmsg);
+ VMessageBox::critical(0,
+ vApp->translate("Vidalia",
+ QT_TRANSLATE_NOOP("Vidalia", "Invalid Argument")), errmsg,
+ VMessageBox::Ok);
+ return 1;
+ }
+
+ /* Check if Vidalia is already running. */
+ QString pidfile = vidalia.pidFile();
+ if (is_vidalia_running(pidfile)) {
+ vWarn("Detected another process with pid %1. Is Vidalia already running?")
+ .arg(get_pid());
+ /* Let the user know another Vidalia is running and we are going to exit
+ * now. */
+ int ret = VMessageBox::critical(0,
+ vApp->translate("Vidalia",
+ QT_TRANSLATE_NOOP("Vidalia", "Vidalia is already running")),
+ vApp->translate("Vidalia",
+ QT_TRANSLATE_NOOP("Vidalia",
+ "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?")),
+ VMessageBox::Continue, VMessageBox::Quit|VMessageBox::Default);
+ if (ret != VMessageBox::Continue) {
+ /* Don't start a second instance of Vidalia */
+ vError("Exiting duplicate Vidalia process.");
+ return 1;
+ }
+ }
+ write_pidfile(pidfile);
+
+ /* Since we don't have a visible main window, if we were to display a
+ * QMessageBox (for example, to display an error when starting or stopping
+ * Tor) then the application would exit when that message box was closed.
+ * Setting quitOnLastWindowClosed to false fixes this behavior. */
+ Vidalia::setQuitOnLastWindowClosed(false);
+
+ /* Create an instance of the main window */
+ MainWindow mainWin;
+
+ /* Run Vidalia */
+ int ret = vidalia.run();
+
+ /* Vidalia exited, so cleanup our pidfile and return */
+ QFile::remove(pidfile);
+ vNotice("Vidalia is exiting cleanly (return code %1).").arg(ret);
+
+#if defined(USE_BREAKPAD)
+ vInfo("Removing Breakpad exception handler.");
+ CrashReporter::remove_exception_handler();
+#endif
+
+ return ret;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/CircuitItem.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/CircuitItem.cpp
new file mode 100644
index 0000000..b582e08
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/CircuitItem.cpp
@@ -0,0 +1,76 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 CircuitItem.cpp
+** \version $Id: CircuitItem.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Item representing a Tor circuit and its status
+*/
+
+#include "CircuitItem.h"
+#include "CircuitListWidget.h"
+
+
+/** Constructor */
+CircuitItem::CircuitItem(const Circuit &circuit)
+{
+ /* Update the displayed text */
+ update(circuit);
+}
+
+/** Updates the status and path of this circuit item. */
+void
+CircuitItem::update(const Circuit &circuit)
+{
+ QString displayedPath;
+
+ /* Save the Circuit object */
+ _circuit = circuit;
+
+ /* Use a semi-meaningful value if the path is empty */
+ displayedPath = circuit.length() > 0 ? circuit.routerNames().join(",")
+ : tr("<Path Empty>");
+
+ /* Update the column fields */
+ setText(CircuitListWidget::ConnectionColumn, displayedPath);
+ setToolTip(CircuitListWidget::ConnectionColumn, displayedPath);
+ setText(CircuitListWidget::StatusColumn, circuit.statusString());
+ setToolTip(CircuitListWidget::StatusColumn, circuit.statusString());
+}
+
+/** Adds a stream as a child of this circuit. */
+void
+CircuitItem::addStream(StreamItem *stream)
+{
+ addChild(stream);
+}
+
+/** Removes the stream item from this circuit and frees its memory */
+void
+CircuitItem::removeStream(StreamItem *stream)
+{
+ int index = indexOfChild(stream);
+ if (index > -1) {
+ delete takeChild(index);
+ }
+}
+
+/** Returns a list of all stream items on this circuit. */
+QList<StreamItem *>
+CircuitItem::streams() const
+{
+ QList<StreamItem *> streams;
+ int n = childCount();
+ for (int i = 0; i < n; i++) {
+ streams << (StreamItem *)child(i);
+ }
+ return streams;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/CircuitItem.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/CircuitItem.h
new file mode 100644
index 0000000..dbf6c9b
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/CircuitItem.h
@@ -0,0 +1,55 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 CircuitItem.h
+** \version $Id: CircuitItem.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief List item representing a Tor circuit and its status
+*/
+
+#ifndef _CIRCUITITEM_H
+#define _CIRCUITITEM_H
+
+#include "StreamItem.h"
+
+#include "Circuit.h"
+#include "Stream.h"
+
+#include <QApplication>
+#include <QTreeWidgetItem>
+
+
+class CircuitItem : public QTreeWidgetItem
+{
+ Q_DECLARE_TR_FUNCTIONS(CircuitItem)
+
+public:
+ /** Default constructor */
+ CircuitItem(const Circuit &circuit);
+
+ /** Adds a stream to this circuit item */
+ void addStream(StreamItem *stream);
+ /** Removes the stream item from the list and frees its memory. */
+ void removeStream(StreamItem *stream);
+ /** Updates the status of this circuit item using the given circuit. */
+ void update(const Circuit &circuit);
+ /** Returns the ID for this circuit. */
+ CircuitId id() const { return _circuit.id(); }
+ /** Returns the Circuit object for this item. */
+ Circuit circuit() const { return _circuit; }
+ /** Returns a list of all stream items on this circuit. */
+ QList<StreamItem *> streams() const;
+
+private:
+ Circuit _circuit; /**< Circuit associated with this item. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/CircuitListWidget.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/CircuitListWidget.cpp
new file mode 100644
index 0000000..4d21ece
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/CircuitListWidget.cpp
@@ -0,0 +1,363 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 CircuitListWidget.cpp
+** \version $Id: CircuitListWidget.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Collection of Tor circuits as CircuitItems
+*/
+
+#include "config.h"
+#include "CircuitListWidget.h"
+#include "Vidalia.h"
+
+#include <QPoint>
+#include <QTimer>
+
+#define IMG_CLOSE ":/images/22x22/edit-delete.png"
+#define IMG_ZOOM ":/images/22x22/page-zoom.png"
+
+#define CLOSED_CIRCUIT_REMOVE_DELAY 3000
+#define FAILED_CIRCUIT_REMOVE_DELAY 5000
+#define CLOSED_STREAM_REMOVE_DELAY 3000
+#define FAILED_STREAM_REMOVE_DELAY 4000
+
+
+/** Default constructor. */
+CircuitListWidget::CircuitListWidget(QWidget *parent)
+: QTreeWidget(parent)
+{
+ /* Create and initialize columns */
+ setHeaderLabels(QStringList() << tr("Connection") << tr("Status"));
+
+ /* Find out when a circuit has been selected */
+ connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
+ this, SLOT(onSelectionChanged(QTreeWidgetItem*,QTreeWidgetItem*)));
+ connect(this, SIGNAL(customContextMenuRequested(QPoint)),
+ this, SLOT(customContextMenuRequested(QPoint)));
+
+ /* Respond to the Delete key by closing whatever circuits or streams are
+ * selected. */
+ vApp->createShortcut(QKeySequence::Delete, this, this,
+ SLOT(closeSelectedConnections()));
+}
+
+/** Called when the user changes the UI translation. */
+void
+CircuitListWidget::retranslateUi()
+{
+ setHeaderLabels(QStringList() << tr("Connection") << tr("Status"));
+ 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());
+ }
+ }
+}
+
+/** Called when the user requests a context menu on a circuit or stream in the
+ * list and displays a context menu appropriate for whichever type of item is
+ * currently selected. */
+void
+CircuitListWidget::customContextMenuRequested(const QPoint &pos)
+{
+ QMenu menu(this);
+
+ /* Find out which item was right-clicked */
+ QTreeWidgetItem *item = itemAt(pos);
+ if (!item)
+ return;
+
+ if (!item->parent()) {
+ /* A circuit was selected */
+ CircuitItem *circuitItem = dynamic_cast<CircuitItem *>(item);
+ if (!circuitItem)
+ return;
+
+ /* Set up the circuit context menu */
+ QAction *zoomAct = new QAction(QIcon(IMG_ZOOM),
+ tr("Zoom to Circuit"), this);
+ QAction *closeAct = new QAction(QIcon(IMG_CLOSE),
+ tr("Close Circuit (Del)"), this);
+#if defined(USE_MARBLE)
+ zoomAct->setEnabled(circuitItem->circuit().status() == Circuit::Built);
+ menu.addAction(zoomAct);
+ menu.addSeparator();
+#endif
+ menu.addAction(closeAct);
+
+ /* Display the context menu and find out which (if any) action was
+ * selected */
+ QAction* action = menu.exec(mapToGlobal(pos));
+ if (action == closeAct)
+ emit closeCircuit(circuitItem->id());
+ else if (action == zoomAct)
+ emit zoomToCircuit(circuitItem->id());
+ } else {
+ /* A stream was selected */
+ StreamItem *streamItem = dynamic_cast<StreamItem *>(item);
+ if (!streamItem)
+ return;
+
+ /* Set up the stream context menu */
+ QAction *closeAct = new QAction(QIcon(IMG_CLOSE),
+ tr("Close Stream (Del)"), this);
+ menu.addAction(closeAct);
+
+ /* Display the context menu and find out which (if any) action was
+ * selected */
+ QAction* action = menu.exec(mapToGlobal(pos));
+ if (action == closeAct)
+ emit closeStream(streamItem->id());
+ }
+}
+
+/** Closes all selected circuits or streams. */
+void
+CircuitListWidget::closeSelectedConnections()
+{
+ QList<QTreeWidgetItem *> items = selectedItems();
+ foreach (QTreeWidgetItem *item, items) {
+ if (!item->parent()) {
+ CircuitItem *circuitItem = dynamic_cast<CircuitItem *>(item);
+ if (circuitItem)
+ emit closeCircuit(circuitItem->id());
+ } else {
+ StreamItem *streamItem = dynamic_cast<StreamItem *>(item);
+ if (streamItem)
+ emit closeStream(streamItem->id());
+ }
+ }
+}
+
+/** Adds a <b>circuit</b> to the list. If the circuit already exists in the
+ * list, the status and path will be updated. */
+void
+CircuitListWidget::addCircuit(const Circuit &circuit)
+{
+ /* Check to see if the circuit already exists in the tree */
+ CircuitItem *item = findCircuitItem(circuit.id());
+
+ if (!item) {
+ /* Add the new circuit */
+ item = new CircuitItem(circuit);
+ addTopLevelItem(item);
+ } else {
+ /* Circuit already exists, so update its status and path */
+ item->update(circuit);
+ }
+
+ /* If the circuit is closed or dead, schedule it for removal */
+ Circuit::Status status = circuit.status();
+ if (status == Circuit::Closed) {
+ scheduleCircuitRemoval(item, CLOSED_CIRCUIT_REMOVE_DELAY);
+ } else if (status == Circuit::Failed) {
+ scheduleCircuitRemoval(item, FAILED_CIRCUIT_REMOVE_DELAY);
+ }
+}
+
+/** Adds a stream to the list. If the stream already exists in the list, the
+ * status and path will be updated. */
+void
+CircuitListWidget::addStream(const Stream &stream)
+{
+ /* Check to see if the stream already exists in the tree */
+ StreamItem *item = findStreamItem(stream.id());
+
+ if (!item) {
+ CircuitItem *circuit = findCircuitItem(stream.circuitId());
+ /* New stream, so try to find its circuit and add it */
+ if (circuit) {
+ circuit->addStream(new StreamItem(stream));
+ expandItem(circuit);
+ }
+ } else {
+ /* Stream already exists, so just update its status */
+ item->update(stream);
+
+ /* If the stream is closed or dead, schedule it for removal */
+ Stream::Status status = stream.status();
+ if (status == Stream::Closed) {
+ scheduleStreamRemoval(item, CLOSED_STREAM_REMOVE_DELAY);
+ } else if (status == Stream::Failed) {
+ scheduleStreamRemoval(item, FAILED_STREAM_REMOVE_DELAY);
+ }
+ }
+}
+
+/** Schedules the given circuit to be removed after the specified timeout. */
+void
+CircuitListWidget::scheduleCircuitRemoval(CircuitItem *circuit, int delay)
+{
+ if (!_circuitRemovalList.contains(circuit)) {
+ _circuitRemovalList << circuit;
+ QTimer::singleShot(delay, this, SLOT(removeCircuit()));
+ }
+}
+
+/** Schedules the given stream to be removed after the specified timeout. */
+void
+CircuitListWidget::scheduleStreamRemoval(StreamItem *stream, int delay)
+{
+ if (!_streamRemovalList.contains(stream)) {
+ _streamRemovalList << stream;
+ QTimer::singleShot(delay, this, SLOT(removeStream()));
+ }
+}
+
+/** Removes the first circuit scheduled to be removed. */
+void
+CircuitListWidget::removeCircuit()
+{
+ if (!_circuitRemovalList.isEmpty()) {
+ CircuitItem *circuitItem = _circuitRemovalList.takeFirst();
+ Circuit circuit = circuitItem->circuit();
+ removeCircuit(circuitItem);
+ emit circuitRemoved(circuit.id());
+ }
+}
+
+/** Removes the given circuit item and all streams on that circuit. */
+void
+CircuitListWidget::removeCircuit(CircuitItem *circuit)
+{
+ if (circuit) {
+ /* Remove all streams (if any) on this circuit. */
+ QList<StreamItem *> streams = circuit->streams();
+ foreach (StreamItem *stream, streams) {
+ /* Check if this stream was scheduled for removal already */
+ if (_streamRemovalList.contains(stream)) {
+ /* If this stream was already scheduled for removal, replace its pointer
+ * with 0, so it doesn't get removed twice. */
+ int index = _streamRemovalList.indexOf(stream);
+ _streamRemovalList.replace(index, (StreamItem *)0);
+ }
+
+ /* Remove the stream item from the circuit */
+ circuit->removeStream(stream);
+ }
+ /* Remove the circuit item itself */
+ delete takeTopLevelItem(indexOfTopLevelItem(circuit));
+ }
+}
+
+/** Removes the first stream scheduled to be removed. */
+void
+CircuitListWidget::removeStream()
+{
+ if (!_streamRemovalList.isEmpty()) {
+ StreamItem *stream = _streamRemovalList.takeFirst();
+ removeStream(stream);
+ }
+}
+
+/** Removes the given stream item. */
+void
+CircuitListWidget::removeStream(StreamItem *stream)
+{
+ if (stream) {
+ /* Try to get the stream's parent (a circuit item) */
+ CircuitItem *circuit = (CircuitItem *)stream->parent();
+ if (circuit) {
+ /* Remove the stream from the circuit and delete the item */
+ circuit->removeStream(stream);
+ } else {
+ /* It isn't on a circuit, so just delete the stream */
+ delete stream;
+ }
+ }
+}
+
+/** Clears all circuits and streams from the list. */
+void
+CircuitListWidget::clearCircuits()
+{
+ QTreeWidget::clear();
+ _circuitRemovalList.clear();
+ _streamRemovalList.clear();
+}
+
+/** Finds the circuit with the given ID and returns a pointer to that
+ * circuit's item in the list. */
+CircuitItem*
+CircuitListWidget::findCircuitItem(const CircuitId &circid)
+{
+ int numCircs = topLevelItemCount();
+ for (int i = 0; i < numCircs; i++) {
+ CircuitItem *circuit = (CircuitItem *)topLevelItem(i);
+ if (circid == circuit->id()) {
+ return circuit;
+ }
+ }
+ return 0;
+}
+
+/** Finds the stream with the given ID and returns a pointer to that stream's
+ * item in the list. */
+StreamItem*
+CircuitListWidget::findStreamItem(const StreamId &streamid)
+{
+ int numCircs = topLevelItemCount();
+ int numStreams;
+
+ for (int i = 0; i < numCircs; i++) {
+ CircuitItem *circuit = (CircuitItem *)topLevelItem(i);
+ numStreams = circuit->childCount();
+
+ for (int j = 0; j < numStreams; j++) {
+ StreamItem *stream = (StreamItem *)circuit->child(j);
+ if (streamid == stream->id()) {
+ return stream;
+ }
+ }
+ }
+ return 0;
+}
+
+/** Called when the current item selection has changed. */
+void
+CircuitListWidget::onSelectionChanged(QTreeWidgetItem *cur,
+ QTreeWidgetItem *prev)
+{
+ Q_UNUSED(prev);
+
+ if (cur) {
+ Circuit circuit;
+
+ if (!cur->parent()) {
+ /* User selected a CircuitItem, so just grab the Circuit */
+ circuit = ((CircuitItem *)cur)->circuit();
+ } else {
+ /* User selected a StreamItem, so get its parent and then the Circuit */
+ CircuitItem *circItem = (CircuitItem *)cur->parent();
+ circuit = circItem->circuit();
+ }
+
+ /* If this circuit has a path, then emit it so we can highlight it */
+ emit circuitSelected(circuit);
+ }
+}
+
+/** Returns a list of circuits currently in the widget. */
+CircuitList
+CircuitListWidget::circuits()
+{
+ int numCircs = topLevelItemCount();
+ CircuitList circs;
+
+ for (int i = 0; i < numCircs; i++) {
+ CircuitItem *circ = (CircuitItem *)topLevelItem(i);
+ circs << circ->circuit();
+ }
+ return circs;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/CircuitListWidget.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/CircuitListWidget.h
new file mode 100644
index 0000000..81f9312
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/CircuitListWidget.h
@@ -0,0 +1,106 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 CircuitListWidget.h
+** \version $Id: CircuitListWidget.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Collection of Tor circuits as CircuitItems
+*/
+
+#ifndef _CIRCUITLISTWIDGET_H
+#define _CIRCUITLISTWIDGET_H
+
+#include "CircuitItem.h"
+#include "StreamItem.h"
+
+#include <QTreeWidget>
+#include <QList>
+#include <QMenu>
+#include <QAction>
+#include <QMouseEvent>
+
+
+class CircuitListWidget : public QTreeWidget
+{
+ Q_OBJECT
+
+public:
+ /** Circuit list columns. */
+ enum Columns {
+ ConnectionColumn = 0, /**< Column for either the circuit or stream */
+ StatusColumn = 1 /**< Status of the connection. */
+ };
+
+ /** Default constructor */
+ CircuitListWidget(QWidget *parent = 0);
+
+ /** Adds a circuit to the list. If the circuit already exists in the list,
+ * the status and path will be updated. */
+ void addCircuit(const Circuit &circuit);
+ /** Adds a stream to the list. If the stream already exists in the list, the
+ * status and path will be updated. */
+ void addStream(const Stream &stream);
+ /** Returns a list of circuits currently in the widget. */
+ QList<Circuit> circuits();
+ /** Called when the user changes the UI translation. */
+ void retranslateUi();
+
+signals:
+ /** Emitted when a circuit item is selected. */
+ void circuitSelected(Circuit circuit);
+ /** Emitted when a circuit is removed from the list. */
+ void circuitRemoved(CircuitId circid);
+ /** Emitted when the user selects a circuit to be closed. */
+ void closeCircuit(CircuitId circid);
+ /** Emitted when the user selects a stream to be closed. */
+ void closeStream(StreamId streamid);
+ /** Emitted when the user selects a circuit to zoom to. */
+ void zoomToCircuit(CircuitId circid);
+
+public slots:
+ /** Clears all circuits and streams from the list. */
+ void clearCircuits();
+
+private slots:
+ /** Removes the first circuit scheduled to be removed.*/
+ void removeCircuit();
+ /** Removes the first stream scheduled to be removed. */
+ void removeStream();
+ /** Called when the current item selectio has changed. */
+ void onSelectionChanged(QTreeWidgetItem *cur, QTreeWidgetItem *prev);
+ /** Called when the user requests a context menu on a circuit or stream in
+ * the list and displays a context menu appropriate for whichever type of
+ * item is currently selected. */
+ void customContextMenuRequested(const QPoint &pos);
+ /** Closes all selected circuits or streams. */
+ void closeSelectedConnections();
+
+private:
+ /** Removes the given circuit item and all streams on that circuit. */
+ void removeCircuit(CircuitItem *circuit);
+ /** Removes the given stream item. */
+ void removeStream(StreamItem *stream);
+ /** Finds the circuit with the given ID. */
+ CircuitItem* findCircuitItem(const CircuitId &circid);
+ /** Finds the stream with the given ID. */
+ StreamItem* findStreamItem(const StreamId &streamid);
+ /** Schedules the given circuit item to be removed after the given timeout. */
+ void scheduleCircuitRemoval(CircuitItem *circuit, int delay);
+ /** Schedules a stream to be removed after the given timeout. */
+ void scheduleStreamRemoval(StreamItem *stream, int delay);
+
+ /** List of circuit items to be removed. */
+ QList<CircuitItem *> _circuitRemovalList;
+ /** List of stream items to be removed. */
+ QList<StreamItem *> _streamRemovalList;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIp.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIp.cpp
new file mode 100644
index 0000000..fbde9b1
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIp.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.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 GeoIp.cpp
+** \version $Id: GeoIp.cpp 3768 2009-05-13 19:07:26Z edmanm $
+** \brief Associates an IP with a geographic location
+*/
+
+#include "GeoIp.h"
+
+#include <QStringList>
+
+/** Verifies a latitude is between -90.0 and 90.0 degrees. */
+#define IS_VALID_LATITUDE(x) (((x) >= -90.0) && ((x) <= 90.0))
+/** Verifies a longitude is between -180.0 and 180.0 degrees. */
+#define IS_VALID_LONGITUDE(x) (((x) >= -180.0) && ((x) <= 180.0))
+
+
+GeoIp::GeoIp()
+{
+ _latitude = 0.0;
+ _longitude = 0.0;
+}
+
+GeoIp::GeoIp(const QHostAddress &ip, float latitude, float longitude,
+ const QString &city, const QString ®ion,
+ const QString &country, const QString &countryCode)
+{
+ _ip = ip;
+ _latitude = latitude;
+ _longitude = longitude;
+ _city = city;
+ _region = region;
+ _country = country;
+ _countryCode = countryCode;
+}
+
+bool
+GeoIp::isValid() const
+{
+ return (! _ip.isNull()
+ && IS_VALID_LATITUDE(_latitude)
+ && IS_VALID_LONGITUDE(_longitude));
+}
+
+QString
+GeoIp::toString() const
+{
+ QStringList location;
+
+ /* Add the city name (if present) */
+ if (!_city.isEmpty())
+ location << _city;
+
+ /* Add the full state or region name (if present) */
+ if (!_region.isEmpty() && _region != _city)
+ location << _region;
+
+ /* Add the country name or the country code (if present) */
+ if (!_country.isEmpty())
+ location << _country;
+ else if (!_countryCode.isEmpty())
+ location << _countryCode;
+
+ return location.join(", ");
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIp.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIp.h
new file mode 100644
index 0000000..8db4bbe
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIp.h
@@ -0,0 +1,96 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 GeoIp.h
+** \version $Id: GeoIp.h 3768 2009-05-13 19:07:26Z edmanm $
+** \brief Associates an IP with a geographic location
+*/
+
+#ifndef _GEOIP_H
+#define _GEOIP_H
+
+#include <QHash>
+#include <QString>
+#include <QHostAddress>
+
+
+class GeoIp
+{
+public:
+ /** Default constructor. Creates an empty GeoIp object.
+ */
+ GeoIp();
+
+ GeoIp(const QHostAddress &ip, float latitude, float longitude,
+ const QString &city = QString(),
+ const QString ®ion = QString(),
+ const QString &country = QString(),
+ const QString &countryCode = QString());
+
+ /** Returns the IP address associated with this GeoIP object.
+ */
+ QHostAddress ip() const { return _ip; }
+
+ /** Returns the latitude portion of the geographic coordinates associated
+ * with this IP address or range of IP addresses.
+ */
+ float latitude() const { return _latitude; }
+
+ /** Returns the longitude portion of the geographic coordinates associated
+ * with this IP address or range of IP addresses.
+ */
+ float longitude() const { return _longitude; }
+
+ /** Returns the name of the city associated with this IP address, if known.
+ * Otherwise, returns an empty QString.
+ */
+ QString city() const { return _city; }
+
+ /** Returns the full region name (e.g., state) in which this IP address
+ * resides, if known. Otherwise, returns an empty QString.
+ */
+ QString region() const { return _region; }
+
+ /** Returns the full name of the country associated with this IP address
+ * or range of IP addresses, if known. Otherwise, returns an empty QString.
+ */
+ QString country() const { return _country; }
+
+ /** Returns the ISO 3166-1 alpha-2 two-letter country code of the country
+ * associated with this IP address or range of IP addresses, if known.
+ * Otherwise, returns an empty QString.
+ */
+ QString countryCode() const { return _countryCode; }
+
+ /** Returns a human-readable string of city, region(state), and country.
+ * Some fields may be absent if they are not known. If no fields are known,
+ * this will return an empty QString.
+ */
+ QString toString() const;
+
+ /** Returns true if the GeoIp object is valid. A valid GeoIp object must
+ * have valid IP address, valid latitude and longitude coordinates and a
+ * two-letter country code.
+ */
+ bool isValid() const;
+
+private:
+ QHostAddress _ip; /**< IP address for this location. */
+ float _latitude; /**< Latitudinal coordinate for this IP's location. */
+ float _longitude; /**< Longitudinal coordinate for this IP's location. */
+ QString _city; /**< City in which this IP lives. */
+ QString _region; /**< State or district in which this IP lives. */
+ QString _country; /**< Country in which this IP lives. */
+ QString _countryCode; /**< ISO-3166-1 alpha-2 country code. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpCache.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpCache.cpp
new file mode 100644
index 0000000..d1e1fcc
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpCache.cpp
@@ -0,0 +1,160 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 GeoIpCache.cpp
+** \version $Id: GeoIpCache.cpp 3768 2009-05-13 19:07:26Z edmanm $
+** \brief Caches the results of previous GeoIP requests
+*/
+
+#include "GeoIpCache.h"
+#include "GeoIpCacheItem.h"
+#include "GeoIp.h"
+#include "Vidalia.h"
+
+#include "file.h"
+#include "stringutil.h"
+
+#include <QFile>
+#include <QDir>
+#include <QString>
+#include <QDateTime>
+#include <QTextStream>
+#include <QHostAddress>
+
+
+GeoIpCache::GeoIpCache(QObject *parent)
+ : QObject(parent)
+{
+ loadFromDisk();
+}
+
+QString
+GeoIpCache::cacheFileName() const
+{
+ return (Vidalia::dataDirectory() + "/geoip-cache");
+}
+
+bool
+GeoIpCache::saveToDisk(QString *errmsg)
+{
+ /* Make sure we have a data directory. */
+ if (!create_path(Vidalia::dataDirectory())) {
+ return false;
+ }
+
+ /* Try to open a temporary cache file for writing */
+ QFile tmpCacheFile(cacheFileName() + ".tmp");
+ if (!tmpCacheFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+ return err(errmsg, tmpCacheFile.errorString());
+ }
+
+ /* Write the cache entries to the file. */
+ QTextStream cache(&tmpCacheFile);
+ foreach (GeoIpCacheItem cacheItem, _cache) {
+ /* Save the cache item if it's not too old. */
+ if (!cacheItem.isExpired()) {
+ cache << cacheItem.toCacheString() << endl;
+ }
+ }
+
+ QFile cacheFile(cacheFileName());
+ /* Check if an previous cache file exists. */
+ if (cacheFile.exists()) {
+ /* A previous cache file exists, so try to remove it */
+ if (!cacheFile.remove()) {
+ return err(errmsg, cacheFile.errorString());
+ }
+ }
+ /* Rename the temporary file into place. */
+ if (!tmpCacheFile.rename(cacheFile.fileName())) {
+ return err(errmsg, tmpCacheFile.errorString());
+ }
+ return true;
+}
+
+bool
+GeoIpCache::loadFromDisk(QString *errmsg)
+{
+ QFile cacheFile(cacheFileName());
+
+ if (cacheFile.exists()) {
+ /* Try to open the cache file */
+ if (!cacheFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ return err(errmsg, cacheFile.errorString());
+ }
+
+ /* Read the cached items from the cache file */
+ QTextStream cache(&cacheFile);
+ QString line = cache.readLine();
+ while (! line.isNull()) {
+ /* Create a GeoIpCacheItem from the line and save it */
+ GeoIpCacheItem item = GeoIpCacheItem::fromCacheString(line);
+ if (item.isValid() && ! item.isExpired())
+ addToCache(item);
+
+ line = cache.readLine();
+ }
+ vInfo("Parsed %1 GeoIP entries from '%2'").arg(_cache.size())
+ .arg(cacheFileName());
+ }
+ return true;
+}
+
+void
+GeoIpCache::addToCache(const GeoIp &geoip)
+{
+ /* Create a "range" consisting of only a single IP address. */
+ if (! contains(geoip.ip()))
+ addToCache(geoip.ip(), geoip.ip(), geoip);
+}
+
+void
+GeoIpCache::addToCache(const QHostAddress &from, const QHostAddress &to,
+ const GeoIp &geoip)
+{
+ /* New cache entries expire 30 days from the time they are first cached. */
+ QDateTime expires = QDateTime::currentDateTime().toUTC().addDays(30);
+
+ /* Create a new GeoIpCacheItem and add it to the cache */
+ addToCache(GeoIpCacheItem(from, to, geoip, expires));
+}
+
+void
+GeoIpCache::addToCache(const GeoIpCacheItem &ci)
+{
+ if (! ci.isValid() || ci.isExpired())
+ return;
+
+ /* The key for the cache is the last IP address in the range of IP addresses
+ * covered by the GeoIpCacheItem. We do this because QMap::upperBound() and
+ * QMap::lowerBound() return an iterator to the next item higher than the
+ * search value (an IP address) if an exact match is not found.
+ */
+ _cache.insert(ci.ipRangeEnd().toIPv4Address(), ci);
+}
+
+GeoIp
+GeoIpCache::geoIpForAddress(const QHostAddress &ip)
+{
+ GeoIpCacheMap::iterator i = _cache.upperBound(ip.toIPv4Address());
+ if (i != _cache.end() && (*i).contains(ip))
+ return (*i).toGeoIp(ip);
+ return GeoIp();
+}
+
+bool
+GeoIpCache::contains(const QHostAddress &ip)
+{
+ GeoIpCacheMap::iterator i = _cache.upperBound(ip.toIPv4Address());
+ return (i != _cache.end() && (*i).contains(ip));
+}
+
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpCache.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpCache.h
new file mode 100644
index 0000000..e007622
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpCache.h
@@ -0,0 +1,87 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 GeoIpCache.h
+** \version $Id: GeoIpCache.h 3768 2009-05-13 19:07:26Z edmanm $
+** \brief Caches the results of previous GeoIP requests
+*/
+
+#ifndef _GEOIPCACHE_H
+#define _GEOIPCACHE_H
+
+#include "GeoIpCacheItem.h"
+
+#include <QObject>
+#include <QMap>
+
+class GeoIp;
+class QString;
+class QHostAddress;
+
+typedef QMap<quint32, GeoIpCacheItem> GeoIpCacheMap;
+
+
+class GeoIpCache : public QObject
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. */
+ GeoIpCache(QObject *parent = 0);
+
+ /** Writes the current cache to disk. Returns true if the cache file was
+ * successfully saved to disk. Otherwise, returns false and sets
+ * <b>errmsg</b> to a string describing the error encountered, if
+ * <b>errmsg</b> is not null.
+ */
+ bool saveToDisk(QString *errmsg = 0);
+
+ /** Reads the cache in from disk. Returns true if the cache file was
+ * successfully read. Otherwise, returns false and sets <b>errmsg</b> to
+ * a string describing the error encountered, if <b>errmsg</b> is not null.
+ */
+ bool loadFromDisk(QString *errmsg = 0);
+
+ /** Returns the location currently used for the cache file.
+ */
+ QString cacheFileName() const;
+
+ /** Caches the geographic information in <b>geoip</b> associated with a
+ * single IP address.
+ */
+ void addToCache(const GeoIp &geoip);
+
+ /** Caches the geographic information in <b>geoip</b> associated with a
+ * range of IP addresses, from <b>from</b> to <b>to</b> (inclusive).
+ */
+ void addToCache(const QHostAddress &from, const QHostAddress &to,
+ const GeoIp &geoip);
+
+ /** Returns a GeoIp object for the given <b>ip</b> from cache. If no cached
+ * information is known for <b>ip</b>, an empty GeoIp object is returned.
+ */
+ GeoIp geoIpForAddress(const QHostAddress &ip);
+
+ /** Returns true if the cache contains geographic location information for
+ * <b>ip</b>. Otherwise, returns false.
+ */
+ bool contains(const QHostAddress &ip);
+
+private:
+ /** Adds the GeoIpCacheItem <b>ci</b> to the cache. */
+ void addToCache(const GeoIpCacheItem &ci);
+
+ /**< List of cached GeoIp objects. */
+ GeoIpCacheMap _cache;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpCacheItem.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpCacheItem.cpp
new file mode 100644
index 0000000..3435c1e
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpCacheItem.cpp
@@ -0,0 +1,183 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 GeoIpCacheItem.cpp
+** \version $Id: GeoIpCacheItem.cpp 3768 2009-05-13 19:07:26Z edmanm $
+** \brief Cached result of a single IP-to-geolocation result
+*/
+
+#include "GeoIpCacheItem.h"
+#include "GeoIp.h"
+
+#include "stringutil.h"
+
+#include <QString>
+#include <QDateTime>
+#include <QStringList>
+
+#define CACHE_KEY_FROM_IP "FROM"
+#define CACHE_KEY_TO_IP "TO"
+#define CACHE_KEY_EXPIRES "EXPIRES"
+#define CACHE_KEY_LATITUDE "LAT"
+#define CACHE_KEY_LONGITUDE "LON"
+#define CACHE_KEY_CITY "CITY"
+#define CACHE_KEY_REGION "REGION"
+#define CACHE_KEY_COUNTRY "COUNTRY"
+#define CACHE_KEY_COUNTRY_CODE "CC"
+
+
+GeoIpCacheItem::GeoIpCacheItem()
+{
+ _fromIp = 0;
+ _toIp = 0;
+}
+
+GeoIpCacheItem::GeoIpCacheItem(const QHostAddress &from, const QHostAddress &to,
+ const GeoIp &geoip, const QDateTime &expires)
+{
+ _fromIp = from.toIPv4Address();
+ _toIp = to.toIPv4Address();
+ _expires = expires;
+
+ _fields.insert(CACHE_KEY_LATITUDE, geoip.latitude());
+ _fields.insert(CACHE_KEY_LONGITUDE, geoip.longitude());
+ if (! geoip.city().isEmpty())
+ _fields.insert(CACHE_KEY_CITY, geoip.city());
+ if (! geoip.region().isEmpty())
+ _fields.insert(CACHE_KEY_REGION, geoip.region());
+ if (! geoip.country().isEmpty())
+ _fields.insert(CACHE_KEY_COUNTRY, geoip.country());
+ if (! geoip.countryCode().isEmpty())
+ _fields.insert(CACHE_KEY_COUNTRY_CODE, geoip.countryCode());
+}
+
+QHostAddress
+GeoIpCacheItem::ipRangeStart() const
+{
+ return QHostAddress(_fromIp);
+}
+
+QHostAddress
+GeoIpCacheItem::ipRangeEnd() const
+{
+ return QHostAddress(_toIp);
+}
+
+bool
+GeoIpCacheItem::contains(const QHostAddress &ip) const
+{
+ quint32 ipv4 = ip.toIPv4Address();
+
+ return (ipv4 >= _fromIp && ipv4 <= _toIp);
+}
+
+bool
+GeoIpCacheItem::isValid() const
+{
+ return (_expires.isValid()
+ && ! QHostAddress(_fromIp).isNull()
+ && ! QHostAddress(_toIp).isNull()
+ && _fromIp <= _toIp
+ && _fields.contains(CACHE_KEY_LATITUDE)
+ && _fields.contains(CACHE_KEY_LONGITUDE));
+}
+
+bool
+GeoIpCacheItem::isExpired() const
+{
+ return (_expires < QDateTime::currentDateTime().toUTC());
+}
+
+GeoIp
+GeoIpCacheItem::toGeoIp(const QHostAddress &ip) const
+{
+ if (this->contains(ip))
+ return GeoIp(ip,
+ _fields.value(CACHE_KEY_LATITUDE).toDouble(),
+ _fields.value(CACHE_KEY_LONGITUDE).toDouble(),
+ _fields.value(CACHE_KEY_CITY).toString(),
+ _fields.value(CACHE_KEY_REGION).toString(),
+ _fields.value(CACHE_KEY_COUNTRY).toString(),
+ _fields.value(CACHE_KEY_COUNTRY_CODE).toString());
+ return GeoIp();
+}
+
+QString
+GeoIpCacheItem::toCacheString() const
+{
+ QStringList keyvals;
+
+ keyvals << QString(CACHE_KEY_FROM_IP"=%1").arg(QHostAddress(_fromIp).toString());
+ keyvals << QString(CACHE_KEY_TO_IP"=%1").arg(QHostAddress(_toIp).toString());
+ keyvals << QString(CACHE_KEY_EXPIRES"=\"%1\"").arg(_expires.toString(Qt::ISODate));
+
+ foreach (QString key, _fields.keys()) {
+ QString value = _fields.value(key).toString();
+ if (value.contains(" ")) {
+ value.replace("\\", "\\\\");
+ value.replace("\"", "\\\"");
+ value = "\"" + value + "\"";
+ }
+ keyvals << key + "=" + value;
+ }
+ return keyvals.join(" ");
+}
+
+GeoIpCacheItem
+GeoIpCacheItem::fromCacheString(const QString &line)
+{
+ GeoIpCacheItem ci;
+ bool ok;
+
+ QHash<QString,QString> keyvals = string_parse_keyvals(line, &ok);
+ if (! ok)
+ return GeoIpCacheItem();
+
+ /* Get the range of IP addresses associated with this cache entry */
+ QHostAddress fromIp(keyvals.value(CACHE_KEY_FROM_IP));
+ QHostAddress toIp(keyvals.value(CACHE_KEY_TO_IP));
+ if (fromIp.isNull() || toIp.isNull())
+ return GeoIpCacheItem();
+ ci._fromIp = fromIp.toIPv4Address();
+ ci._toIp = toIp.toIPv4Address();
+
+ /* Extract the expiration timestamp of this entry */
+ ci._expires = QDateTime::fromString(keyvals.value(CACHE_KEY_EXPIRES),
+ Qt::ISODate);
+ if (! ci._expires.isValid())
+ ci._expires = QDateTime::currentDateTime().toUTC().addDays(30);
+
+
+ /* Make sure we have valid geographic coordinates */
+ float latitude = keyvals.value(CACHE_KEY_LATITUDE).toFloat(&ok);
+ if (! ok)
+ return GeoIpCacheItem();
+ ci._fields.insert(CACHE_KEY_LATITUDE, latitude);
+
+ float longitude = keyvals.value(CACHE_KEY_LONGITUDE).toFloat(&ok);
+ if (! ok)
+ return GeoIpCacheItem();
+ ci._fields.insert(CACHE_KEY_LONGITUDE, longitude);
+
+ /* Each of these fields is optional */
+ if (keyvals.contains(CACHE_KEY_CITY))
+ ci._fields.insert(CACHE_KEY_CITY, keyvals.value(CACHE_KEY_CITY));
+ if (keyvals.contains(CACHE_KEY_REGION))
+ ci._fields.insert(CACHE_KEY_REGION, keyvals.value(CACHE_KEY_REGION));
+ if (keyvals.contains(CACHE_KEY_COUNTRY))
+ ci._fields.insert(CACHE_KEY_COUNTRY, keyvals.value(CACHE_KEY_COUNTRY));
+ if (keyvals.contains(CACHE_KEY_COUNTRY_CODE))
+ ci._fields.insert(CACHE_KEY_COUNTRY_CODE,
+ keyvals.value(CACHE_KEY_COUNTRY_CODE));
+
+ return ci;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpCacheItem.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpCacheItem.h
new file mode 100644
index 0000000..407d06d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpCacheItem.h
@@ -0,0 +1,97 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 GeoIpCacheItem.h
+** \version $Id: GeoIpCacheItem.h 3768 2009-05-13 19:07:26Z edmanm $
+** \brief Cached result of a single IP-to-geolocation result
+*/
+
+#ifndef _GEOIPCACHEITEM_H
+#define _GEOIPCACHEITEM_H
+
+#include <QHash>
+#include <QString>
+#include <QVariant>
+#include <QDateTime>
+
+class GeoIp;
+class QHostAddress;
+
+
+class GeoIpCacheItem
+{
+public:
+ /** Default constructor
+ */
+ GeoIpCacheItem();
+
+ /** Constructor.
+ */
+ GeoIpCacheItem(const QHostAddress &from, const QHostAddress &to,
+ const GeoIp &geoIp, const QDateTime &expires);
+
+ /** Returns the first IP address in the range of IP addresses associated
+ * with this GeoIpCacheItem.
+ */
+ QHostAddress ipRangeStart() const;
+
+ /** Returns the last IP address in the range of IP addresses associated
+ * with this GeoIpCacheItem.
+ */
+ QHostAddress ipRangeEnd() const;
+
+ /** Returns true if <b>ip</b> is within the range of IP addresses associated
+ * with this GeoIpCacheItem.
+ * \sa ipRangeStart()
+ * \sa ipRangeEnd()
+ */
+ bool contains(const QHostAddress &ip) const;
+
+ /** Returns true if this GeoIpCacheItem object contains valid values for
+ * all required fields.
+ */
+ bool isValid() const;
+
+ /** Returns true if the cache item is too old to be considered accurate.
+ * Cached GeoIp responses are considered valid for thirty days after they
+ * are first added to the cache.
+ */
+ bool isExpired() const;
+
+ /** Returns a GeoIp object for <b>ip</b>, populated with the cached
+ * geographic information stored by this GeoIpCacheObject. If <b>ip</b>
+ * is not within the range of IP addresses associated with this object,
+ * an empty GeoIp object is returned.
+ * \sa contains
+ */
+ GeoIp toGeoIp(const QHostAddress &ip) const;
+
+ /** Formats the fields contained in this GeoIpCacheItem as a string
+ * suitable for writing to a cache file.
+ */
+ QString toCacheString() const;
+
+ /** Parses <b>cacheLine</b> and constructs a new GeoIpCacheItem object
+ * with the parsed values. The format of <b>cacheLine</b> must follow the
+ * format as produced by toCacheString().
+ * \sa toCacheString()
+ */
+ static GeoIpCacheItem fromCacheString(const QString &cacheLine);
+
+private:
+ quint32 _fromIp;
+ quint32 _toIp;
+ QDateTime _expires; /**< Time this item was cached. */
+ QHash<QString,QVariant> _fields;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpRequest.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpRequest.cpp
new file mode 100644
index 0000000..8250b44
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpRequest.cpp
@@ -0,0 +1,80 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 GeoIpRequest.cpp
+** \version $Id: GeoIpRequest.cpp 3768 2009-05-13 19:07:26Z edmanm $
+** \brief A formatted request for GeoIP information for one or more IPs
+*/
+
+#include "GeoIpRequest.h"
+#include "ZlibByteArray.h"
+
+#include <QString>
+#include <QHostAddress>
+#include <QHttpRequestHeader>
+
+
+/** Creates an HTTP POST header for this request, based on the
+ * Host, Page, and content-length values. */
+QHttpRequestHeader
+GeoIpRequest::createHeader() const
+{
+ QHttpRequestHeader header("POST", _page, 1, 1);
+
+ if (!_host.isEmpty())
+ header.setValue("Host", _host);
+ header.setContentType("application/x-www-form-urlencoded");
+ header.setContentLength(_request.length());
+ header.setValue("Connection", "close");
+
+ if (ZlibByteArray::isZlibAvailable()) {
+ QString acceptEncodings = "deflate, x-deflate";
+ if (ZlibByteArray::isGzipSupported())
+ acceptEncodings += ", gzip, x-gzip";
+ header.setValue("Accept-Encoding", acceptEncodings);
+ }
+
+ return header;
+}
+
+/** Sets the list of IPs whose geo information we want to request. */
+void
+GeoIpRequest::setRequest(const QList<QHostAddress> &ips)
+{
+ _request = "format=long&ip=";
+ int ipcount = ips.size();
+
+ /* Add each IP to a comma-delimited list. */
+ for (int i = 0; i < ipcount; i++) {
+ _request.append(ips.at(i).toString());
+ if (i < ipcount-1) {
+ _request.append(",");
+ }
+ }
+ _ips = ips;
+}
+
+/** Formats the request as an HTTP POST request. */
+QByteArray
+GeoIpRequest::request() const
+{
+ /* Create the header and append the request content. */
+ QString request = createHeader().toString() + _request;
+ return request.toAscii();
+}
+
+/** Returns true if this request contains <b>ip</b>. */
+bool
+GeoIpRequest::contains(const QHostAddress &ip) const
+{
+ return _ips.contains(ip);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpRequest.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpRequest.h
new file mode 100644
index 0000000..1a846fd
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpRequest.h
@@ -0,0 +1,62 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not receive the LICENSE file with this file, you may obtain it from the
+** Vidalia source package distributed by the Vidalia Project at
+** http://www.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 GeoIpRequest.h
+** \version $Id: GeoIpRequest.h 3768 2009-05-13 19:07:26Z edmanm $
+** \brief A formatted request for GeoIP information for one or more IPs
+*/
+
+#ifndef _GEOIPREQUEST_H
+#define _GEOIPREQUEST_H
+
+#include <QList>
+#include <QString>
+#include <QHttpRequestHeader>
+
+class QHostAddress;
+class QByteArray;
+
+
+class GeoIpRequest
+{
+public:
+ /** Constructor */
+ GeoIpRequest(int id) : _id(id) {}
+
+ /** Sets the Host: field in this request's header. */
+ void setHost(const QString &host) { _host = host; }
+ /** Sets the page path in this request's header. */
+ void setPage(const QString &page) { _page = page; }
+ /** Sets the list of IPs whose geo information we want to request. */
+ void setRequest(const QList<QHostAddress> &ips);
+ /** Returns true if this request contains <b>ip</b>. */
+ bool contains(const QHostAddress &ip) const;
+
+ /** Returns the request's identifier. */
+ int id() const { return _id; }
+ /** Returns the number of IP addresses contained in this request. */
+ int size() const { return _ips.size(); }
+ /** Formats the request as an HTTP POST request */
+ QByteArray request() const;
+
+private:
+ /** Creates an HTTP header for this request. */
+ QHttpRequestHeader createHeader() const;
+
+ int _id; /**< Request identifier */
+ QString _host; /**< Host: field value. */
+ QString _page; /**< Page giving us the geo ip information. */
+ QString _request; /**< Formatted Geo IP request string. */
+ QList<QHostAddress> _ips; /**< List of IP addresses in this request. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpResolver.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpResolver.cpp
new file mode 100644
index 0000000..09a6599
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpResolver.cpp
@@ -0,0 +1,283 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 GeoIpResolver.cpp
+** \version $Id: GeoIpResolver.cpp 3768 2009-05-13 19:07:26Z edmanm $
+** \brief Requests GeoIP information and caches the result
+*/
+
+#include "GeoIpResolver.h"
+#include "GeoIpRequest.h"
+#include "GeoIpResponse.h"
+#include "GeoIp.h"
+#include "Vidalia.h"
+
+#include "stringutil.h"
+#include "TorSslSocket.h"
+
+/** Host for the GeoIP information. */
+#define GEOIP_HOST "geoips.vidalia-project.net"
+/** The SSL GeoIP service runs on port 443. */
+#define GEOIP_SSL_PORT 443
+/** Page that we request the GeoIP information from. */
+#define GEOIP_PAGE "/cgi-bin/geoip.py"
+
+
+/** Default constructor. */
+GeoIpResolver::GeoIpResolver(QObject *parent)
+ : QObject(parent)
+{
+ _socksAddr = QHostAddress::LocalHost;
+ _socksPort = 9050;
+ _cache = new GeoIpCache(this);
+}
+
+/** Sets the address and port of Tor, through which GeoIP requests will be
+ * made. */
+void
+GeoIpResolver::setSocksHost(const QHostAddress &addr, quint16 port)
+{
+ _socksAddr = addr;
+ _socksPort = port;
+}
+
+/** Resolves <b>ip</b> to geographic information if it is cached. A resolved()
+ * signal will be emitted and true returned if we have cached geographic
+ * information for <b>ip</b>. Otherwise, this returns false. */
+bool
+GeoIpResolver::resolveFromCache(const QHostAddress &ip)
+{
+ if (_cache->contains(ip)) {
+ emit resolved(-1, QList<GeoIp>() << _cache->geoIpForAddress(ip));
+ return true;
+ }
+ return false;
+}
+
+/** Resolves a list of IPs to a geographic location, but only those which are
+ * cached. Returns a list of IPs that were not in the cache. */
+QList<QHostAddress>
+GeoIpResolver::resolveFromCache(const QList<QHostAddress> &ips)
+{
+ QList<GeoIp> cached;
+
+ /* Build a list of which IPs have cached GeoIp information */
+ foreach (QHostAddress ip, ips) {
+ if (_cache->contains(ip))
+ cached << _cache->geoIpForAddress(ip);
+ }
+
+ /* If any were cached, emit their results now */
+ if (cached.size() > 0) {
+ vInfo("Resolved %1 GeoIP entries from cache.").arg(cached.size());
+ emit resolved(-1, cached);
+ }
+ return ips;
+}
+
+/** Resolves a single IP to a geographic location. */
+int
+GeoIpResolver::resolve(const QHostAddress &ip)
+{
+ return resolve(QList<QHostAddress>() << ip);
+}
+
+/** Called when the socket has connected to the Geo IP host. */
+void
+GeoIpResolver::connected()
+{
+ /* Find the socket and request for whoever called this slot */
+ QAbstractSocket *socket = dynamic_cast<QAbstractSocket *>(sender());
+ if (!_requestList.contains(socket)) {
+ return;
+ }
+ GeoIpRequest *req = static_cast<GeoIpRequest *>(_requestList.value(socket));
+
+ vInfo("Connected to the GeoIP host. Sending request for %1 uncached "
+ "GeoIP entries. (request id %2)").arg(req->size()).arg(req->id());
+
+ /* Send the request */
+ socket->write(req->request());
+}
+
+/** Called when the socket has disconnected from the Geo IP host. */
+void
+GeoIpResolver::disconnected()
+{
+ /* Find the socket and request for whoever called this slot */
+ QAbstractSocket *socket = dynamic_cast<QAbstractSocket *>(sender());
+ if (!_requestList.contains(socket)) {
+ return;
+ }
+ GeoIpRequest *req = static_cast<GeoIpRequest *>(_requestList.take(socket));
+
+ /* Read and parse the response header */
+ GeoIpResponse response = GeoIpResponse(socket->readAll());
+
+ /* Check the response code and see what we got */
+ if (response.statusCode() == 200) {
+ /* We got a 200 OK, so get the Geo IP information from the response body
+ * and cache the results. */
+ parseGeoIpResponse(response.content(), req);
+ } else {
+ /* We failed to get the Geo IP information, so emit resolveFailed and
+ * include the HTTP status message. */
+ vWarn("GeoIP resolution failed (request id %1): %2").arg(req->id())
+ .arg(response.statusMessage());
+ emit resolveFailed(req->id(), response.statusMessage());
+ }
+ /* Close the socket and clean up */
+ socket->close();
+ delete socket;
+ delete req;
+}
+
+void
+GeoIpResolver::parseGeoIpResponse(const QByteArray &response,
+ GeoIpRequest *request)
+{
+ QList<GeoIp> geoIpList;
+ QHash<QString,QString> keyvals;
+ QHostAddress ip, from, to;
+ QString city, region, country, cc;
+ float latitude, longitude;
+ GeoIp geoIp;
+ int numCached = 0;
+ bool ok;
+
+ QStringList lines = QString(response).split("\n", QString::SkipEmptyParts);
+ foreach (QString line, lines) {
+ /* Split the key=value formatted GeoIP record into keys and values */
+ QHash<QString,QString> keyvals = string_parse_keyvals(line.trimmed(), &ok);
+ if (! ok)
+ goto err;
+
+ /* Extract each of the required fields from the GeoIP record */
+ ip = QHostAddress(keyvals.value("IP"));
+ if (ip.isNull())
+ goto err;
+ latitude = keyvals.value("LAT").toFloat(&ok);
+ if (! ok)
+ goto err;
+ longitude = keyvals.value("LON").toFloat(&ok);
+ if (! ok)
+ goto err;
+
+ /* Each of these fields is optional */
+ city = keyvals.value("CITY");
+ region = keyvals.value("REGION");
+ country = keyvals.value("COUNTRY");
+ cc = keyvals.value("CC");
+
+ geoIp = GeoIp(ip, latitude, longitude, city, region, country, cc);
+ if (! geoIp.isValid())
+ goto err;
+
+ if (request->contains(ip)) {
+ if (! _cache->contains(ip)) {
+ from = QHostAddress(keyvals.value("FROM"));
+ to = QHostAddress(keyvals.value("TO"));
+ if (! from.isNull() && ! to.isNull())
+ _cache->addToCache(from, to, geoIp);
+ else
+ _cache->addToCache(geoIp);
+ numCached++;
+ }
+
+ geoIpList << geoIp;
+ continue;
+
+err:
+ vInfo("Ignored improperly formatted GeoIP record (request id %1): %2")
+ .arg(line).arg(request->id());
+ } else {
+ /* This item wasn't requested, so just log it and ignore. */
+ vWarn("Received a GeoIP entry for IP address %1 that was not included "
+ "in the initial request. (request id %2)").arg(ip)
+ .arg(request->id());
+ }
+ }
+ /* If new results were cached, save them to disk */
+ if (numCached > 0)
+ _cache->saveToDisk();
+
+ /* Emit the results */
+ vInfo("Parsed %1 entries from the GeoIP response. (request id %2)")
+ .arg(geoIpList.size()).arg(request->id());
+ emit resolved(request->id(), geoIpList);
+}
+
+/** Called when an error has occurred requesting Geo IP information. */
+void
+GeoIpResolver::socketError(const QString &errorString)
+{
+ /* Find the socket and request for whoever called this slot */
+ QAbstractSocket *socket = dynamic_cast<QAbstractSocket *>(sender());
+ if (!_requestList.contains(socket)) {
+ return;
+ }
+
+ /* We expect a remote host to close the socket, because that's how the HTTP
+ * server tells us he's done talking to us. */
+ if (socket->error() != QAbstractSocket::RemoteHostClosedError) {
+ /* Emit the failure and clean up */
+ GeoIpRequest *req = static_cast<GeoIpRequest *>(_requestList.take(socket));
+ emit resolveFailed(req->id(), errorString);
+ socket->abort();
+ vWarn("GeoIP request socket error (request id %1): %2").arg(req->id())
+ .arg(errorString);
+ delete socket;
+ delete req;
+ }
+}
+
+/** Creates an HTTP request for Geo IP information. */
+GeoIpRequest*
+GeoIpResolver::createRequest(const QList<QHostAddress> &ips)
+{
+ static int id = -1;
+ GeoIpRequest *request = new GeoIpRequest(++id);
+ request->setHost(GEOIP_HOST);
+ request->setPage(GEOIP_PAGE);
+ request->setRequest(ips);
+ return request;
+}
+
+/** Resolves a list of IPs to a geographic location. */
+int
+GeoIpResolver::resolve(const QList<QHostAddress> &ips)
+{
+ /* Resolve the cached IPs and get a list of IPs that still need to be
+ * resolved to a lat and long. */
+ QList<QHostAddress> uncached = resolveFromCache(ips);
+ if (! uncached.size())
+ return -1;
+
+ /* Create a socket used to request the geo ip information. */
+ TorSslSocket *socket = new TorSslSocket(_socksAddr, _socksPort);
+ connect(socket, SIGNAL(connectedToRemoteHost()), this, SLOT(connected()),
+ Qt::QueuedConnection);
+ connect(socket, SIGNAL(socketError(QString)),
+ this, SLOT(socketError(QString)),
+ Qt::QueuedConnection);
+ connect(socket, SIGNAL(disconnected()), this, SLOT(disconnected()),
+ Qt::QueuedConnection);
+ GeoIpRequest *request = createRequest(uncached);
+ _requestList.insert(socket, request);
+
+ /* Connect so we can send our request and return the request ID. */
+ vInfo("Opening an SSL connection to the GeoIP host at %1:%2 (request id %3)")
+ .arg(GEOIP_HOST).arg(GEOIP_SSL_PORT).arg(request->id());
+ socket->connectToRemoteHost(GEOIP_HOST, GEOIP_SSL_PORT, true);
+
+ return request->id();
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpResolver.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpResolver.h
new file mode 100644
index 0000000..d6af7f9
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpResolver.h
@@ -0,0 +1,86 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+/*
+G** \file GeoIpResolver.h
+** \version $Id: GeoIpResolver.h 3768 2009-05-13 19:07:26Z edmanm $
+** \brief Requests GeoIP information and caches the result
+*/
+
+#ifndef _GEOIPRESOLVER_H
+#define _GEOIPRESOLVER_H
+
+#include "GeoIpCache.h"
+
+#include <QObject>
+#include <QList>
+#include <QHash>
+#include <QHostAddress>
+
+class GeoIp;
+class GeoIpRequest;
+class GeoIpResponse;
+class QString;
+class QAbstractSocket;
+
+
+class GeoIpResolver : public QObject
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. */
+ GeoIpResolver(QObject *parent = 0);
+
+ /** Sets the address and port of Tor, through which GeoIP requests will be
+ * made. */
+ void setSocksHost(const QHostAddress &addr, quint16 port);
+ /** Resolves a single IP to a geographic location. */
+ int resolve(const QHostAddress &ip);
+ /** Resolves a list of IPs to a geographic location. */
+ int resolve(const QList<QHostAddress> &ips);
+ /** Resolves <b>ip</b> to geographic information only if it is cached. */
+ bool resolveFromCache(const QHostAddress &ip);
+ /** Resolves a list of IPs to a geographic location, but only those which
+ * are cached. Returns a list of which IPs were not cached. */
+ QList<QHostAddress> resolveFromCache(const QList<QHostAddress> &ips);
+
+signals:
+ /** Emitted when a list of IPs have been resolved to lat/long. */
+ void resolved(int id, const QList<GeoIp> &geoips);
+ /** Emitted when a resolve has failed. */
+ void resolveFailed(int id, const QString &errorString);
+
+private slots:
+ /** Called when the socket has connected to the Geo IP host. */
+ void connected();
+ /** Called when the socket has disconnected from the Geo IP host. */
+ void disconnected();
+ /** Called when an error has occurred getting the Geo IP information. */
+ void socketError(const QString &errorString);
+
+private:
+ /** Creates an HTTP request for Geo IP information. */
+ GeoIpRequest* createRequest(const QList<QHostAddress> &ips);
+
+ void parseGeoIpResponse(const QByteArray &response, GeoIpRequest *request);
+
+ /**< Cached GeoIp objects. */
+ GeoIpCache* _cache;
+ /**< List of sockets used for requests. */
+ QHash<QAbstractSocket *,GeoIpRequest*> _requestList;
+ /** Tor's SocksListenAddress. */
+ QHostAddress _socksAddr;
+ /** Tor's SocksPort. */
+ quint16 _socksPort;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpResponse.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpResponse.cpp
new file mode 100644
index 0000000..76ae803
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpResponse.cpp
@@ -0,0 +1,137 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 GeoIpResponse.cpp
+** \version $Id: GeoIpResponse.cpp 3768 2009-05-13 19:07:26Z edmanm $
+** \brief Parses a response to a previous GeoIP request
+*/
+
+#include "GeoIpResponse.h"
+#include "GeoIp.h"
+#include "Vidalia.h"
+
+#include "ZlibByteArray.h"
+
+#include <QByteArray>
+#include <QStringList>
+#include <QHttpResponseHeader>
+
+/** Status code for a successful HTTP request. */
+#define STATUS_HTTP_OK 200
+/** Status code for content encoding errors. */
+#define STATUS_CONTENT_ENCODING_ERR 601
+/** Status code for transfer encoding errors. */
+#define STATUS_TRANSFER_ENCODING_ERR 602
+
+
+GeoIpResponse::GeoIpResponse(const QByteArray &response)
+{
+ QString errmsg;
+
+ /* Parse out the header */
+ int headerPos = response.indexOf("\r\n\r\n");
+ _header = QHttpResponseHeader(QString(response.mid(0, headerPos)));
+
+ /* Parse out the Geo IP information, if any was included. */
+ if (headerPos > 0 && _header.statusCode() == STATUS_HTTP_OK) {
+ _content = response.mid(headerPos+4);
+
+ if (_header.hasKey("Transfer-Encoding")) {
+ QString encoding = _header.value("Transfer-Encoding");
+ if (encoding == "chunked") {
+ _content = decodeChunked(_content);
+ if (_content.isEmpty()) {
+ _header.setStatusLine(STATUS_TRANSFER_ENCODING_ERR,
+ QString("Failed to decode chunked response"));
+ return;
+ }
+ } else {
+ _header.setStatusLine(STATUS_TRANSFER_ENCODING_ERR,
+ QString("Unknown transfer encoding '%1'").arg(encoding));
+ return;
+ }
+ }
+
+ if (_header.hasKey("Content-Encoding")) {
+ ZlibByteArray::CompressionMethod method;
+ QString encoding = _header.value("Content-Encoding");
+ if (encoding == "gzip" || encoding == "x-gzip") {
+ method = ZlibByteArray::Gzip;
+ } else if (encoding == "deflate" || encoding == "x-deflate") {
+ method = ZlibByteArray::Zlib;
+ } else if (encoding == "text/plain") {
+ method = ZlibByteArray::None;
+ } else {
+ _header.setStatusLine(STATUS_CONTENT_ENCODING_ERR,
+ QString("Unknown content encoding '%1'").arg(encoding));
+ return;
+ }
+
+ _content = ZlibByteArray::uncompress(_content, method, &errmsg);
+ if (_content.isEmpty()) {
+ _header.setStatusLine(STATUS_CONTENT_ENCODING_ERR,
+ QString("Content decoding using method '%1' failed: %2")
+ .arg(encoding).arg(errmsg));
+ return;
+ }
+ }
+ }
+}
+
+QByteArray
+GeoIpResponse::decodeChunked(const QByteArray &chunked)
+{
+ QByteArray unchunked;
+ QString sizeString;
+ int eol, chunkedlen, chunksize, offset = 0;
+ bool ok;
+
+ chunkedlen = chunked.length();
+ while (offset < chunkedlen) {
+ eol = chunked.indexOf("\r\n", offset);
+ if (eol < 0)
+ return QByteArray();
+ sizeString = QString::fromAscii(chunked.mid(offset, eol-offset));
+ offset = eol + 2; /* Skip past the CRLF */
+
+ if (sizeString.indexOf(";") >= 0)
+ sizeString.truncate(sizeString.indexOf(";"));
+ chunksize = sizeString.toInt(&ok, 16);
+ if (!ok || chunksize > chunkedlen - offset)
+ return QByteArray();
+ if (!chunksize)
+ break; /* Last chunk. Ignore the trailer. */
+
+ unchunked.append(chunked.mid(offset, chunksize));
+ offset += chunksize;
+ offset += 2; /* CRLF after each chunk */
+ }
+ return unchunked;
+}
+
+int
+GeoIpResponse::statusCode() const
+{
+ return _header.statusCode();
+}
+
+QString
+GeoIpResponse::statusMessage() const
+{
+ return _header.reasonPhrase();
+}
+
+QByteArray
+GeoIpResponse::content() const
+{
+ return _content;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpResponse.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpResponse.h
new file mode 100644
index 0000000..93e3c58
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/GeoIpResponse.h
@@ -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.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 GeoIpResponse.h
+** \version $Id: GeoIpResponse.h 3768 2009-05-13 19:07:26Z edmanm $
+** \brief Parses a response to a previous GeoIP request
+*/
+
+#ifndef _GEOIPRESPONSE_H
+#define _GEOIPRESPONSE_H
+
+#include <QList>
+#include <QByteArray>
+#include <QHttpResponseHeader>
+
+class GeoIp;
+class QString;
+class QStringList;
+
+
+class GeoIpResponse
+{
+public:
+ /** Constructor. Parses the response data for an HTTP header and Geo IP
+ * information. */
+ GeoIpResponse(const QByteArray &response);
+
+ /** Returns the HTTP status code for this response.
+ */
+ int statusCode() const;
+
+ /** Returns the HTTP status message for this response.
+ */
+ QString statusMessage() const;
+
+ /** Returns the Geo IP information contained in this response.
+ */
+ QByteArray content() const;
+
+private:
+ /** Decodes a <b>chunked</b> transfer encoding. Returns the unchunked
+ * result on success, or an empty QByteArray if decoding fails. */
+ QByteArray decodeChunked(const QByteArray &chunked);
+
+ QHttpResponseHeader _header; /**< HTTP response header. */
+ QByteArray _content; /**< Geo IP information in this response. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/NetViewer.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/NetViewer.cpp
new file mode 100644
index 0000000..2388e00
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/NetViewer.cpp
@@ -0,0 +1,570 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 NetViewer.cpp
+** \version $Id: NetViewer.cpp 4054 2009-08-17 02:25:08Z edmanm $
+** \brief Displays a map of the Tor network and the user's circuits
+*/
+
+#include "NetViewer.h"
+#include "RouterInfoDialog.h"
+#include "RouterListItem.h"
+#include "Vidalia.h"
+#include "VMessageBox.h"
+
+#include <QMessageBox>
+#include <QHeaderView>
+
+#define IMG_MOVE ":/images/22x22/move-map.png"
+#define IMG_ZOOMIN ":/images/22x22/zoom-in.png"
+#define IMG_ZOOMOUT ":/images/22x22/zoom-out.png"
+
+/** Number of milliseconds to wait after the arrival of the last descriptor whose
+ * IP needs to be resolved to geographic information, in case more descriptors
+ * arrive. Then we can simply lump the IPs into a single request. */
+#define MIN_RESOLVE_QUEUE_DELAY (10*1000)
+/** Maximum number of milliseconds to wait after the arrival of the first
+ * IP address into the resolve queue, before we flush the entire queue. */
+#define MAX_RESOLVE_QUEUE_DELAY (30*1000)
+
+
+/** Constructor. Loads settings from VidaliaSettings.
+ * \param parent The parent widget of this NetViewer object.\
+ */
+NetViewer::NetViewer(QWidget *parent)
+ : VidaliaWindow("NetViewer", parent)
+{
+ /* Invoke Qt Designer generated QObject setup routine */
+ ui.setupUi(this);
+
+#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()));
+
+ /* Get the TorControl object */
+ _torControl = Vidalia::torControl();
+ connect(_torControl, SIGNAL(authenticated()),
+ this, SLOT(onAuthenticated()));
+ connect(_torControl, SIGNAL(disconnected()),
+ this, SLOT(onDisconnected()));
+
+ _torControl->setEvent(TorEvents::CircuitStatus);
+ connect(_torControl, SIGNAL(circuitStatusChanged(Circuit)),
+ this, SLOT(addCircuit(Circuit)));
+
+ _torControl->setEvent(TorEvents::StreamStatus);
+ connect(_torControl, SIGNAL(streamStatusChanged(Stream)),
+ this, SLOT(addStream(Stream)));
+
+ _torControl->setEvent(TorEvents::AddressMap);
+ connect(_torControl, SIGNAL(addressMapped(QString, QString, QDateTime)),
+ this, SLOT(addressMapped(QString, QString, QDateTime)));
+
+ _torControl->setEvent(TorEvents::NewDescriptor);
+ connect(_torControl, SIGNAL(newDescriptors(QStringList)),
+ this, SLOT(newDescriptors(QStringList)));
+
+ /* Change the column widths of the tree widgets */
+ ui.treeRouterList->header()->
+ resizeSection(RouterListWidget::StatusColumn, 25);
+ ui.treeRouterList->header()->
+ resizeSection(RouterListWidget::CountryColumn, 25);
+ ui.treeCircuitList->header()->
+ resizeSection(CircuitListWidget::ConnectionColumn, 235);
+
+ /* Create the TorMapWidget and add it to the dialog */
+#if defined(USE_MARBLE)
+ _map = new TorMapWidget();
+ connect(_map, SIGNAL(displayRouterInfo(QString)),
+ this, SLOT(displayRouterInfo(QString)));
+ connect(ui.actionZoomFullScreen, SIGNAL(triggered()),
+ this, SLOT(toggleFullScreen()));
+ Vidalia::createShortcut("ESC", _map, this, SLOT(toggleFullScreen()));
+#else
+ _map = new TorMapImageView();
+ ui.actionZoomFullScreen->setVisible(false);
+#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()));
+ connect(ui.actionZoomToFit, SIGNAL(triggered()), _map, SLOT(zoomToFit()));
+
+ /* Create the timer that will be used to update the router list once every
+ * hour. We still receive the NEWDESC event to get new descriptors, but this
+ * needs to be called to get rid of any descriptors that were removed. */
+ _refreshTimer.setInterval(60*60*1000);
+ connect(&_refreshTimer, SIGNAL(timeout()), this, SLOT(refresh()));
+
+ /* Set up the timers used to group together GeoIP requests for new
+ * descriptors arriving within MIN_RESOLVE_QUEUE_DELAY milliseconds, but no
+ * more than MAX_RESOLVE_QUEUE_DELAY milliseconds of each other. */
+ _minResolveQueueTimer.setSingleShot(true);
+ connect(&_minResolveQueueTimer, SIGNAL(timeout()), this, SLOT(resolve()));
+ _maxResolveQueueTimer.setSingleShot(true);
+ connect(&_maxResolveQueueTimer, SIGNAL(timeout()), this, SLOT(resolve()));
+
+ /* Connect the necessary slots and signals */
+ connect(ui.actionHelp, SIGNAL(triggered()), this, SLOT(help()));
+ connect(ui.actionRefresh, SIGNAL(triggered()), this, SLOT(refresh()));
+ connect(ui.treeRouterList, SIGNAL(routerSelected(QList<RouterDescriptor>)),
+ this, SLOT(routerSelected(QList<RouterDescriptor>)));
+ connect(ui.treeRouterList, SIGNAL(zoomToRouter(QString)),
+ _map, SLOT(zoomToRouter(QString)));
+ connect(ui.treeCircuitList, SIGNAL(circuitSelected(Circuit)),
+ this, SLOT(circuitSelected(Circuit)));
+ connect(ui.treeCircuitList, SIGNAL(circuitRemoved(CircuitId)),
+ _map, SLOT(removeCircuit(CircuitId)));
+ connect(ui.treeCircuitList, SIGNAL(zoomToCircuit(CircuitId)),
+ _map, SLOT(zoomToCircuit(CircuitId)));
+ connect(ui.treeCircuitList, SIGNAL(closeCircuit(CircuitId)),
+ _torControl, SLOT(closeCircuit(CircuitId)));
+ connect(ui.treeCircuitList, SIGNAL(closeStream(StreamId)),
+ _torControl, SLOT(closeStream(StreamId)));
+
+ /* Connect the slot to find out when geoip information has arrived */
+ connect(&_geoip, SIGNAL(resolved(int, QList<GeoIp>)),
+ this, SLOT(resolved(int, QList<GeoIp>)));
+}
+
+/** Called when the user changes the UI translation. */
+void
+NetViewer::retranslateUi()
+{
+ ui.retranslateUi(this);
+ ui.treeRouterList->retranslateUi();
+ ui.treeCircuitList->retranslateUi();
+
+ if (ui.treeRouterList->selectedItems().size()) {
+ QList<RouterDescriptor> routers;
+ foreach (QTreeWidgetItem *item, ui.treeRouterList->selectedItems()) {
+ routers << dynamic_cast<RouterListItem *>(item)->descriptor();
+ }
+ ui.textRouterInfo->display(routers);
+ } else if (ui.treeCircuitList->selectedItems().size()) {
+ QList<RouterDescriptor> routers;
+ QTreeWidgetItem *item = ui.treeCircuitList->selectedItems()[0];
+ Circuit circuit = dynamic_cast<CircuitItem*>(item)->circuit();
+ foreach (QString id, circuit.routerIDs()) {
+ RouterListItem *item = ui.treeRouterList->findRouterById(id);
+ if (item)
+ routers.append(item->descriptor());
+ }
+ ui.textRouterInfo->display(routers);
+ }
+}
+
+/** Display the network map window. If there are geoip requests waiting in the
+ * queue, start the queue timers now. */
+void
+NetViewer::showWindow()
+{
+ if (!_resolveQueue.isEmpty()) {
+ _minResolveQueueTimer.start(MIN_RESOLVE_QUEUE_DELAY);
+ _maxResolveQueueTimer.start(MAX_RESOLVE_QUEUE_DELAY);
+ }
+ VidaliaWindow::showWindow();
+}
+
+/** Loads data into map, lists and starts timer when we get connected*/
+void
+NetViewer::onAuthenticated()
+{
+ _geoip.setSocksHost(_torControl->getSocksAddress(),
+ _torControl->getSocksPort());
+ refresh();
+ _refreshTimer.start();
+ ui.actionRefresh->setEnabled(true);
+}
+
+/** Clears map, lists and stops timer when we get disconnected */
+void
+NetViewer::onDisconnected()
+{
+ clear();
+ _refreshTimer.stop();
+ ui.actionRefresh->setEnabled(false);
+}
+
+/** Reloads the lists of routers, circuits that Tor knows about */
+void
+NetViewer::refresh()
+{
+ /* Don't let the user refresh while we're refreshing. */
+ ui.actionRefresh->setEnabled(false);
+
+ /* Clear the data */
+ clear();
+
+ /* Load router information */
+ loadNetworkStatus();
+ /* Load existing address mappings */
+ loadAddressMap();
+ /* Load Circuits and Streams information */
+ loadConnections();
+
+ /* Ok, they can refresh again. */
+ ui.actionRefresh->setEnabled(true);
+}
+
+/** Clears the lists and the map */
+void
+NetViewer::clear()
+{
+ /* Clear the resolve queue and map */
+ _resolveMap.clear();
+ _resolveQueue.clear();
+ /* Clear the network map */
+ _map->clear();
+ _map->update();
+ /* Clear the address map */
+ _addressMap.clear();
+ /* Clear the lists of routers, circuits, and streams */
+ ui.treeRouterList->clearRouters();
+ ui.treeCircuitList->clearCircuits();
+ ui.textRouterInfo->clear();
+}
+
+/** Loads a list of all current address mappings. */
+void
+NetViewer::loadAddressMap()
+{
+ /* We store the reverse address mappings, so we can go from a numeric value
+ * back to a likely more meaningful hostname to display for the user. */
+ _addressMap = _torControl->getAddressMap().reverse();
+}
+
+/** Loads a list of all current circuits and streams. */
+void
+NetViewer::loadConnections()
+{
+ /* Load all circuits */
+ CircuitList circuits = _torControl->getCircuits();
+ foreach (Circuit circuit, circuits) {
+ addCircuit(circuit);
+ }
+ /* Now load all streams */
+ StreamList streams = _torControl->getStreams();
+ foreach (Stream stream, streams) {
+ addStream(stream);
+ }
+
+ /* Update the map */
+ _map->update();
+}
+
+/** Adds <b>circuit</b> to the map and the list */
+void
+NetViewer::addCircuit(const Circuit &circuit)
+{
+ /* Add the circuit to the list of all current circuits */
+ ui.treeCircuitList->addCircuit(circuit);
+ /* Plot the circuit on the map */
+ _map->addCircuit(circuit.id(), circuit.routerIDs());
+}
+
+/** Adds <b>stream</b> to its associated circuit on the list of all circuits. */
+void
+NetViewer::addStream(const Stream &stream)
+{
+ QString target = stream.targetAddress();
+ QHostAddress addr(target);
+
+ /* If the stream's target has an IP address instead of a host name,
+ * check our cache for an existing reverse address mapping. */
+ if (!addr.isNull() && _addressMap.isMapped(target)) {
+ /* Replace the IP address in the stream event with the original
+ * hostname */
+ ui.treeCircuitList->addStream(
+ Stream(stream.id(), stream.status(), stream.circuitId(),
+ _addressMap.mappedTo(target), stream.targetPort()));
+ } else {
+ ui.treeCircuitList->addStream(stream);
+ }
+}
+
+void
+NetViewer::addressMapped(const QString &from, const QString &to,
+ const QDateTime &expires)
+{
+ _addressMap.add(to, from, expires);
+}
+
+/** Called when the user selects the "Help" action from the toolbar. */
+void
+NetViewer::help()
+{
+ emit helpRequested("netview");
+}
+
+/** Retrieves a list of all running routers from Tor and their descriptors,
+ * and adds them to the RouterListWidget. */
+void
+NetViewer::loadNetworkStatus()
+{
+ NetworkStatus networkStatus = _torControl->getNetworkStatus();
+ foreach (RouterStatus rs, networkStatus) {
+ if (!rs.isRunning())
+ continue;
+
+ RouterDescriptor rd = _torControl->getRouterDescriptor(rs.id());
+ if (!rd.isEmpty())
+ addRouter(rd);
+ }
+}
+
+/** Adds a router to our list of servers and retrieves geographic location
+ * information for the server. */
+void
+NetViewer::addRouter(const RouterDescriptor &rd)
+{
+ /* Add the descriptor to the list of server */
+ ui.treeRouterList->addRouter(rd);
+
+ /* Add this IP to a list of addresses whose geographic location we'd like to
+ * find, but not for special purpose descriptors (e.g., bridges). This
+ * check is only valid for Tor >= 0.2.0.13-alpha. */
+ if (_torControl->getTorVersion() >= 0x020013) {
+ DescriptorAnnotations annotations =
+ _torControl->getDescriptorAnnotations(rd.id());
+ if (!annotations.contains("purpose"))
+ addToResolveQueue(rd.ip(), rd.id());
+ } else {
+ addToResolveQueue(rd.ip(), rd.id());
+ }
+}
+
+/** Called when a NEWDESC event arrives. Retrieves new router descriptors
+ * for the router identities given in <b>ids</b> and updates the router
+ * list and network map. */
+void
+NetViewer::newDescriptors(const QStringList &ids)
+{
+ foreach (QString id, ids) {
+ RouterDescriptor rd = _torControl->getRouterDescriptor(id);
+ if (!rd.isEmpty())
+ addRouter(rd); /* Updates the existing entry */
+ }
+}
+
+/** Adds an IP address to the resolve queue and updates the queue timers. */
+void
+NetViewer::addToResolveQueue(const QHostAddress &ip, const QString &id)
+{
+ QString ipstr = ip.toString();
+ if (!_resolveMap.values(ipstr).contains(id)) {
+ /* Remember which server ids belong to which IP addresses */
+ _resolveMap.insertMulti(ipstr, id);
+ }
+
+ if (!_resolveQueue.contains(ip) && !_geoip.resolveFromCache(ip)) {
+ /* Add the IP to the queue of IPs waiting for geographic information */
+ _resolveQueue << ip;
+
+ /* Wait MIN_RESOLVE_QUEUE_DELAY after the last item inserted into the
+ * queue, before sending the resolve request. */
+ _minResolveQueueTimer.start(MIN_RESOLVE_QUEUE_DELAY);
+
+ /* Do not wait longer than MAX_RESOLVE_QUEUE_DELAY from the time the first
+ * item is inserted into the queue, before flushing and resolving the
+ * queue. */
+ if (_resolveQueue.size() == 1) {
+ _maxResolveQueueTimer.start(MAX_RESOLVE_QUEUE_DELAY);
+ }
+ }
+}
+
+/** Called when the user selects a circuit from the circuit and streams
+ * list. */
+void
+NetViewer::circuitSelected(const Circuit &circuit)
+{
+ /* Clear any selected items. */
+ ui.treeRouterList->deselectAll();
+ ui.textRouterInfo->clear();
+ _map->deselectAll();
+
+ /* Select the items on the map and in the list */
+ _map->selectCircuit(circuit.id());
+
+ QList<RouterDescriptor> routers;
+
+ foreach (QString id, circuit.routerIDs()) {
+ /* Try to find and select each router in the path */
+ RouterListItem *item = ui.treeRouterList->findRouterById(id);
+ if (item)
+ routers.append(item->descriptor());
+ }
+
+ ui.textRouterInfo->display(routers);
+}
+
+/** Called when the user selects one or more routers from the router list. */
+void
+NetViewer::routerSelected(const QList<RouterDescriptor> &routers)
+{
+ _map->deselectAll();
+ ui.textRouterInfo->clear();
+ ui.textRouterInfo->display(routers);
+
+ /* XXX: Ideally we would also be able to select multiple pinpoints on the
+ * 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 there are any IPs in the resolve queue, do the request now. */
+void
+NetViewer::resolve()
+{
+ if (!_resolveQueue.isEmpty()) {
+ /* Send the request now if either the network map is visible, or the
+ * request is for more than a quarter of the servers in the list. */
+ if (isVisible() ||
+ (_resolveQueue.size() >= ui.treeRouterList->topLevelItemCount()/4)) {
+ vInfo("Sending GeoIP request for %1 IP addresses.")
+ .arg(_resolveQueue.size());
+ /* Flush the resolve queue and stop the timers */
+ _geoip.resolve(_resolveQueue);
+ _resolveQueue.clear();
+ }
+ }
+ /* Stop the queue timers. Only one should be active since the other is what
+ * called this slot, but calling stop() on a stopped timer does not hurt. */
+ _minResolveQueueTimer.stop();
+ _maxResolveQueueTimer.stop();
+}
+
+/** Called when a list of GeoIp information has been resolved. */
+void
+NetViewer::resolved(int id, const QList<GeoIp> &geoips)
+{
+ Q_UNUSED(id);
+
+ QString ip;
+ RouterListItem *router;
+
+ foreach (GeoIp geoip, geoips) {
+ /* Find all routers that are at this IP address */
+ ip = geoip.ip().toString();
+ QList<QString> ids = _resolveMap.values(ip);
+ _resolveMap.remove(ip);
+
+ /* Update their geographic location information with the results of this
+ * GeoIP query. */
+ foreach (QString id, ids) {
+ router = ui.treeRouterList->findRouterById(id);
+ if (router) {
+ /* Save the location information in the descriptor */
+ router->setLocation(geoip);
+ /* Plot the router on the map */
+ _map->addRouter(router->descriptor(), geoip);
+ }
+ }
+ }
+
+ /* Update the circuit lines */
+ foreach (Circuit circuit, ui.treeCircuitList->circuits()) {
+ _map->addCircuit(circuit.id(), circuit.routerIDs());
+ }
+
+ /* Repaint the map */
+ _map->update();
+}
+
+/** Called when the user selects a router on the network map. Displays a
+ * dialog with detailed information for the router specified by
+ * <b>id</b>.*/
+void
+NetViewer::displayRouterInfo(const QString &id)
+{
+ RouterInfoDialog dlg(_map->isFullScreen() ? static_cast<QWidget*>(_map)
+ : static_cast<QWidget*>(this));
+
+ /* Fetch the specified router's descriptor */
+ QStringList rd = _torControl->getRouterDescriptorText(id);
+ if (rd.isEmpty()) {
+ VMessageBox::warning(this, tr("Relay Not Found"),
+ tr("No details on the selected relay are available."),
+ VMessageBox::Ok);
+ return;
+ }
+
+ /* Fetch the router's network status information */
+ RouterStatus rs = _torControl->getRouterStatus(id);
+
+ dlg.setRouterInfo(rd, rs);
+
+ /* Populate the UI with information learned from a previous GeoIP request */
+ RouterListItem *item = ui.treeRouterList->findRouterById(id);
+ if (item)
+ dlg.setLocation(item->location());
+ else
+ dlg.setLocation(tr("Unknown"));
+
+ dlg.exec();
+}
+
+/* XXX: The following zoomIn() and zoomOut() slots are a hack. MarbleWidget
+ * does have zoomIn() and zoomOut() slots to which we could connect the
+ * buttons, but these slots currently don't force a repaint. So to see
+ * the zoom effect, the user has to click on the map after clicking one
+ * of the zoom buttons. Instead, we use the zoomViewBy() method, which
+ * DOES force a repaint.
+ */
+/** Called when the user clicks the "Zoom In" button. */
+void
+NetViewer::zoomIn()
+{
+#if defined(USE_MARBLE)
+ _map->zoomViewBy(40);
+#else
+ _map->zoomIn();
+#endif
+}
+
+/** Called when the user clicks the "Zoom Out" button. */
+void
+NetViewer::zoomOut()
+{
+#if defined(USE_MARBLE)
+ _map->zoomViewBy(-40);
+#else
+ _map->zoomOut();
+#endif
+}
+
+/** 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
+NetViewer::toggleFullScreen()
+{
+ if (_map->isFullScreen()) {
+ /* Disabling full screen mode. Put the map back in its container. */
+ ui.gridLayout->addWidget(_map);
+ _map->setWindowState(_map->windowState() & ~Qt::WindowFullScreen);
+ } else {
+ /* Enabling full screen mode. Remove the map from the QGridLayout
+ * container and set its window state to full screen. */
+ _map->setParent(0);
+ _map->setWindowState(_map->windowState() | Qt::WindowFullScreen);
+ _map->show();
+ }
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/NetViewer.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/NetViewer.h
new file mode 100644
index 0000000..d3eea61
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/NetViewer.h
@@ -0,0 +1,154 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 NetViewer.h
+** \version $Id: NetViewer.h 4054 2009-08-17 02:25:08Z edmanm $
+** \brief Displays a map of the Tor network and the user's circuits
+*/
+
+#ifndef _NETVIEWER_H
+#define _NETVIEWER_H
+
+#include "config.h"
+#include "ui_NetViewer.h"
+#include "VidaliaWindow.h"
+#include "GeoIpResolver.h"
+
+#if defined(USE_MARBLE)
+#include "TorMapWidget.h"
+#else
+#include "TorMapImageView.h"
+#endif
+
+#include "TorControl.h"
+
+#include <QMainWindow>
+#include <QStringList>
+#include <QEvent>
+#include <QTimer>
+#include <QHash>
+
+class QDateTime;
+
+
+class NetViewer : public VidaliaWindow
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor */
+ NetViewer(QWidget* parent = 0);
+
+public slots:
+ /** Displays the network map window. */
+ void showWindow();
+ /** Loads a list of current circuits and streams. */
+ void loadConnections();
+ /** Adds <b>circuit</b> to the list and the map */
+ void addCircuit(const Circuit &circuit);
+ /** Adds <b>stream</b> to the list of circuits, under the appropriate
+ * circuit. */
+ void addStream(const Stream &stream);
+
+ /** Called when a NEWDESC event arrives. Retrieves new router descriptors
+ * for the router identities given in <b>ids</b> and updates the router list
+ * and network map.
+ */
+ void newDescriptors(const QStringList &ids);
+
+ /** Called 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.
+ */
+ void addressMapped(const QString &from, const QString &to,
+ const QDateTime &expires);
+
+ /** Clears all known information */
+ void clear();
+
+protected:
+ /** Called when the user changes the UI translation. */
+ void retranslateUi();
+
+private slots:
+ /** Called when the user selects the "Help" action on the toolbar. */
+ void help();
+ /** Called when the user selects the "Refresh" action on the toolbar */
+ void refresh();
+ /** Called when the user selects a circuit on the circuit list */
+ void circuitSelected(const Circuit &circuit);
+ /** Called when an IP has been resolved to geographic information. */
+ void resolved(int id, const QList<GeoIp> &geoips);
+ /** Called when the user selects one or more routers in the list. */
+ void routerSelected(const QList<RouterDescriptor> &routers);
+ /** Handles when we get connected to Tor network */
+ void onAuthenticated();
+ /** Handles when we get disconnected from Tor network */
+ void onDisconnected();
+ /** Resolves IP addresses in the resolve queue to geographic information. */
+ void resolve();
+ /** Called when the user selects a router on the network map. Displays a
+ * dialog with detailed information for the router specified by
+ * <b>id</b>.*/
+ void displayRouterInfo(const QString &id);
+ /** Called when the user clicks the "Zoom In" button. */
+ void zoomIn();
+ /** Called when the user clicks the "Zoom Out" button. */
+ void zoomOut();
+ /** 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();
+
+private:
+ /** Adds an IP address to the resolve queue and updates the queue timers. */
+ void addToResolveQueue(const QHostAddress &ip, const QString &id);
+ /** 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);
+
+ /** TorControl object used to talk to Tor. */
+ TorControl* _torControl;
+ /** Timer that fires once an hour to update the router list. */
+ QTimer _refreshTimer;
+ /** GeoIpResolver used to geolocate routers by IP address. */
+ GeoIpResolver _geoip;
+ /** Queue for IPs pending resolution to geographic information. */
+ QList<QHostAddress> _resolveQueue;
+ /** Maps pending GeoIP requests to server IDs. */
+ QHash<QString, QString> _resolveMap;
+ /** Stores a list of address mappings from Tor. */
+ AddressMap _addressMap;
+ /** Timer used to delay GeoIP requests for MIN_RESOLVE_QUEUE_DELAY
+ * milliseconds after we've inserted the last item into the queue. */
+ QTimer _minResolveQueueTimer;
+ /** Timer used to limit the delay of GeoIP requests to
+ * MAX_RESOLVE_QUEUE_DELAY milliseconds after inserting the first item
+ * into the queue. */
+ QTimer _maxResolveQueueTimer;
+
+ /** Widget that displays the Tor network map. */
+#if defined(USE_MARBLE)
+ TorMapWidget* _map;
+#else
+ TorMapImageView* _map;
+#endif
+
+ /** Qt Designer generated object **/
+ Ui::NetViewer ui;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/NetViewer.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/NetViewer.ui
new file mode 100644
index 0000000..63c8d88
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/NetViewer.ui
@@ -0,0 +1,393 @@
+<ui version="4.0" >
+ <class>NetViewer</class>
+ <widget class="QMainWindow" name="NetViewer" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>844</width>
+ <height>596</height>
+ </rect>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </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" >
+ <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" >
+ <number>0</number>
+ </property>
+ <property name="sortingEnabled" >
+ <bool>true</bool>
+ </property>
+ <property name="selectionMode" >
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
+ </widget>
+ <widget class="QSplitter" name="splitter3" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>100</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="contextMenuPolicy" >
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="childrenCollapsible" >
+ <bool>false</bool>
+ </property>
+ <widget class="QFrame" name="frmMap" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>7</vsizetype>
+ <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="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>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ </layout>
+ </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>
+ </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" >
+ <bool>false</bool>
+ </property>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <attribute name="toolBarArea" >
+ <number>4</number>
+ </attribute>
+ <addaction name="actionRefresh" />
+ <addaction name="separator" />
+ <addaction name="actionZoomIn" />
+ <addaction name="actionZoomOut" />
+ <addaction name="actionZoomToFit" />
+ <addaction name="actionZoomFullScreen" />
+ <addaction name="separator" />
+ <addaction name="actionHelp" />
+ <addaction name="actionClose" />
+ </widget>
+ <action name="actionRefresh" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="icon" >
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/view-refresh.png</iconset>
+ </property>
+ <property name="text" >
+ <string>Refresh</string>
+ </property>
+ <property name="toolTip" >
+ <string>Refresh the list of Tor relays and connections</string>
+ </property>
+ <property name="statusTip" >
+ <string>Refresh the list of Tor relays and connections</string>
+ </property>
+ <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>
+ </property>
+ <property name="text" >
+ <string>Help</string>
+ </property>
+ <property name="toolTip" >
+ <string>Show the network map help</string>
+ </property>
+ <property name="statusTip" >
+ <string>Show network map help</string>
+ </property>
+ <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>
+ </property>
+ <property name="text" >
+ <string>Close</string>
+ </property>
+ <property name="toolTip" >
+ <string>Close the network map</string>
+ </property>
+ <property name="statusTip" >
+ <string>Close the network map</string>
+ </property>
+ <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>
+ </property>
+ <property name="text" >
+ <string>Zoom In</string>
+ </property>
+ <property name="toolTip" >
+ <string>Zoom in on the network map</string>
+ </property>
+ <property name="statusTip" >
+ <string>Zoom in on the network map</string>
+ </property>
+ <property name="shortcut" >
+ <string>+</string>
+ </property>
+ </action>
+ <action name="actionZoomOut" >
+ <property name="icon" >
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/zoom-out.png</iconset>
+ </property>
+ <property name="text" >
+ <string>Zoom Out</string>
+ </property>
+ <property name="toolTip" >
+ <string>Zoom out on the network map</string>
+ </property>
+ <property name="statusTip" >
+ <string>Zoom out on the network map</string>
+ </property>
+ <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>
+ </property>
+ <property name="text" >
+ <string>Zoom To Fit</string>
+ </property>
+ <property name="toolTip" >
+ <string>Zooms to fit all currently displayed circuits</string>
+ </property>
+ <property name="statusTip" >
+ <string>Zooms to fit all currently displayed circuits</string>
+ </property>
+ <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>
+ </property>
+ <property name="text" >
+ <string>Full Screen</string>
+ </property>
+ <property name="toolTip" >
+ <string>View the network map as a full screen window</string>
+ </property>
+ <property name="statusTip" >
+ <string>View the network map as a full screen window</string>
+ </property>
+ <property name="shortcut" >
+ <string>Ctrl+F</string>
+ </property>
+ </action>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>RouterDescriptorView</class>
+ <extends>QTextEdit</extends>
+ <header>network/RouterDescriptorView.h</header>
+ </customwidget>
+ <customwidget>
+ <class>RouterListWidget</class>
+ <extends>QTreeWidget</extends>
+ <header>network/RouterListWidget.h</header>
+ </customwidget>
+ <customwidget>
+ <class>CircuitListWidget</class>
+ <extends>QTreeWidget</extends>
+ <header>network/CircuitListWidget.h</header>
+ </customwidget>
+ </customwidgets>
+ <resources>
+ <include location="../res/vidalia.qrc" />
+ </resources>
+ <connections>
+ <connection>
+ <sender>actionClose</sender>
+ <signal>triggered()</signal>
+ <receiver>NetViewer</receiver>
+ <slot>close()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>-1</x>
+ <y>-1</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>403</x>
+ <y>322</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterDescriptorView.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterDescriptorView.cpp
new file mode 100644
index 0000000..c638ab1
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterDescriptorView.cpp
@@ -0,0 +1,143 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 RouterDescriptorView.cpp
+** \version $Id: RouterDescriptorView.cpp 3770 2009-05-14 02:41:24Z edmanm $
+** \brief Formats and displays a router descriptor as HTML
+*/
+
+#include "RouterDescriptorView.h"
+#include "Vidalia.h"
+
+#include "html.h"
+#include "stringutil.h"
+
+#include <QMenu>
+#include <QIcon>
+#include <QTextCursor>
+#include <QClipboard>
+#include <QShortcut>
+#include <QTextDocumentFragment>
+
+#define IMG_COPY ":/images/22x22/edit-copy.png"
+
+
+/** Default constructor. */
+RouterDescriptorView::RouterDescriptorView(QWidget *parent)
+: QTextEdit(parent)
+{
+ /* Steal QTextEdit's default "Copy" shortcut, since we want to do some
+ * tweaking of the selected text before putting it on the clipboard. */
+ QShortcut *shortcut = new QShortcut(QKeySequence::Copy, this,
+ SLOT(copySelectedText()));
+ Q_UNUSED(shortcut);
+}
+
+/** Displays a context menu for the user when they right-click on the
+ * widget. */
+void
+RouterDescriptorView::contextMenuEvent(QContextMenuEvent *event)
+{
+ QMenu *menu = new QMenu();
+
+ QAction *copyAction = new QAction(QIcon(IMG_COPY), tr("Copy"), menu);
+ copyAction->setShortcut(QKeySequence::Copy);
+ connect(copyAction, SIGNAL(triggered()), this, SLOT(copySelectedText()));
+
+ if (textCursor().selectedText().isEmpty())
+ copyAction->setEnabled(false);
+
+ menu->addAction(copyAction);
+ menu->exec(event->globalPos());
+ delete menu;
+}
+
+/** Copies any selected text to the clipboard. */
+void
+RouterDescriptorView::copySelectedText()
+{
+ QString selectedText = textCursor().selection().toPlainText();
+ selectedText.replace(":\n", ": ");
+ vApp->clipboard()->setText(selectedText);
+}
+
+/** Adjusts the displayed uptime to include time since the router's descriptor
+ * was last published. */
+quint64
+RouterDescriptorView::adjustUptime(quint64 uptime, QDateTime published)
+{
+ QDateTime now = QDateTime::currentDateTime().toUTC();
+
+ if (now < published) {
+ return uptime;
+ }
+ return (uptime + (now.toTime_t() - published.toTime_t()));
+}
+
+/** Displays all router descriptors in the given list. */
+void
+RouterDescriptorView::display(QList<RouterDescriptor> rdlist)
+{
+ RouterDescriptor rd;
+ QString html = "<html><body>";
+
+ for (int r = 0; r < rdlist.size(); r++) {
+ rd = rdlist.at(r);
+ if (rd.isEmpty())
+ continue;
+
+ /* Router name and status */
+ html.append(p(b(rd.name()) + " (" + i(rd.status()) + ")"));
+
+ /* IP and platform */
+ html.append("<table>");
+
+ /* If we have location information, show that first. */
+ if (!rd.location().isEmpty()) {
+ html.append(trow(tcol(b(tr("Location:"))) + tcol(rd.location())));
+ }
+
+ /* 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())));
+
+ /* If the router is online, then show the uptime and bandwidth stats. */
+ if (!rd.offline()) {
+ html.append(trow(tcol(b(tr("Bandwidth:"))) +
+ tcol(string_format_bandwidth(rd.observedBandwidth()))));
+ html.append(trow(tcol(b(tr("Uptime:"))) +
+ tcol(string_format_uptime(
+ adjustUptime(rd.uptime(), rd.published())))));
+ }
+
+ /* Date the router was published */
+ html.append(trow(tcol(b(tr("Last Updated:"))) +
+ tcol(string_format_datetime(rd.published()) + " GMT")));
+
+ html.append("</table>");
+
+ /* If there are multiple descriptors, and this isn't is the last one
+ * then separate them with a short horizontal line. */
+ if (r+1 != rdlist.size()) {
+ html.append("<center><hr width=\"50%\"/></center>");
+ }
+ }
+ html.append("</body></html>");
+ setHtml(html);
+}
+
+/** Displays the given router descriptor. */
+void
+RouterDescriptorView::display(RouterDescriptor rd)
+{
+ display(QList<RouterDescriptor>() << rd);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterDescriptorView.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterDescriptorView.h
new file mode 100644
index 0000000..4ba4db3
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterDescriptorView.h
@@ -0,0 +1,56 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 RouterDescriptorView.h
+** \version $Id: RouterDescriptorView.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Formats and displays a router descriptor as HTML
+*/
+
+#ifndef _ROUTERDESCRIPTORVIEW_H
+#define _ROUTERDESCRIPTORVIEW_H
+
+#include "RouterDescriptor.h"
+
+#include <QObject>
+#include <QTextEdit>
+#include <QList>
+#include <QContextMenuEvent>
+
+
+class RouterDescriptorView : public QTextEdit
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. */
+ RouterDescriptorView(QWidget *parent = 0);
+
+public slots:
+ /** Shows the given router descriptor. */
+ void display(RouterDescriptor rd);
+ /** Shows all router descriptors in the given list. */
+ void display(QList<RouterDescriptor> rdlist);
+ /** Copies any selected text to the clipboard. */
+ void copySelectedText();
+
+protected:
+ /** Displays a context menu for the user when they right-click on the
+ * widget. */
+ virtual void contextMenuEvent(QContextMenuEvent *event);
+
+private:
+ /** Adjusts the displayed uptime to include time since the
+ * router's descriptor was last published. */
+ quint64 adjustUptime(quint64 uptime, QDateTime published);
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterInfoDialog.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterInfoDialog.cpp
new file mode 100644
index 0000000..c5909a4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterInfoDialog.cpp
@@ -0,0 +1,79 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 RouterInfoDialog.cpp
+** \version $Id: RouterInfoDialog.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays detailed information about a particular router
+*/
+
+#include "RouterInfoDialog.h"
+
+#include "stringutil.h"
+
+
+RouterInfoDialog::RouterInfoDialog(QWidget *parent)
+ : QDialog(parent)
+{
+ ui.setupUi(this);
+}
+
+quint64
+RouterInfoDialog::adjustUptime(quint64 uptime, const QDateTime &published)
+{
+ QDateTime now = QDateTime::currentDateTime().toUTC();
+
+ if (now < published)
+ return uptime;
+
+ return (uptime + (now.toTime_t() - published.toTime_t()));
+}
+
+void
+RouterInfoDialog::setRouterInfo(const QStringList &desc,
+ const RouterStatus &status)
+{
+ 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())));
+
+ if (rd.hibernating()) {
+ ui.lblStatus->setText(tr("Hibernating"));
+ } else if (status.isValid()) {
+ if (status.flags() & RouterStatus::Running)
+ ui.lblStatus->setText(tr("Online"));
+ else
+ ui.lblStatus->setText(tr("Offline"));
+ } else {
+ ui.lblStatus->setText(tr("Unknown"));
+ }
+
+ if (! rd.contact().isEmpty()) {
+ ui.lblContact->setText(rd.contact());
+ } else {
+ ui.lblContact->setVisible(false);
+ ui.lblContactLabel->setVisible(false);
+ }
+
+ ui.textDescriptor->setPlainText(desc.join("\n"));
+}
+
+void
+RouterInfoDialog::setLocation(const QString &location)
+{
+ ui.lblLocation->setText(location);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterInfoDialog.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterInfoDialog.h
new file mode 100644
index 0000000..34f6a25
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterInfoDialog.h
@@ -0,0 +1,59 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not receive the LICENSE file with this file, you may obtain it from the
+** Vidalia source package distributed by the Vidalia Project at
+** http://www.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 RouterInfoDialog.h
+** \version $Id: RouterInfoDialog.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays detailed information about a particular router
+*/
+
+
+#ifndef _ROUTERINFODIALOG_H
+#define _ROUTERINFODIALOG_H
+
+#include "ui_RouterInfoDialog.h"
+
+#include "RouterStatus.h"
+#include "RouterDescriptor.h"
+
+#include <QDialog>
+
+
+class RouterInfoDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor.
+ */
+ RouterInfoDialog(QWidget *parent = 0);
+
+ /** Populates the dialog's UI with information parsed from the router
+ * descriptor <b>desc</b> and the router status information in
+ * <b>status</b>.
+ */
+ void setRouterInfo(const QStringList &desc, const RouterStatus &status);
+
+ /** Sets the geographic location information displayed in the dialog to
+ * <b>location</b>.
+ */
+ void setLocation(const QString &location);
+
+private:
+ /** Adjusts <b>uptime</b> to be the greater of either <b>published</b> or
+ * <b>uptime</b> plus the number of seconds elapsed since <b>published</b>.
+ */
+ quint64 adjustUptime(quint64 uptime, const QDateTime &published);
+
+ Ui::RouterInfoDialog ui;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterInfoDialog.ui b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterInfoDialog.ui
new file mode 100644
index 0000000..8937492
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterInfoDialog.ui
@@ -0,0 +1,449 @@
+<ui version="4.0" >
+ <class>RouterInfoDialog</class>
+ <widget class="QDialog" name="RouterInfoDialog" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>427</width>
+ <height>382</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+ <string>Relay Details</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout" >
+ <item>
+ <widget class="QTabWidget" name="tabWidget" >
+ <property name="tabShape" >
+ <enum>QTabWidget::Rounded</enum>
+ </property>
+ <property name="currentIndex" >
+ <number>0</number>
+ </property>
+ <property name="usesScrollButtons" >
+ <bool>false</bool>
+ </property>
+ <widget class="QWidget" name="tabSummary" >
+ <attribute name="title" >
+ <string>Summary</string>
+ </attribute>
+ <layout class="QGridLayout" name="gridLayout_2" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="lblNameLabel" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font" >
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text" >
+ <string>Name:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QLabel" name="lblName" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="lblStatusLabel" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font" >
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text" >
+ <string>Status:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QLabel" name="lblStatus" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="lblLocationLabel" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font" >
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text" >
+ <string>Location:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QLabel" name="lblLocation" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" >
+ <widget class="QLabel" name="lblIPAddressLabel" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font" >
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text" >
+ <string>IP Address:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" >
+ <widget class="QLabel" name="lblIPAddress" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0" >
+ <widget class="QLabel" name="lblPlatformLabel" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font" >
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text" >
+ <string>Platform:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1" >
+ <widget class="QLabel" name="lblPlatform" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0" >
+ <widget class="QLabel" name="lblBandwidthLabel" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font" >
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text" >
+ <string>Bandwidth:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1" >
+ <widget class="QLabel" name="lblBandwidth" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0" >
+ <widget class="QLabel" name="lblUptimeLabel" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font" >
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text" >
+ <string>Uptime:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1" >
+ <widget class="QLabel" name="lblUptime" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="0" >
+ <widget class="QLabel" name="lblContactLabel" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font" >
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text" >
+ <string>Contact:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="1" >
+ <widget class="QLabel" name="lblContact" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="10" column="0" >
+ <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>
+ <item row="9" column="0" >
+ <widget class="QLabel" name="lblLastUpdatedLabel" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font" >
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text" >
+ <string>Last Updated:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="1" >
+ <widget class="QLabel" name="lblLastUpdated" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tabDescriptor" >
+ <attribute name="title" >
+ <string>Descriptor</string>
+ </attribute>
+ <layout class="QGridLayout" name="gridLayout" >
+ <item row="0" column="0" >
+ <widget class="QTextEdit" name="textDescriptor" >
+ <property name="font" >
+ <font>
+ <family>Courier New</family>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="lineWrapMode" >
+ <enum>QTextEdit::NoWrap</enum>
+ </property>
+ <property name="acceptRichText" >
+ <bool>false</bool>
+ </property>
+ <property name="textInteractionFlags" >
+ <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Close</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>RouterInfoDialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>157</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>RouterInfoDialog</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>286</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterListItem.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterListItem.cpp
new file mode 100644
index 0000000..cb14d9a
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterListItem.cpp
@@ -0,0 +1,150 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 RouterListItem.cpp
+** \version $Id: RouterListItem.cpp 3768 2009-05-13 19:07:26Z edmanm $
+** \brief Item representing a single router and status in a RouterListWidget
+*/
+
+#include "RouterListItem.h"
+#include "RouterListWidget.h"
+
+#include <QHeaderView>
+
+#define STATUS_COLUMN (RouterListWidget::StatusColumn)
+#define COUNTRY_COLUMN (RouterListWidget::CountryColumn)
+#define NAME_COLUMN (RouterListWidget::NameColumn)
+
+#define IMG_NODE_OFFLINE ":/images/icons/node-unresponsive.png"
+#define IMG_NODE_SLEEPING ":/images/icons/node-hibernating.png"
+#define IMG_NODE_NO_BW ":/images/icons/node-bw-none.png"
+#define IMG_NODE_LOW_BW ":/images/icons/node-bw-low.png"
+#define IMG_NODE_MED_BW ":/images/icons/node-bw-med.png"
+#define IMG_NODE_HIGH_BW ":/images/icons/node-bw-high.png"
+#define IMG_FLAG_UNKNOWN ":/images/flags/unknown.png"
+
+
+/** Default constructor. */
+RouterListItem::RouterListItem(RouterListWidget *list, RouterDescriptor rd)
+ : QTreeWidgetItem()
+{
+ _list = list;
+ _rd = 0;
+ _country = "~"; /* Force items with no country to the bottom */
+ setIcon(COUNTRY_COLUMN, QIcon(IMG_FLAG_UNKNOWN));
+ update(rd);
+}
+
+/** Destructor. */
+RouterListItem::~RouterListItem()
+{
+ if (_rd)
+ delete _rd;
+}
+
+/** Updates the router descriptor for this item. */
+void
+RouterListItem::update(const RouterDescriptor &rd)
+{
+ QIcon statusIcon;
+ if (_rd) {
+ delete _rd;
+ }
+ _rd = new RouterDescriptor(rd);
+
+ /* Determine the status value (used for sorting) and icon */
+ if (_rd->offline()) {
+ _statusValue = -1;
+ statusIcon = QIcon(IMG_NODE_OFFLINE);
+ setToolTip(STATUS_COLUMN, tr("Offline"));
+ } else if (_rd->hibernating()) {
+ _statusValue = 0;
+ statusIcon = QIcon(IMG_NODE_SLEEPING);
+ setToolTip(STATUS_COLUMN, tr("Hibernating"));
+ } else {
+ _statusValue = (qint64)_rd->observedBandwidth();
+ if (_statusValue >= 400*1024) {
+ statusIcon = QIcon(IMG_NODE_HIGH_BW);
+ } else if (_statusValue >= 60*1024) {
+ statusIcon = QIcon(IMG_NODE_MED_BW);
+ } else if (_statusValue >= 20*1024) {
+ statusIcon = QIcon(IMG_NODE_LOW_BW);
+ } else {
+ statusIcon = QIcon(IMG_NODE_NO_BW);
+ }
+ setToolTip(STATUS_COLUMN, tr("%1 KB/s").arg(_statusValue/1024));
+ }
+
+ /* Make the new information visible */
+ setIcon(STATUS_COLUMN, statusIcon);
+ setText(NAME_COLUMN, _rd->name());
+ setToolTip(NAME_COLUMN, QString(_rd->name() + "\r\n" + _rd->platform()));
+}
+
+/** Sets the location information for this item's router descriptor. */
+void
+RouterListItem::setLocation(const GeoIp &geoip)
+{
+ QPixmap flag(":/images/flags/" + geoip.countryCode().toLower() + ".png");
+ if (!flag.isNull()) {
+ setIcon(COUNTRY_COLUMN, QIcon(flag));
+ }
+ setToolTip(COUNTRY_COLUMN, geoip.toString());
+
+ if (_rd)
+ _rd->setLocation(geoip.toString());
+ _country = geoip.countryCode();
+}
+
+/** Overload the comparison operator. */
+bool
+RouterListItem::operator<(const QTreeWidgetItem &other) const
+{
+ const RouterListItem *a = this;
+ const RouterListItem *b = (RouterListItem *)&other;
+
+ if (_list) {
+ Qt::SortOrder order = _list->header()->sortIndicatorOrder();
+ switch (_list->sortColumn()) {
+ case RouterListWidget::StatusColumn:
+ /* Numeric comparison based on status and/or bandwidth */
+ if (a->_statusValue == b->_statusValue) {
+ if (order == Qt::AscendingOrder)
+ return (a->name().toLower() > b->name().toLower());
+ else
+ return (a->name().toLower() < b->name().toLower());
+ }
+ return (a->_statusValue < b->_statusValue);
+ case RouterListWidget::CountryColumn:
+ /* Compare based on country code */
+ if (a->_country == b->_country) {
+ if (order == Qt::AscendingOrder)
+ return (a->_statusValue > b->_statusValue);
+ else
+ return (a->_statusValue < b->_statusValue);
+ }
+ return (a->_country < b->_country);
+ case RouterListWidget::NameColumn:
+ /* Case-insensitive comparison based on router name */
+ if (a->name().toLower() == b->name().toLower()) {
+ if (order == Qt::AscendingOrder)
+ return (a->_statusValue > b->_statusValue);
+ else
+ return (a->_statusValue < b->_statusValue);
+ }
+ return (a->name().toLower() < b->name().toLower());
+ default:
+ break;
+ }
+ }
+ return QTreeWidgetItem::operator<(other);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterListItem.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterListItem.h
new file mode 100644
index 0000000..b8430ec
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterListItem.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.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 RouterListItem.h
+** \version $Id: RouterListItem.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Item representing a single router and status in a RouterListWidget
+*/
+
+#ifndef _ROUTERLISTITEM_H
+#define _ROUTERLISTITEM_H
+
+#include "RouterDescriptor.h"
+#include "RouterListWidget.h"
+#include "GeoIp.h"
+
+#include <QCoreApplication>
+#include <QTreeWidgetItem>
+#include <QString>
+
+class RouterListWidget;
+
+
+class RouterListItem : public QTreeWidgetItem
+{
+ Q_DECLARE_TR_FUNCTIONS(RouterListItem)
+
+public:
+ /** Default constructor. */
+ RouterListItem(RouterListWidget *list, RouterDescriptor rd);
+ /** Destructor. */
+ ~RouterListItem();
+
+ /** Updates this router item using a new descriptor. */
+ void update(const RouterDescriptor &rd);
+ /** Returns the router's ID. */
+ QString id() const { return _rd->id(); }
+ /** Returns the router's name. */
+ QString name() const { return _rd->name(); }
+ /** Returns the descriptor for this router. */
+ RouterDescriptor descriptor() const { return *_rd; }
+ /** Sets the location information for this router item. */
+ void setLocation(const GeoIp &geoip);
+ /** Returns the location information set for this router item. */
+ QString location() const { return _rd->location(); }
+
+ /** Overload the comparison operator. */
+ virtual bool operator<(const QTreeWidgetItem &other) const;
+
+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. */
+ QString _country; /**< Country in which this router is likely
+ located. */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterListWidget.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterListWidget.cpp
new file mode 100644
index 0000000..a249e5f
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterListWidget.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.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 RouterListWidget.cpp
+** \version $Id: RouterListWidget.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays a list of Tor servers and their status
+*/
+
+#include "RouterListWidget.h"
+#include "RouterListItem.h"
+#include "Vidalia.h"
+
+#include <QHeaderView>
+#include <QClipboard>
+
+#define IMG_ZOOM ":/images/22x22/page-zoom.png"
+#define IMG_COPY ":/images/22x22/edit-copy.png"
+
+
+RouterListWidget::RouterListWidget(QWidget *parent)
+ : QTreeWidget(parent)
+{
+ /* Create and initialize columns */
+ setHeaderLabels(QStringList() << QString("")
+ << QString("")
+ << tr("Relay"));
+
+ /* Sort by descending server bandwidth */
+ sortItems(StatusColumn, Qt::DescendingOrder);
+
+ /* Find out when the selected item has changed. */
+ connect(this, SIGNAL(itemSelectionChanged()),
+ this, SLOT(onSelectionChanged()));
+}
+
+/** Called when the user changes the UI translation. */
+void
+RouterListWidget::retranslateUi()
+{
+ setHeaderLabels(QStringList() << QString("")
+ << QString("")
+ << tr("Relay"));
+}
+
+/** Called when the user requests a context menu for a router in the list. A
+ * context menu will be displayed providing a list of actions, including
+ * zooming in on the server. */
+void
+RouterListWidget::contextMenuEvent(QContextMenuEvent *event)
+{
+ QAction *action;
+ QMenu *menu, *copyMenu;
+ QList<QTreeWidgetItem *> selected;
+
+ selected = selectedItems();
+ if (! selected.size())
+ return;
+
+ menu = new QMenu();
+ copyMenu = menu->addMenu(QIcon(IMG_COPY), tr("Copy"));
+ action = copyMenu->addAction(tr("Nickname"));
+ connect(action, SIGNAL(triggered()), this, SLOT(copySelectedNicknames()));
+
+ action = copyMenu->addAction(tr("Fingerprint"));
+ connect(action, SIGNAL(triggered()), this, SLOT(copySelectedFingerprints()));
+
+ action = menu->addAction(QIcon(IMG_ZOOM), tr("Zoom to Relay"));
+ if (selected.size() > 1)
+ action->setEnabled(false);
+ else
+ connect(action, SIGNAL(triggered()), this, SLOT(zoomToSelectedRelay()));
+
+ menu->exec(event->globalPos());
+ delete menu;
+}
+
+/** Copies the nicknames for all currently selected relays to the clipboard.
+ * Nicknames are formatted as a comma-delimited list, suitable for doing
+ * dumb things with your torrc. */
+void
+RouterListWidget::copySelectedNicknames()
+{
+ QString text;
+
+ foreach (QTreeWidgetItem *item, selectedItems()) {
+ RouterListItem *relay = dynamic_cast<RouterListItem *>(item);
+ if (relay)
+ text.append(relay->name() + ",");
+ }
+ if (text.length()) {
+ text.remove(text.length()-1, 1);
+ vApp->clipboard()->setText(text);
+ }
+}
+
+/** Copies the fingerprints for all currently selected relays to the
+ * clipboard. Fingerprints are formatted as a comma-delimited list, suitable
+ * for doing dumb things with your torrc. */
+void
+RouterListWidget::copySelectedFingerprints()
+{
+ QString text;
+
+ foreach (QTreeWidgetItem *item, selectedItems()) {
+ RouterListItem *relay = dynamic_cast<RouterListItem *>(item);
+ if (relay)
+ text.append("$" + relay->id() + ",");
+ }
+ if (text.length()) {
+ text.remove(text.length()-1, 1);
+ vApp->clipboard()->setText(text);
+ }
+}
+
+/** Emits a zoomToRouter() signal containing the fingerprint of the
+ * currently selected relay. */
+void
+RouterListWidget::zoomToSelectedRelay()
+{
+ QList<QTreeWidgetItem *> selected = selectedItems();
+ if (selected.size() != 1)
+ return;
+
+ RouterListItem *relay = dynamic_cast<RouterListItem *>(selected[0]);
+ if (relay)
+ emit zoomToRouter(relay->id());
+}
+
+/** Deselects all currently selected routers. */
+void
+RouterListWidget::deselectAll()
+{
+ QList<QTreeWidgetItem *> selected = selectedItems();
+ foreach (QTreeWidgetItem *item, selected) {
+ setItemSelected(item, false);
+ }
+}
+
+/** Clear the list of router items. */
+void
+RouterListWidget::clearRouters()
+{
+ _idmap.clear();
+ QTreeWidget::clear();
+ setStatusTip(tr("%1 relays online").arg(0));
+}
+
+/** 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
+RouterListWidget::keyPressEvent(QKeyEvent *event)
+{
+ int index;
+
+ QString key = event->text();
+ if (!key.isEmpty() && key.at(0).isLetterOrNumber()) {
+ /* A text key was pressed, so search for routers that begin with that key. */
+ QList<QTreeWidgetItem *> list = findItems(QString("^[%1%2].*$")
+ .arg(key.toUpper())
+ .arg(key.toLower()),
+ Qt::MatchRegExp|Qt::MatchWrap,
+ NameColumn);
+ if (list.size() > 0) {
+ QList<QTreeWidgetItem *> s = selectedItems();
+
+ /* A match was found, so deselect any previously selected routers,
+ * select the new match, and make sure it's visible. If there was
+ * already a router selected that started with the search key, go to the
+ * next match in the list. */
+ deselectAll();
+ index = (!s.size() ? 0 : (list.indexOf(s.at(0)) + 1) % list.size());
+
+ /* Select the item and scroll to it */
+ setItemSelected(list.at(index), true);
+ scrollToItem(list.at(index));
+ }
+ event->accept();
+ } else {
+ /* It was something we don't understand, so hand it to the parent class */
+ QTreeWidget::keyPressEvent(event);
+ }
+}
+
+/** Finds the list item whose key ID matches <b>id</b>. Returns 0 if not
+ * found. */
+RouterListItem*
+RouterListWidget::findRouterById(QString id)
+{
+ if (_idmap.contains(id)) {
+ return _idmap.value(id);
+ }
+ return 0;
+}
+
+/** Adds a router descriptor to the list. */
+void
+RouterListWidget::addRouter(RouterDescriptor rd)
+{
+ QString id = rd.id();
+ if (id.isEmpty())
+ return;
+
+ RouterListItem *item = findRouterById(id);
+ if (item) {
+ item->update(rd);
+ } else {
+ item = new RouterListItem(this, rd);
+ addTopLevelItem(item);
+ _idmap.insert(id, item);
+ }
+
+ /* Set our status tip to the number of servers in the list */
+ setStatusTip(tr("%1 relays online").arg(topLevelItemCount()));
+}
+
+/** Called when the selected items have changed. This emits the
+ * routerSelected() signal with the descriptor for the selected router.
+ */
+void
+RouterListWidget::onSelectionChanged()
+{
+ QList<RouterDescriptor> descriptors;
+
+ foreach (QTreeWidgetItem *item, selectedItems()) {
+ RouterListItem *relay = dynamic_cast<RouterListItem *>(item);
+ if (relay)
+ descriptors << relay->descriptor();
+ }
+ if (descriptors.count() > 0)
+ emit routerSelected(descriptors);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterListWidget.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterListWidget.h
new file mode 100644
index 0000000..a6f7d0d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/RouterListWidget.h
@@ -0,0 +1,97 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 RouterListWidget.h
+** \version $Id: RouterListWidget.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays a list of Tor servers and their status
+*/
+
+#ifndef _ROUTERLISTWIDGET_H
+#define _ROUTERLISTWIDGET_H
+
+#include "RouterDescriptor.h"
+
+#include <QHash>
+#include <QList>
+#include <QMenu>
+#include <QObject>
+#include <QAction>
+#include <QKeyEvent>
+#include <QTreeWidget>
+#include <QHostAddress>
+#include <QMouseEvent>
+
+class RouterListItem;
+
+class RouterListWidget : public QTreeWidget
+{
+ Q_OBJECT
+
+public:
+ /** Columns in the list. */
+ enum Columns {
+ StatusColumn = 0, /**< Status column, indicating bandwidth. */
+ CountryColumn = 1, /**< Router's country flag. */
+ NameColumn = 2, /**< Router's name. */
+ };
+
+ /** Default constructor. */
+ RouterListWidget(QWidget *parent = 0);
+
+ /** Adds a new descriptor the list. */
+ void addRouter(RouterDescriptor rd);
+ /** Finds the list item whose key ID matches <b>id</b>. Returns 0 if not
+ * found. */
+ RouterListItem* findRouterById(QString id);
+ /** Deselects all currently selected routers. */
+ void deselectAll();
+ /** Called when the user changes the UI translation. */
+ void retranslateUi();
+
+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);
+
+public slots:
+ /** Clears the list of router items. */
+ void clearRouters();
+
+private slots:
+ /** Called when the user clicks on an item in the list. */
+ void onSelectionChanged();
+ /** Copies the nicknames for all currently selected relays to the clipboard.
+ * Nicknames are formatted as a comma-delimited list, suitable for doing
+ * dumb things with your torrc. */
+ void copySelectedNicknames();
+ /** Copies the fingerprints for all currently selected relays to the
+ * clipboard. Fingerprints are formatted as a comma-delimited list, suitable
+ * for doing dumb things with your torrc. */
+ void copySelectedFingerprints();
+ /** Emits a zoomToRouter() signal containing the fingerprint of the
+ * currently selected relay. */
+ void zoomToSelectedRelay();
+
+protected:
+ /** Called when the user presses a key while the list has focus. */
+ void keyPressEvent(QKeyEvent *event);
+ /** Displays a context menu for the user when they right-click on the
+ * widget. */
+ virtual void contextMenuEvent(QContextMenuEvent *event);
+
+private:
+ /** Maps a server ID to that server's list item. */
+ QHash<QString,RouterListItem*> _idmap;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/StreamItem.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/StreamItem.cpp
new file mode 100644
index 0000000..e19848d
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/StreamItem.cpp
@@ -0,0 +1,38 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 StreamItem.cpp
+** \version $Id: StreamItem.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Item representing a stream through Tor and its status
+*/
+
+#include "StreamItem.h"
+#include "CircuitListWidget.h"
+
+
+/** Constructor */
+StreamItem::StreamItem(const Stream &stream)
+{
+ /* Update the status and target */
+ update(stream);
+}
+
+/** Updates the status of this stream item. */
+void
+StreamItem::update(const Stream &stream)
+{
+ _stream = stream;
+ setText(CircuitListWidget::ConnectionColumn, stream.target());
+ setToolTip(CircuitListWidget::ConnectionColumn, stream.target());
+ setText(CircuitListWidget::StatusColumn, stream.statusString());
+ setToolTip(CircuitListWidget::StatusColumn, stream.statusString());
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/StreamItem.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/StreamItem.h
new file mode 100644
index 0000000..085faad
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/StreamItem.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.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 StreamItem.h
+** \version $Id: StreamItem.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Item representing a stream through Tor and its status
+*/
+
+#ifndef _STREAMITEM_H
+#define _STREAMITEM_H
+
+#include "Stream.h"
+
+#include <QTreeWidgetItem>
+
+
+class StreamItem : public QTreeWidgetItem
+{
+public:
+ /** Constructor */
+ StreamItem(const Stream &stream);
+
+ Stream stream() const { return _stream; }
+ /** Updates the status of this stream item. */
+ void update(const Stream &stream);
+ /** Returns the ID of the stream associated with this tree item. */
+ StreamId id() const { return _stream.id(); }
+
+private:
+ Stream _stream;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapImageView.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapImageView.cpp
new file mode 100644
index 0000000..67e1c92
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapImageView.cpp
@@ -0,0 +1,333 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 TorMapImageView.cpp
+** \version $Id: TorMapImageView.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays Tor servers and circuits on a map of the world
+*/
+
+#include "config.h"
+#include "TorMapImageView.h"
+
+#include <QStringList>
+
+#if defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION >= 730
+#include <math.h>
+#else
+#include <cmath>
+#endif
+
+#define IMG_WORLD_MAP ":/images/map/world-map.png"
+
+/** QPens to use for drawing different map elements */
+#define PEN_ROUTER QPen(QColor("#ff030d"), 1.0)
+#define PEN_CIRCUIT QPen(Qt::yellow, 0.5)
+#define PEN_SELECTED QPen(Qt::green, 2.0)
+
+/** Size of the map image */
+#define IMG_WIDTH 1000
+#define IMG_HEIGHT 507
+
+/** Border between the edge of the image and the actual map */
+#define MAP_TOP 2
+#define MAP_BOTTOM 2
+#define MAP_RIGHT 5
+#define MAP_LEFT 5
+#define MAP_WIDTH (IMG_WIDTH-MAP_LEFT-MAP_RIGHT)
+#define MAP_HEIGHT (IMG_HEIGHT-MAP_TOP-MAP_BOTTOM)
+
+/** Map offset from zero longitude */
+#define MAP_ORIGIN -10
+
+/** Minimum allowable size for this widget */
+#define MIN_SIZE QSize(512,256)
+
+/** Robinson projection table */
+/** Length of the parallel of latitude */
+static float plen[] = {
+ 1.0000, 0.9986, 0.9954, 0.9900,
+ 0.9822, 0.9730, 0.9600, 0.9427,
+ 0.9216, 0.8962, 0.8679, 0.8350,
+ 0.7986, 0.7597, 0.7186, 0.6732,
+ 0.6213, 0.5722, 0.5322
+ };
+
+/** Distance of corresponding parallel from equator */
+static float pdfe[] = {
+ 0.0000, 0.0620, 0.1240, 0.1860,
+ 0.2480, 0.3100, 0.3720, 0.4340,
+ 0.4958, 0.5571, 0.6176, 0.6769,
+ 0.7346, 0.7903, 0.8435, 0.8936,
+ 0.9394, 0.9761, 1.0000
+ };
+
+/** Default constructor */
+TorMapImageView::TorMapImageView(QWidget *parent)
+: ZImageView(parent)
+{
+ QImage map(IMG_WORLD_MAP);
+ setImage(map);
+}
+
+/** Destructor */
+TorMapImageView::~TorMapImageView()
+{
+ clear();
+}
+
+/** Adds a router to the map. */
+void
+TorMapImageView::addRouter(const RouterDescriptor &desc, const GeoIp &geoip)
+{
+ QString id = desc.id();
+ QPointF routerCoord = toMapSpace(geoip.latitude(), geoip.longitude());
+
+ /* Add data the hash of known routers, and plot the point on the map */
+ if (_routers.contains(id))
+ _routers.value(id)->first = routerCoord;
+ else
+ _routers.insert(id, new QPair<QPointF,bool>(routerCoord, false));
+}
+
+/** Adds a circuit to the map using the given ordered list of router IDs. */
+void
+TorMapImageView::addCircuit(const CircuitId &circid, const QStringList &path)
+{
+ QPainterPath *circPainterPath = new QPainterPath;
+
+ /* Build the new circuit */
+ for (int i = 0; i < path.size()-1; i++) {
+ QString fromNode = path.at(i);
+ QString toNode = path.at(i+1);
+
+ /* Add the coordinates of the hops to the circuit */
+ if (_routers.contains(fromNode) && _routers.contains(toNode)) {
+ /* Find the two endpoints for this path segment */
+ QPointF fromPos = _routers.value(fromNode)->first;
+ QPointF endPos = _routers.value(toNode)->first;
+
+ /* Draw the path segment */
+ circPainterPath->moveTo(fromPos);
+ circPainterPath->lineTo(endPos);
+ circPainterPath->moveTo(endPos);
+ }
+ }
+
+ /** Add the data to the hash of known circuits and plot the circuit on the map */
+ if (_circuits.contains(circid)) {
+ /* This circuit is being updated, so just update the path, making sure we
+ * free the memory allocated to the old one. */
+ QPair<QPainterPath*,bool> *circuitPair = _circuits.value(circid);
+ delete circuitPair->first;
+ circuitPair->first = circPainterPath;
+ } else {
+ /* This is a new path, so just add it to our list */
+ _circuits.insert(circid, new QPair<QPainterPath*,bool>(circPainterPath,false));
+ }
+}
+
+/** Removes a circuit from the map. */
+void
+TorMapImageView::removeCircuit(const CircuitId &circid)
+{
+ QPair<QPainterPath*,bool> *circ = _circuits.take(circid);
+ QPainterPath *circpath = circ->first;
+ if (circpath) {
+ delete circpath;
+ }
+ delete circ;
+}
+
+/** Selects and highlights the router on the map. */
+void
+TorMapImageView::selectRouter(const QString &id)
+{
+ if (_routers.contains(id)) {
+ QPair<QPointF, bool> *routerPair = _routers.value(id);
+ routerPair->second = true;
+ }
+ repaint();
+}
+
+/** Selects and highlights the circuit with the id <b>circid</b>
+ * on the map. */
+void
+TorMapImageView::selectCircuit(const CircuitId &circid)
+{
+ if (_circuits.contains(circid)) {
+ QPair<QPainterPath*, bool> *circuitPair = _circuits.value(circid);
+ circuitPair->second = true;
+ }
+ repaint();
+}
+
+/** Deselects any highlighted routers or circuits */
+void
+TorMapImageView::deselectAll()
+{
+ /* Deselect all router points */
+ foreach (QString router, _routers.keys()) {
+ QPair<QPointF,bool> *routerPair = _routers.value(router);
+ routerPair->second = false;
+ }
+ /* Deselect all circuit paths */
+ foreach (CircuitId circid, _circuits.keys()) {
+ QPair<QPainterPath*,bool> *circuitPair = _circuits.value(circid);
+ circuitPair->second = false;
+ }
+}
+
+/** Clears the list of routers and removes all the data on the map */
+void
+TorMapImageView::clear()
+{
+ /* Clear out all the router points and free their memory */
+ foreach (QString router, _routers.keys()) {
+ delete _routers.take(router);
+ }
+ /* Clear out all the circuit paths and free their memory */
+ foreach (CircuitId circid, _circuits.keys()) {
+ QPair<QPainterPath*,bool> *circuitPair = _circuits.take(circid);
+ delete circuitPair->first;
+ delete circuitPair;
+ }
+}
+
+/** Draws the routers and paths onto the map image. */
+void
+TorMapImageView::paintImage(QPainter *painter)
+{
+ painter->setRenderHint(QPainter::Antialiasing);
+
+ /* Draw the router points */
+ foreach(QString router, _routers.keys()) {
+ QPair<QPointF,bool> *routerPair = _routers.value(router);
+ painter->setPen((routerPair->second ? PEN_SELECTED : PEN_ROUTER));
+ painter->drawPoint(routerPair->first);
+ }
+ /* Draw the circuit paths */
+ foreach(CircuitId circid, _circuits.keys()) {
+ QPair<QPainterPath*,bool> *circuitPair = _circuits.value(circid);
+ painter->setPen((circuitPair->second ? PEN_SELECTED : PEN_CIRCUIT));
+ painter->drawPath(*(circuitPair->first));
+ }
+}
+
+/** Converts world space coordinates into map space coordinates */
+QPointF
+TorMapImageView::toMapSpace(float latitude, float longitude)
+{
+ float width = MAP_WIDTH;
+ float height = MAP_HEIGHT;
+ float deg = width / 360.0;
+ longitude += MAP_ORIGIN;
+
+ float lat;
+ float lon;
+
+ lat = floor(longitude * (deg * lerp(abs(int(latitude)), plen))
+ + width/2 + MAP_LEFT);
+
+ if (latitude < 0) {
+ lon = floor((height/2) + (lerp(abs(int(latitude)), pdfe) * (height/2))
+ + MAP_TOP);
+ } else {
+ lon = floor((height/2) - (lerp(abs(int(latitude)), pdfe) * (height/2))
+ + MAP_TOP);
+ }
+
+ return QPointF(lat, lon);
+}
+
+/** Linearly interpolates using the values in the Robinson projection table */
+float
+TorMapImageView::lerp(float input, float *table)
+{
+ int x = int(floor(input / 5));
+
+ return ((table[x+1] - table[x]) /
+ (((x+1)*5) - (x*5))) * (input - x*5) + table[x];
+}
+
+/** Returns the minimum size of the widget */
+QSize
+TorMapImageView::minimumSizeHint() const
+{
+ return MIN_SIZE;
+}
+
+/** Zooms to fit all currently displayed circuits on the map. If there are no
+ * circuits on the map, the viewport will be returned to its default position
+ * (zoomed all the way out and centered). */
+void
+TorMapImageView::zoomToFit()
+{
+ QRectF rect = circuitBoundingBox();
+
+ if (rect.isNull()) {
+ /* If there are no circuits, zoom all the way out */
+ resetZoomPoint();
+ zoom(0.0);
+ } else {
+ /* Zoom in on the displayed circuits */
+ float zoomLevel = 1.0 - qMax(rect.height()/float(MAP_HEIGHT),
+ rect.width()/float(MAP_WIDTH));
+
+ zoom(rect.center().toPoint(), zoomLevel+0.2);
+ }
+}
+
+/** Zoom to the circuit on the map with the given <b>circid</b>. */
+void
+TorMapImageView::zoomToCircuit(const CircuitId &circid)
+{
+ 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);
+ }
+ }
+}
+
+/** Zooms in on the router with the given <b>id</b>. */
+void
+TorMapImageView::zoomToRouter(const QString &id)
+{
+ QPair<QPointF,bool> *routerPair;
+
+ if (_routers.contains(id)) {
+ deselectAll();
+ routerPair = _routers.value(id);
+ routerPair->second = true; /* Set the router point to "selected" */
+ zoom(routerPair->first.toPoint(), 1.0);
+ }
+}
+
+/** Computes a bounding box around all currently displayed circuit paths on
+ * the map. */
+QRectF
+TorMapImageView::circuitBoundingBox()
+{
+ QRectF rect;
+
+ /* Compute the union of bounding rectangles for all circuit paths */
+ foreach (CircuitId circid, _circuits.keys()) {
+ QPair<QPainterPath*,bool> *pair = _circuits.value(circid);
+ QPainterPath *circuit = pair->first;
+ rect = rect.unite(circuit->boundingRect());
+ }
+ return rect;
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapImageView.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapImageView.h
new file mode 100644
index 0000000..2a830aa
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapImageView.h
@@ -0,0 +1,87 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 TorMapImageView.h
+** \version $Id: TorMapImageView.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays Tor servers and circuits on a map of the world
+*/
+
+#ifndef _TORMAPIMAGEVIEW_H
+#define _TORMAPIMAGEVIEW_H
+
+#include "ZImageView.h"
+#include "GeoIp.h"
+
+#include "RouterDescriptor.h"
+#include "Circuit.h"
+
+#include <QHash>
+#include <QPair>
+#include <QPainter>
+#include <QPainterPath>
+
+
+class TorMapImageView : public ZImageView
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. */
+ TorMapImageView(QWidget *parent = 0);
+ /** Destructor. */
+ ~TorMapImageView();
+
+ /** Plots the given router on the map using the given coordinates. */
+ void addRouter(const RouterDescriptor &desc, const GeoIp &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);
+ /** Returns the minimum size of the widget */
+ QSize minimumSizeHint() const;
+
+public slots:
+ /** Removes a circuit from the map. */
+ void removeCircuit(const CircuitId &circid);
+ /** Deselects all the highlighted circuits and routers */
+ void deselectAll();
+ /** Clears the known routers and removes all the data from the map */
+ void clear();
+ /** Zooms to fit all currently displayed circuits on the map. */
+ void zoomToFit();
+ /** Zoom to a particular router on the map. */
+ void zoomToRouter(const QString &id);
+ /** Zoom to the circuit on the map with the given <b>circid</b>. */
+ void zoomToCircuit(const CircuitId &circid);
+
+protected:
+ /** Paints the current circuits and streams on the image. */
+ virtual void paintImage(QPainter *painter);
+
+private:
+ /** Converts world space coordinates into map space coordinates */
+ QPointF toMapSpace(float latitude, float longitude);
+ /** Linearly interpolates using the values in the projection table */
+ float lerp(float input, float *table);
+ /** Computes a bounding box around all currently displayed circuit paths on
+ * the map. */
+ QRectF circuitBoundingBox();
+
+ /** Stores map locations for tor routers */
+ QHash<QString, QPair<QPointF,bool>* > _routers;
+ /** Stores circuit information */
+ QHash<CircuitId, QPair<QPainterPath *,bool>* > _circuits;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidget.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidget.cpp
new file mode 100644
index 0000000..e06e7ba
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidget.cpp
@@ -0,0 +1,286 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 TorMapWidget.cpp
+** \version $Id: TorMapWidget.cpp 4020 2009-08-09 19:10:45Z edmanm $
+** \brief Displays Tor servers and circuits on a map of the world
+*/
+
+#include "TorMapWidget.h"
+#include "TorMapWidgetInputHandler.h"
+#include "TorMapWidgetPopupMenu.h"
+#include "Vidalia.h"
+
+#include <MarbleModel.h>
+#include <HttpDownloadManager.h>
+
+#include <QStringList>
+
+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)
+
+
+/** Default constructor */
+TorMapWidget::TorMapWidget(QWidget *parent)
+ : MarbleWidget(parent)
+{
+ setMapThemeId("earth/srtm/srtm.dgml");
+ setShowScaleBar(false);
+ setShowCrosshairs(false);
+ setAnimationsEnabled(true);
+ setCursor(Qt::OpenHandCursor);
+
+ model()->downloadManager()->setDownloadEnabled(false);
+
+ TorMapWidgetInputHandler *handler = new TorMapWidgetInputHandler();
+ 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)));
+
+ /* 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);
+
+ setInputHandler(handler);
+}
+
+/** Destructor */
+TorMapWidget::~TorMapWidget()
+{
+ clear();
+}
+
+/** Adds a router to the map. */
+void
+TorMapWidget::addRouter(const RouterDescriptor &desc, const GeoIp &geoip)
+{
+ QString kml;
+ qreal lon = geoip.longitude();
+ qreal lat = geoip.latitude();
+ quint64 bw;
+
+ 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);
+ _routers.insert(id, GeoDataCoordinates(lon, lat, 0.0,
+ GeoDataCoordinates::Degree));
+}
+
+/** Adds a circuit to the map using the given ordered list of router IDs. */
+void
+TorMapWidget::addCircuit(const CircuitId &circid, const QStringList &path)
+{
+ /* XXX: Is it better to do KML LineString-based circuit drawing here,
+ * instead of going with a QPainter-based approach? I gave it a brief
+ * try once but failed. It might be worth looking into harder if we
+ * want to make circuits selectable on the map too.
+ */
+
+ /* It doesn't make sense to draw a path of length less than two */
+ if (path.size() < 2)
+ return;
+
+ if (_circuits.contains(circid)) {
+ /* Extend an existing path */
+ CircuitGeoPath *geoPath = _circuits.value(circid);
+
+ QString router = path.at(path.size()-1);
+ if (_routers.contains(router))
+ geoPath->first.append(_routers.value(router));
+ } else {
+ /* Construct a new path */
+ CircuitGeoPath *geoPath = new CircuitGeoPath();
+ geoPath->second = false; /* initially unselected */
+
+ foreach (QString router, path) {
+ if (_routers.contains(router))
+ geoPath->first.append(_routers.value(router));
+ }
+ geoPath->first.setTessellationFlags(Tessellate | RespectLatitudeCircle);
+ _circuits.insert(circid, geoPath);
+ }
+
+ repaint();
+}
+
+/** Removes a circuit from the map. */
+void
+TorMapWidget::removeCircuit(const CircuitId &circid)
+{
+ CircuitGeoPath *path = _circuits.take(circid);
+ if (path)
+ delete path;
+
+ 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
+TorMapWidget::selectCircuit(const CircuitId &circid)
+{
+ if (_circuits.contains(circid)) {
+ CircuitGeoPath *path = _circuits.value(circid);
+ path->second = true;
+ }
+
+ repaint();
+}
+
+/** Deselects any highlighted routers or circuits */
+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;
+ }
+
+ repaint();
+}
+
+/** Clears the list of routers and removes all the data on the map */
+void
+TorMapWidget::clear()
+{
+ foreach (QString id, _routers.keys()) {
+ removePlacemarkKey(id);
+ }
+
+ foreach (CircuitId circid, _circuits.keys()) {
+ CircuitGeoPath *path = _circuits.take(circid);
+ delete path;
+ }
+
+ repaint();
+}
+
+/** Zooms the map to fit entirely within the constraints of the current
+ * viewport size. */
+void
+TorMapWidget::zoomToFit()
+{
+ int width = size().width();
+ int height = size().height();
+
+ setRadius(qMin(width, height) / 2);
+
+ /* XXX: Calling setRadius() seems to cause Marble to no longer draw the
+ * atmosphere. So, re-enable it. */
+ setShowAtmosphere(true);
+}
+
+/** Zoom to the circuit on the map with the given <b>circid</b>. */
+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);
+ }
+ }
+#endif
+}
+
+/** Zooms in on the router with the given <b>id</b>. */
+void
+TorMapWidget::zoomToRouter(const QString &id)
+{
+ if (_routers.contains(id)) {
+ qreal lon, lat;
+ GeoDataCoordinates coords = _routers.value(id);
+ coords.geoCoordinates(lon, lat, GeoDataPoint::Degree);
+
+ zoomView(maximumZoom());
+ centerOn(lon, lat, true);
+ }
+}
+
+/** Paints the current circuits and streams on the image. */
+void
+TorMapWidget::customPaint(GeoPainter *painter)
+{
+ bool selected = false;
+
+ painter->autoMapQuality();
+ painter->setPen(CIRCUIT_NORMAL_PEN);
+
+ foreach (CircuitGeoPath *path, _circuits.values()) {
+ if (! path->second && selected) {
+ painter->setPen(CIRCUIT_NORMAL_PEN);
+ selected = false;
+ } else if (path->second && ! selected) {
+ painter->setPen(CIRCUIT_SELECTED_PEN);
+ selected = true;
+ }
+ painter->drawPolyline(path->first);
+ }
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidget.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidget.h
new file mode 100644
index 0000000..513b479
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidget.h
@@ -0,0 +1,89 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 TorMapWidget.h
+** \version $Id: TorMapWidget.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays Tor servers and circuits on a map of the world
+*/
+
+#ifndef _TORMAPWIDGET_H
+#define _TORMAPWIDGET_H
+
+#include "RouterDescriptor.h"
+#include "GeoIp.h"
+
+#include "Circuit.h"
+#include "Stream.h"
+
+#include <MarbleWidget.h>
+#include <GeoPainter.h>
+#include <GeoDataCoordinates.h>
+#include <GeoDataLineString.h>
+
+#include <QHash>
+#include <QPair>
+#include <QPainterPath>
+
+typedef QPair<Marble::GeoDataLineString, bool> CircuitGeoPath;
+
+
+class TorMapWidget : public Marble::MarbleWidget
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. */
+ TorMapWidget(QWidget *parent = 0);
+ /** Destructor. */
+ ~TorMapWidget();
+
+ /** Plots the given router on the map using the given coordinates. */
+ void addRouter(const RouterDescriptor &desc, const GeoIp &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);
+
+public slots:
+ /** Removes a circuit from the map. */
+ void removeCircuit(const CircuitId &circid);
+ /** Deselects all the highlighted circuits and routers */
+ void deselectAll();
+ /** Clears the known routers and removes all the data from the map */
+ void clear();
+ /** Zooms the map to fit entirely within the constraints of the current
+ * viewport size. */
+ void zoomToFit();
+ /** Zoom to a particular router on the map. */
+ void zoomToRouter(const QString &id);
+ /** Zoom to the circuit on the map with the given <b>circid</b>. */
+ void zoomToCircuit(const CircuitId &circid);
+
+signals:
+ /** Emitted when the user selects a router placemark on the map. <b>id</b>
+ * contain's the selected router's fingerprint. */
+ void displayRouterInfo(const QString &id);
+
+protected:
+ /** Paints the current circuits and streams on the image. */
+ virtual void customPaint(Marble::GeoPainter *painter);
+
+private:
+ /** Stores placemark IDs for Tor routers. */
+ QHash<QString, Marble::GeoDataCoordinates> _routers;
+ /** Stores circuit information */
+ QHash<CircuitId, CircuitGeoPath*> _circuits;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidgetInputHandler.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidgetInputHandler.cpp
new file mode 100644
index 0000000..3344d83
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidgetInputHandler.cpp
@@ -0,0 +1,138 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidgetInputHandler.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidgetInputHandler.h
new file mode 100644
index 0000000..8265944
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidgetInputHandler.h
@@ -0,0 +1,55 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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.
+*/
+
+#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/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidgetPopupMenu.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidgetPopupMenu.cpp
new file mode 100644
index 0000000..27a7f98
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidgetPopupMenu.cpp
@@ -0,0 +1,90 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 TorMapWidgetPopupMenu.cpp
+** \version $Id: TorMapWidgetPopupMenu.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Popup menu displayed when the user mouse clicks on a map placemark
+*/
+
+#include "TorMapWidgetPopupMenu.h"
+#include "Vidalia.h"
+
+#include <MarbleModel.h>
+#include <MarblePlacemarkModel.h>
+
+#include <QChar>
+#include <QVector>
+#include <QModelIndex>
+
+using namespace Marble;
+
+
+TorMapWidgetPopupMenu::TorMapWidgetPopupMenu(TorMapWidget *widget)
+ : QObject(widget),
+ _widget(widget)
+{
+ _leftClickMenu = new QMenu(widget);
+ connect(_leftClickMenu, SIGNAL(triggered(QAction*)),
+ this, SLOT(relaySelected(QAction*)));
+}
+
+void
+TorMapWidgetPopupMenu::featureClicked(const QPoint &pos, Qt::MouseButton btn)
+{
+ switch (btn) {
+ case Qt::LeftButton:
+ featureLeftClicked(pos);
+ break;
+
+ case Qt::RightButton:
+ break;
+
+ default:
+ break;
+ }
+}
+
+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') {
+ /* Normal Tor Relay */
+ name = (*it).data().toString();
+ id = (*it).data(MarblePlacemarkModel::DescriptionRole).toString();
+
+ QAction *action = _leftClickMenu->addAction(name);
+ action->setData(id);
+ numRelays++;
+ }
+ }
+
+ if (numRelays == 1)
+ emit displayRouterInfo(id);
+ else if (numRelays > 1)
+ _leftClickMenu->popup(_widget->mapToGlobal(pos));
+}
+
+void
+TorMapWidgetPopupMenu::relaySelected(QAction *action)
+{
+ QString id = action->data().toString();
+ if (! id.isEmpty())
+ emit displayRouterInfo(id);
+}
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidgetPopupMenu.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidgetPopupMenu.h
new file mode 100644
index 0000000..ef87459
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/TorMapWidgetPopupMenu.h
@@ -0,0 +1,81 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 TorMapWidgetPopupMenu.h
+** \version $Id: TorMapWidgetPopupMenu.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Popup menu displayed when the user mouse clicks on a map placemark
+*/
+
+#ifndef _TORMAPWIDGETPOPUPMENU_H
+#define _TORMAPWIDGETPOPUPMENU_H
+
+#include "TorMapWidget.h"
+
+#include <QObject>
+#include <QPoint>
+#include <QString>
+#include <QMenu>
+
+
+class TorMapWidgetPopupMenu : public QObject
+{
+ Q_OBJECT
+
+public:
+ /** Constructor. <b>widget</b> is the parent map widget on which the popup
+ * menu will be displayed.
+ */
+ 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.
+ *
+ * \sa featureLeftClicked
+ */
+ void featureClicked(const QPoint &pos, Qt::MouseButton button);
+
+signals:
+ /** Emitted when the user selects the router placemark whose fingerprint
+ * is <b>id</b>.
+ */
+ 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.
+ */
+ void relaySelected(QAction *action);
+
+private:
+ /** The parent map widget on which the popup menu is displayed.
+ */
+ TorMapWidget *_widget;
+
+ /** Menu displayed when the user left-clicks on one or more placemarks.
+ */
+ QMenu *_leftClickMenu;
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/ZImageView.cpp b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/ZImageView.cpp
new file mode 100644
index 0000000..1a47fa4
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/ZImageView.cpp
@@ -0,0 +1,374 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 ZImageView.cpp
+** \version $Id: ZImageView.cpp 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays an image and allows zooming and panning
+*/
+
+#include "ZImageView.h"
+
+#include <QPainter>
+#include <QMouseEvent>
+
+#include <cmath>
+
+#if QT_VERSION >= 0x040200
+#define CURSOR_NORMAL QCursor(Qt::OpenHandCursor)
+#define CURSOR_MOUSE_PRESS QCursor(Qt::ClosedHandCursor)
+#else
+#define CURSOR_NORMAL QCursor(Qt::CrossCursor)
+#define CURSOR_MOUSE_PRESS QCursor(Qt::SizeAllCursor)
+#endif
+
+
+/** Constructor. */
+ZImageView::ZImageView(QWidget *parent)
+ : QWidget(parent)
+{
+ /* Initialize members */
+ _zoom = 0.0;
+ _desiredX = 0.0;
+ _desiredY = 0.0;
+ _maxZoomFactor = 2.0;
+ _padding = 60;
+
+ setCursor(CURSOR_NORMAL);
+ updateViewport();
+ resetZoomPoint();
+ repaint();
+}
+
+/** Sets the displayed image. */
+void
+ZImageView::setImage(QImage& img)
+{
+ _image = img.copy();
+ updateViewport();
+ resetZoomPoint();
+
+ if (isVisible()) {
+ repaint();
+ }
+}
+
+/** Draws the scaled image on the widget. */
+void
+ZImageView::drawScaledImage()
+{
+ if (!isVisible()) {
+ return;
+ }
+
+ QBrush background(QColor("#fdfdfd"));
+ if (_image.isNull()) {
+ QPainter p(this);
+ p.fillRect(rect(), background);
+ return;
+ }
+
+ QRect sRect = rect();
+ QRect iRect = _image.rect();
+ QRect r = _view;
+
+ // Think of the _view as being overlaid on the image. The _view has the same
+ // aspect ratio as the screen, so we cut the _view region out of the _image
+ // and scale it to the screen dimensions and paint it.
+
+ // There is a slight catch in that the _view may be larger than the image in
+ // one or both directions. In that case, we need to reduce the _view region
+ // to lie within the image, then paint the background around it. Copying
+ // a region from an image where the region is bigger than the image results
+ // in the parts outside the image being black, which is not what we want.
+
+ // The view has the same aspect ratio as the screen, so the vertical and
+ // horizontal scale factors will be equal.
+
+ double scaleFactor = double(sRect.width()) / double(_view.width());
+
+ // Constrain r to lie entirely within the image.
+ if (r.top() < 0) {
+ r.setTop(0);
+ }
+ if (iRect.bottom() < r.bottom()) {
+ r.setBottom(iRect.bottom());
+ }
+ if (r.left() < 0) {
+ r.setLeft(0);
+ }
+ if (iRect.right() < r.right()) {
+ r.setRight(iRect.right());
+ }
+
+ // Figure out the size that the 'r' region will be when drawn to the screen.
+ QSize scaleTo(int(double(r.width()) * scaleFactor),
+ int(double(r.height()) * scaleFactor));
+
+ /** Make a copy of the image so we don't ruin the original */
+ QImage i = _image.copy();
+
+ /** Create a QPainter that draws directly on the copied image and call the
+ * virtual function to draw whatever the subclasses need to on the image. */
+ QPainter painter;
+ painter.begin(&i);
+ paintImage(&painter);
+ painter.end();
+
+ /** Rescale the image copy */
+ i = i.copy(r).scaled(scaleTo,
+ Qt::KeepAspectRatioByExpanding,
+ Qt::SmoothTransformation);
+
+ int extraWidth = int(double(sRect.width() - i.width()) / 2.0);
+ int extraHeight = int(double(sRect.height() - i.height()) / 2.0);
+
+ // We don't want to paint the background
+ // because this isn't double buffered and that would flicker.
+ // We could double buffer it, but that would cost ~3 MB of memory.
+
+ QPainter p(this);
+ if (extraWidth > 0) {
+ p.fillRect(0, 0, extraWidth, sRect.height(), background);
+ p.fillRect(sRect.width() - extraWidth, 0,
+ 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);
+ }
+
+ // Finally, paint the image copy.
+ p.drawImage(extraWidth, extraHeight, i);
+}
+
+/** Updates the displayed viewport. */
+void
+ZImageView::updateViewport(int screendx, int screendy)
+{
+ /* The gist of this is to find the biggest and smallest possible viewports,
+ * then use the _zoom factor to interpolate between them. Also pan the
+ * viewport, but constrain each dimension to lie within the image or to be
+ * centered if the image is too small in that direction. */
+
+ QRect sRect = rect();
+ QRect iRect = _image.rect();
+
+ float sw = float(sRect.width());
+ float sh = float(sRect.height());
+ float iw = float(iRect.width());
+ float ih = float(iRect.height());
+
+ // Get the initial max and min sizes for the viewport. These won't have the
+ // correct aspect ratio. They will actually be the least upper bound and
+ // greatest lower bound of the set containing the screen and image rects.
+ float maxw = float(std::max<int>(sRect.width(), iRect.width())) + _padding;
+ float maxh = float(std::max<int>(sRect.height(), iRect.height())) + _padding;
+ float minw = std::ceil(float(sRect.width()) / _maxZoomFactor);
+ float minh = std::ceil(float(sRect.height()) / _maxZoomFactor);
+
+ // Now that we have the glb and the lub, we expand/shrink them until
+ // the aspect ratio is that of the screen.
+ float aspect = sw / sh;
+
+ // Fix the max rect.
+ float newmaxh = maxh;
+ float newmaxw = aspect * newmaxh;
+ if (newmaxw < maxw) {
+ newmaxw = maxw;
+ newmaxh = maxw / aspect;
+ }
+
+ // Fix the min rect.
+ float newminh = minh;
+ float newminw = aspect * newminh;
+ if (minw < newminw) {
+ newminw = minw;
+ newminh = newminw / aspect;
+ }
+
+ // Now interpolate between max and min.
+ float vw = (1.0f - _zoom) * (newmaxw - newminw) + newminw;
+ float vh = (1.0f - _zoom) * (newmaxh - newminh) + newminh;
+
+ _view.setWidth(int(vw));
+ _view.setHeight(int(vh));
+
+ // Now pan the view
+
+ // Convert the pan delta from screen coordinates to view coordinates.
+ float vdx = vw * (float(screendx) / sw);
+ float vdy = vh * (float(screendy) / sh);
+
+ // Constrain the center of the viewport to the image rect.
+ _desiredX = qBound(0.0f, _desiredX + vdx, iw);
+ _desiredY = qBound(0.0f, _desiredY + vdy, ih);
+ _view.moveCenter(QPoint(int(_desiredX), int(_desiredY)));
+
+ QPoint viewCenter = _view.center();
+ float vx = viewCenter.x();
+ float vy = viewCenter.y();
+
+ // The viewport may be wider than the height and/or width. In that case,
+ // center the view over the image in the appropriate directions.
+ //
+ // If the viewport is smaller than the image in either direction, then make
+ // sure the edge of the viewport isn't past the edge of the image.
+
+ vdx = 0;
+ vdy = 0;
+
+ if (iw <= vw) {
+ vdx = (iw / 2.0f) - vx; // Center horizontally.
+ } else {
+ // Check that the edge of the view isn't past the edge of the image.
+ float vl = float(_view.left());
+ float vr = float(_view.right());
+ if (vl < 0) {
+ vdx = -vl;
+ } else if (vr > iw) {
+ vdx = iw - vr;
+ }
+ }
+
+ if (ih <= vh) {
+ vdy = (ih / 2.0f) - vy; // Center vertically.
+ } else {
+ // Check that the edge of the view isn't past the edge of the image.
+ float vt = float(_view.top());
+ float vb = float(_view.bottom());
+ if (vt < 0) {
+ vdy = -vt;
+ } else if (vb > ih) {
+ vdy = ih - vb;
+ }
+ }
+
+ _view.translate(int(vdx), int(vdy));
+}
+
+/** Resets the zoom point back to the center of the viewport. */
+void
+ZImageView::resetZoomPoint()
+{
+ QPoint viewCenter = _view.center();
+ _desiredX = viewCenter.x();
+ _desiredY = viewCenter.y();
+}
+
+/** Handles repainting this widget by updating the viewport and drawing the
+ * scaled image. */
+void
+ZImageView::paintEvent(QPaintEvent*)
+{
+ updateViewport();
+ drawScaledImage();
+}
+
+/** Sets the current zoom percentage to the given value and scrolls the
+ * viewport to center the given point. */
+void
+ZImageView::zoom(QPoint zoomAt, float pct)
+{
+ _desiredX = zoomAt.x();
+ _desiredY = zoomAt.y();
+ zoom(pct);
+}
+
+/** Sets the current zoom percentage to the given value. */
+void
+ZImageView::zoom(float pct)
+{
+ _zoom = qBound(0.0f, pct, 1.0f);
+ repaint();
+}
+
+/** Zooms into the image by 10% */
+void
+ZImageView::zoomIn()
+{
+ zoom(_zoom + .1);
+}
+
+/** Zooms away from the image by 10% */
+void
+ZImageView::zoomOut()
+{
+ zoom(_zoom - .1);
+}
+
+/** Responds to the user pressing a mouse button. */
+void
+ZImageView::mousePressEvent(QMouseEvent *e)
+{
+ e->accept();
+ setCursor(CURSOR_MOUSE_PRESS);
+ _mouseX = e->x();
+ _mouseY = e->y();
+}
+
+/** Responds to the user releasing a mouse button. */
+void
+ZImageView::mouseReleaseEvent(QMouseEvent *e)
+{
+ e->accept();
+ setCursor(CURSOR_NORMAL);
+ updateViewport();
+ resetZoomPoint();
+}
+
+/** Responds to the user double-clicking a mouse button on the image. A left
+ * double-click zooms in on the image and a right double-click zooms out.
+ * Zooming is centered on the location of the double-click. */
+void
+ZImageView::mouseDoubleClickEvent(QMouseEvent *e)
+{
+ e->accept();
+
+ QPoint center = rect().center();
+ int dx = e->x() - center.x();
+ int dy = e->y() - center.y();
+ updateViewport(dx, dy);
+ resetZoomPoint();
+
+ Qt::MouseButton btn = e->button();
+ if (btn == Qt::LeftButton)
+ zoomIn();
+ else if (btn == Qt::RightButton)
+ zoomOut();
+}
+
+/** Responds to the user moving the mouse. */
+void
+ZImageView::mouseMoveEvent(QMouseEvent *e)
+{
+ e->accept();
+ int dx = _mouseX - e->x();
+ int dy = _mouseY - e->y();
+ _mouseX = e->x();
+ _mouseY = e->y();
+
+ updateViewport(dx, dy);
+ if (0.001 <= _zoom) {
+ repaint();
+ }
+}
+
+void
+ZImageView::wheelEvent(QWheelEvent *e)
+{
+ if (e->delta() > 0) {
+ zoomIn();
+ } else {
+ zoomOut();
+ }
+}
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/ZImageView.h b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/ZImageView.h
new file mode 100644
index 0000000..79e44c9
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/network/ZImageView.h
@@ -0,0 +1,88 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not 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 ZImageView.h
+** \version $Id: ZImageView.h 3735 2009-04-28 20:28:01Z edmanm $
+** \brief Displays an image and allows zooming and panning
+*/
+
+#ifndef ZIMAGEVIEW_H
+#define ZIMAGEVIEW_H
+
+#include <QImage>
+#include <QPixmap>
+#include <QWidget>
+
+
+class ZImageView : public QWidget
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor. */
+ ZImageView(QWidget *parent = 0);
+ /** Sets the displayed image. */
+ void setImage(QImage& pixmap);
+
+public slots:
+ /** Resets the center zoom point back to the center of the viewport. */
+ void resetZoomPoint();
+ /** Sets the current zoom level to the given percent. */
+ void zoom(float pct);
+ /** Sets the current zoom level to the given percent and scrolls the window
+ * to place the specified point in the middle. */
+ void zoom(QPoint zoomAt, float pct);
+ /** Zooms into the displayed image by 5% */
+ void zoomIn();
+ /** Zooms away from the displayed image by 5% */
+ void zoomOut();
+
+protected:
+ /** Virtual method to let subclasses paint on the image before it's scaled. */
+ virtual void paintImage(QPainter *painter) { Q_UNUSED(painter); }
+ /** Updates the viewport and repaints the displayed image. */
+ virtual void paintEvent(QPaintEvent*);
+ /** Handles the user pressing a mouse button. */
+ virtual void mousePressEvent(QMouseEvent* e);
+ /** Handles the user releasing a mouse button. */
+ virtual void mouseReleaseEvent(QMouseEvent* e);
+ /** Handles the user moving the mouse. */
+ virtual void mouseMoveEvent(QMouseEvent* e);
+ /** Handles the user double-clicking a mouse button. */
+ virtual void mouseDoubleClickEvent(QMouseEvent *e);
+ /** Handles the wheel events. */
+ virtual void wheelEvent(QWheelEvent *e);
+
+ /** Update the viewport. This will set _view to a region that,
+ * when copied from the image and scaled to the screen size, will
+ * show what is expected. The _view may be larger in one or more
+ * directions than the image, and you must deal with the
+ * non-overlapping regions. */
+ void updateViewport(int screendx=0, int screendy=0);
+ /** Redraws the scaled image in the viewport. */
+ void drawScaledImage();
+
+private:
+ float _zoom; /**< The current zoom level. */
+ QImage _image; /**< The displayed image. */
+ float _padding; /**< Amount of padding to use on the side of the image. */
+ float _maxZoomFactor; /**< Maximum amount to zoom into the image. */
+
+ int _mouseX; /**< The x-coordinate of the current mouse position. */
+ int _mouseY; /**< The y-coordinate of the current mouse position. */
+
+ QRect _view; /**< The displayed viewport. */
+ float _desiredX; /**< The X value we desire (???). */
+ float _desiredY; /**< The Y value we desire (???). */
+};
+
+#endif
+
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/128x128/tor-logo.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/128x128/tor-logo.png
new file mode 100644
index 0000000..5d52e84
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/128x128/tor-logo.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/128x128/tor-off.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/128x128/tor-off.png
new file mode 100644
index 0000000..93bc052
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/128x128/tor-off.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/128x128/tor-on.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/128x128/tor-on.png
new file mode 100644
index 0000000..cb5018d
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/128x128/tor-on.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/128x128/tor-starting.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/128x128/tor-starting.png
new file mode 100644
index 0000000..f9a97fd
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/128x128/tor-starting.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/128x128/tor-stopping.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/128x128/tor-stopping.png
new file mode 100644
index 0000000..f7a68c2
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/128x128/tor-stopping.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/application-exit.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/application-exit.png
new file mode 100644
index 0000000..4839c61
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/application-exit.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/applications-internet.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/applications-internet.png
new file mode 100644
index 0000000..071fc18
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/applications-internet.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/applications-system.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/applications-system.png
new file mode 100644
index 0000000..a39e89e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/applications-system.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/dialog-information.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/dialog-information.png
new file mode 100644
index 0000000..cbabb0e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/dialog-information.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/dialog-warning.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/dialog-warning.png
new file mode 100644
index 0000000..43ca31a
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/dialog-warning.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/emblem-important.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/emblem-important.png
new file mode 100644
index 0000000..663ad2b
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/emblem-important.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/format-justify-fill.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/format-justify-fill.png
new file mode 100644
index 0000000..2f7185f
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/format-justify-fill.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/graph-area.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/graph-area.png
new file mode 100644
index 0000000..2ab2deb
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/graph-area.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/graph-line.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/graph-line.png
new file mode 100644
index 0000000..43eedd4
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/graph-line.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/help-about.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/help-about.png
new file mode 100644
index 0000000..e1eb797
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/help-about.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/media-playback-start.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/media-playback-start.png
new file mode 100644
index 0000000..80ff3a1
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/media-playback-start.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/media-playback-stop.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/media-playback-stop.png
new file mode 100644
index 0000000..180280e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/media-playback-stop.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/preferences-desktop-notification.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/preferences-desktop-notification.png
new file mode 100644
index 0000000..2ee67d4
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/preferences-desktop-notification.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/preferences-system.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/preferences-system.png
new file mode 100644
index 0000000..f2c7c08
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/preferences-system.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/system-help.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/system-help.png
new file mode 100644
index 0000000..f33ea51
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/system-help.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/system-run.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/system-run.png
new file mode 100644
index 0000000..3e74fb9
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/system-run.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/tor-logo.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/tor-logo.png
new file mode 100644
index 0000000..bf4ceab
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/tor-logo.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/tor-off.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/tor-off.png
new file mode 100644
index 0000000..3b5158d
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/tor-off.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/tor-on.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/tor-on.png
new file mode 100644
index 0000000..975365f
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/tor-on.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/tor-starting.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/tor-starting.png
new file mode 100644
index 0000000..7ce13d6
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/tor-starting.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/tor-stopping.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/tor-stopping.png
new file mode 100644
index 0000000..102699e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/tor-stopping.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/utilities-log-viewer.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/utilities-log-viewer.png
new file mode 100644
index 0000000..5eac167
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/utilities-log-viewer.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/utilities-system-monitor.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/utilities-system-monitor.png
new file mode 100644
index 0000000..c7b626c
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/utilities-system-monitor.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/view-media-artist.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/view-media-artist.png
new file mode 100644
index 0000000..c974107
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/16x16/view-media-artist.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/application-exit.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/application-exit.png
new file mode 100644
index 0000000..ed5f8b2
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/application-exit.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/dialog-password.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/dialog-password.png
new file mode 100644
index 0000000..d664831
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/dialog-password.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/edit-copy.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/edit-copy.png
new file mode 100644
index 0000000..03ec427
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/edit-copy.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/edit-delete.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/edit-delete.png
new file mode 100644
index 0000000..b0de61d
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/edit-delete.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/folder.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/folder.png
new file mode 100644
index 0000000..aeaafee
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/folder.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/format-justify-fill.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/format-justify-fill.png
new file mode 100644
index 0000000..e69a9f2
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/format-justify-fill.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/go-down-search.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/go-down-search.png
new file mode 100644
index 0000000..e338a12
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/go-down-search.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/go-up-search.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/go-up-search.png
new file mode 100644
index 0000000..892ab92
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/go-up-search.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/help-about.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/help-about.png
new file mode 100644
index 0000000..7f2b7bf
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/help-about.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/list-add.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/list-add.png
new file mode 100644
index 0000000..e029787
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/list-add.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/list-remove.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/list-remove.png
new file mode 100644
index 0000000..2bb1a59
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/list-remove.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/page-zoom.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/page-zoom.png
new file mode 100644
index 0000000..42abe72
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/page-zoom.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/preferences-system.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/preferences-system.png
new file mode 100644
index 0000000..4207a3e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/preferences-system.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/system-help.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/system-help.png
new file mode 100644
index 0000000..86b6407
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/system-help.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/tor-logo.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/tor-logo.png
new file mode 100644
index 0000000..f143bb4
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/tor-logo.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/tor-off.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/tor-off.png
new file mode 100644
index 0000000..a8337d0
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/tor-off.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/tor-on.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/tor-on.png
new file mode 100644
index 0000000..849c9dd
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/tor-on.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/tor-starting.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/tor-starting.png
new file mode 100644
index 0000000..78209db
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/tor-starting.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/tor-stopping.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/tor-stopping.png
new file mode 100644
index 0000000..f3e454e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/tor-stopping.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/utilities-system-monitor.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/utilities-system-monitor.png
new file mode 100644
index 0000000..0ab30a2
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/22x22/utilities-system-monitor.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/applications-internet.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/applications-internet.png
new file mode 100644
index 0000000..a9a9d2e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/applications-internet.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/applications-system.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/applications-system.png
new file mode 100644
index 0000000..4d9a9dc
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/applications-system.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/dialog-ok-apply.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/dialog-ok-apply.png
new file mode 100644
index 0000000..0f3153c
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/dialog-ok-apply.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/dialog-warning.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/dialog-warning.png
new file mode 100644
index 0000000..8e91337
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/dialog-warning.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/document-save-all.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/document-save-all.png
new file mode 100644
index 0000000..45e7af3
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/document-save-all.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/document-save.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/document-save.png
new file mode 100644
index 0000000..7fa489c
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/document-save.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/edit-clear.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/edit-clear.png
new file mode 100644
index 0000000..54518db
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/edit-clear.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/edit-copy.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/edit-copy.png
new file mode 100644
index 0000000..d4180c6
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/edit-copy.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/edit-delete.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/edit-delete.png
new file mode 100644
index 0000000..351659b
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/edit-delete.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/edit-find.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/edit-find.png
new file mode 100644
index 0000000..be93f38
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/edit-find.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/edit-select-all.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/edit-select-all.png
new file mode 100644
index 0000000..3affba4
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/edit-select-all.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/format-justify-fill.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/format-justify-fill.png
new file mode 100644
index 0000000..9ec3420
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/format-justify-fill.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/go-home.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/go-home.png
new file mode 100644
index 0000000..b16c19f
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/go-home.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/go-next.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/go-next.png
new file mode 100644
index 0000000..c4da8a9
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/go-next.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/go-previous.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/go-previous.png
new file mode 100644
index 0000000..68ed8a1
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/go-previous.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/help-about.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/help-about.png
new file mode 100644
index 0000000..2658cca
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/help-about.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/network-workgroup.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/network-workgroup.png
new file mode 100644
index 0000000..860ffb9
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/network-workgroup.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/preferences-desktop-locale.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/preferences-desktop-locale.png
new file mode 100644
index 0000000..cd145b8
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/preferences-desktop-locale.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/preferences-other.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/preferences-other.png
new file mode 100644
index 0000000..a35eb8f
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/preferences-other.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/preferences-system-network-sharing.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/preferences-system-network-sharing.png
new file mode 100644
index 0000000..b9f1f36
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/preferences-system-network-sharing.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/preferences-system-network.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/preferences-system-network.png
new file mode 100644
index 0000000..0e16fd7
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/preferences-system-network.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/preferences-system.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/preferences-system.png
new file mode 100644
index 0000000..2afbd23
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/preferences-system.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/script-error.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/script-error.png
new file mode 100644
index 0000000..c7ace70
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/script-error.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/security-low.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/security-low.png
new file mode 100644
index 0000000..9ea4953
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/security-low.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/security-medium.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/security-medium.png
new file mode 100644
index 0000000..0a15978
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/security-medium.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/services.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/services.png
new file mode 100644
index 0000000..ba31341
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/services.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/system-help.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/system-help.png
new file mode 100644
index 0000000..8a9eb1a
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/system-help.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/system-software-update.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/system-software-update.png
new file mode 100644
index 0000000..00bb448
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/system-software-update.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/tor-logo.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/tor-logo.png
new file mode 100644
index 0000000..bf7e105
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/tor-logo.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/tor-off.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/tor-off.png
new file mode 100644
index 0000000..a12a228
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/tor-off.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/tor-on.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/tor-on.png
new file mode 100644
index 0000000..01e0b64
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/tor-on.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/tor-starting.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/tor-starting.png
new file mode 100644
index 0000000..db6ef2c
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/tor-starting.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/tor-stopping.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/tor-stopping.png
new file mode 100644
index 0000000..e1d1f19
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/tor-stopping.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/utilities-log-viewer.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/utilities-log-viewer.png
new file mode 100644
index 0000000..52f5dda
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/utilities-log-viewer.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/utilities-system-monitor.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/utilities-system-monitor.png
new file mode 100644
index 0000000..fbf4baf
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/utilities-system-monitor.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/view-fullscreen.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/view-fullscreen.png
new file mode 100644
index 0000000..2a54bda
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/view-fullscreen.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/view-refresh.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/view-refresh.png
new file mode 100644
index 0000000..afa2a9d
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/view-refresh.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/window-close.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/window-close.png
new file mode 100644
index 0000000..b049b68
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/window-close.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/zoom-fit-best.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/zoom-fit-best.png
new file mode 100644
index 0000000..c3b8b70
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/zoom-fit-best.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/zoom-in.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/zoom-in.png
new file mode 100644
index 0000000..63b3bd0
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/zoom-in.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/zoom-out.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/zoom-out.png
new file mode 100644
index 0000000..b56a0bb
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/32x32/zoom-out.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/applications-internet.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/applications-internet.png
new file mode 100644
index 0000000..ffdce8b
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/applications-internet.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/chronometer.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/chronometer.png
new file mode 100644
index 0000000..5d68ffe
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/chronometer.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/dialog-password.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/dialog-password.png
new file mode 100644
index 0000000..494980e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/dialog-password.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/media-playback-start.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/media-playback-start.png
new file mode 100644
index 0000000..dbeee2b
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/media-playback-start.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/media-playback-stop.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/media-playback-stop.png
new file mode 100644
index 0000000..1e415cd
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/media-playback-stop.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/modem.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/modem.png
new file mode 100644
index 0000000..bf8f6c3
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/modem.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/network-connect.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/network-connect.png
new file mode 100644
index 0000000..c81a854
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/network-connect.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/network-wired.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/network-wired.png
new file mode 100644
index 0000000..07333a1
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/network-wired.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/network-workgroup.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/network-workgroup.png
new file mode 100644
index 0000000..1467427
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/network-workgroup.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/preferences-system-network-sharing.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/preferences-system-network-sharing.png
new file mode 100644
index 0000000..bd2f57e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/preferences-system-network-sharing.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/system-software-update.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/system-software-update.png
new file mode 100644
index 0000000..a9448cd
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/system-software-update.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/tor-logo.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/tor-logo.png
new file mode 100644
index 0000000..0d89136
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/tor-logo.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/tor-off.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/tor-off.png
new file mode 100644
index 0000000..bf7db9a
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/tor-off.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/tor-on.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/tor-on.png
new file mode 100644
index 0000000..e2d6439
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/tor-on.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/tor-starting.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/tor-starting.png
new file mode 100644
index 0000000..89c219e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/tor-starting.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/tor-stopping.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/tor-stopping.png
new file mode 100644
index 0000000..77960f3
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/tor-stopping.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/view-media-artist.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/view-media-artist.png
new file mode 100644
index 0000000..e8e3ac5
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/48x48/view-media-artist.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/64x64/tor-logo.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/64x64/tor-logo.png
new file mode 100644
index 0000000..b739e30
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/64x64/tor-logo.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/EquifaxSecureCA.crt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/EquifaxSecureCA.crt
new file mode 100644
index 0000000..ed0bd76
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/EquifaxSecureCA.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
+UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
+dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
+MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
+dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
+BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
+cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
+AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
+aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
+ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
+IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
+MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
+A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
+7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
+1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
+-----END CERTIFICATE-----
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/cacert_root.crt b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/cacert_root.crt
new file mode 100644
index 0000000..e7dfc82
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/cacert_root.crt
@@ -0,0 +1,41 @@
+-----BEGIN CERTIFICATE-----
+MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
+IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB
+IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA
+Y2FjZXJ0Lm9yZzAeFw0wMzAzMzAxMjI5NDlaFw0zMzAzMjkxMjI5NDlaMHkxEDAO
+BgNVBAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEi
+MCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJ
+ARYSc3VwcG9ydEBjYWNlcnQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
+CgKCAgEAziLA4kZ97DYoB1CW8qAzQIxL8TtmPzHlawI229Z89vGIj053NgVBlfkJ
+8BLPRoZzYLdufujAWGSuzbCtRRcMY/pnCujW0r8+55jE8Ez64AO7NV1sId6eINm6
+zWYyN3L69wj1x81YyY7nDl7qPv4coRQKFWyGhFtkZip6qUtTefWIonvuLwphK42y
+fk1WpRPs6tqSnqxEQR5YYGUFZvjARL3LlPdCfgv3ZWiYUQXw8wWRBB0bF4LsyFe7
+w2t6iPGwcswlWyCR7BYCEo8y6RcYSNDHBS4CMEK4JZwFaz+qOqfrU0j36NK2B5jc
+G8Y0f3/JHIJ6BVgrCFvzOKKrF11myZjXnhCLotLddJr3cQxyYN/Nb5gznZY0dj4k
+epKwDpUeb+agRThHqtdB7Uq3EvbXG4OKDy7YCbZZ16oE/9KTfWgu3YtLq1i6L43q
+laegw1SJpfvbi1EinbLDvhG+LJGGi5Z4rSDTii8aP8bQUWWHIbEZAWV/RRyH9XzQ
+QUxPKZgh/TMfdQwEUfoZd9vUFBzugcMd9Zi3aQaRIt0AUMyBMawSB3s42mhb5ivU
+fslfrejrckzzAeVLIL+aplfKkQABi6F1ITe1Yw1nPkZPcCBnzsXWWdsC4PDSy826
+YreQQejdIOQpvGQpQsgi3Hia/0PsmBsJUUtaWsJx8cTLc6nloQsCAwEAAaOCAc4w
+ggHKMB0GA1UdDgQWBBQWtTIb1Mfz4OaO873SsDrusjkY0TCBowYDVR0jBIGbMIGY
+gBQWtTIb1Mfz4OaO873SsDrusjkY0aF9pHsweTEQMA4GA1UEChMHUm9vdCBDQTEe
+MBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0
+IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2Vy
+dC5vcmeCAQAwDwYDVR0TAQH/BAUwAwEB/zAyBgNVHR8EKzApMCegJaAjhiFodHRw
+czovL3d3dy5jYWNlcnQub3JnL3Jldm9rZS5jcmwwMAYJYIZIAYb4QgEEBCMWIWh0
+dHBzOi8vd3d3LmNhY2VydC5vcmcvcmV2b2tlLmNybDA0BglghkgBhvhCAQgEJxYl
+aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMDBWBglghkgBhvhC
+AQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQg
+b3ZlciB0byBodHRwOi8vd3d3LmNhY2VydC5vcmcwDQYJKoZIhvcNAQEEBQADggIB
+ACjH7pyCArpcgBLKNQodgW+JapnM8mgPf6fhjViVPr3yBsOQWqy1YPaZQwGjiHCc
+nWKdpIevZ1gNMDY75q1I08t0AoZxPuIrA2jxNGJARjtT6ij0rPtmlVOKTV39O9lg
+18p5aTuxZZKmxoGCXJzN600BiqXfEVWqFcofN8CCmHBh22p8lqOOLlQ+TyGpkO/c
+gr/c6EWtTZBzCDyUZbAEmXZ/4rzCahWqlwQ3JNgelE5tDlG+1sSPypZt90Pf6DBl
+Jzt7u0NDY8RD97LsaMzhGY4i+5jhe1o+ATc7iwiwovOVThrLm82asduycPAtStvY
+sONvRUgzEv/+PDIqVPfE94rwiCPCR/5kenHA0R6mY7AHfqQv0wGP3J8rtsYIqQ+T
+SCX8Ev2fQtzzxD72V7DX3WnRBnc0CkvSyqD/HMaMyRa+xMwyN2hzXwj7UfdJUzYF
+CpUCTPJ5GhD22Dp1nPMd8aINcGeGG7MW9S/lpOt5hvk9C8JzC6WZrG/8Z7jlLwum
+GCSNe9FINSkYQKyTYOGWhlC0elnYjyELn8+CkcY7v2vcB5G5l1YjqrZslMZIBjzk
+zk6q5PYvCdxTby78dOs6Y5nCpqyJvKeyRKANihDjbPIky/qbn3BHLt4Ui9SyIAmW
+omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD
+-----END CERTIFICATE-----
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/credits.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/credits.html
new file mode 100644
index 0000000..c73c1cc
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/credits.html
@@ -0,0 +1,71 @@
+<html>
+<body>
+<h3>Lead Developers</h3>
+<ul>
+ <li>Matt Edman</li>
+ <li>Justin Hipple (<i>retired</i>)</li>
+</ul>
+
+<h3>Contributors</h3>
+<ul>
+ <li>Domenik Bork</li>
+ <li>Ren Bucholz</li>
+ <li>Dan Christensen</li>
+ <li>DJHasis</li>
+ <li>dr|z3d</li>
+ <li>Geoff Goodell</li>
+ <li>Corinna Habets</li>
+ <li>Matt Hanson</li>
+ <li>Andrew Lewman</li>
+ <li>Steven J. Murdoch</li>
+ <li>Brandon Nase</li>
+ <li>Oliver Niesner</li>
+ <li>Christoph Sieghart</li>
+ <li>Adam Tomjack</li>
+ <li>Michael Zuercher</li>
+</ul>
+
+<h3>Translators</h3>
+<table>
+ <tr><td>Amin Amini</td><td>Swedish</td></tr>
+ <tr><td>Anonymous</td><td>Hebrew</td></tr>
+ <tr><td>Ater Atrocitas</td><td>Albanian</td></tr>
+ <tr><td>Daniel Berthereau</td><td>French</td></tr>
+ <tr><td>Domenik Bork</td><td>German</td></tr>
+ <tr><td>Michel Burkhardt</td><td>French</td></tr>
+ <tr><td>Steffen Dabbert</td><td>German</td></tr>
+ <tr><td>Benessa Defend</td><td>Japanese</td></tr>
+ <tr><td>Dererk</td><td>Spanish</td></tr>
+ <tr><td>Desolator</td><td>Spanish</td></tr>
+ <tr><td>DJHasis</td><td>Finnish, Swedish</td></tr>
+ <tr><td>eight118</td><td>French</td></tr>
+ <tr><td>Tibor Fekete</td><td>Hungarian</td></tr>
+ <tr><td>Ahmad Gharbeia</td><td>Arabic</td></tr>
+ <tr><td>Mabat Haram</td><td>Portuguese</td></tr>
+ <tr><td>Hossein</td><td>Farsi</td></tr>
+ <tr><td>Omer Ishakoglu</td><td>Turkish</td></tr>
+ <tr><td>Yunus Kaba</td><td>Turkish</td></tr>
+ <tr><td>kutia0001</td><td>Bulgarian</td></tr>
+ <tr><td>LinHongJun</td><td>Simplified Chinese, Traditional Chinese</td></tr>
+ <tr><td>Karsten Loesing</td><td>German</td></tr>
+ <tr><td>el Mar</td><td>Czech</td></tr>
+ <tr><td>Alex Mazzariol</td><td>Italian</td></tr>
+ <tr><td>Micromus</td><td>Norwegian</td></tr>
+ <tr><td>Nardog</td><td>Japanese</td></tr>
+ <tr><td>Frederik Nosi</td><td>Albanian</td></tr>
+ <tr><td>persepolis</td><td>Farsi</td></tr>
+ <tr><td>Christoph Sieghart</td><td>German</td></tr>
+ <tr><td>Wu Xiaoguang</td><td>Simplified Chinese</td></tr>
+ <tr><td>Xiando</td><td>Norwegian</td></tr>
+ <tr><td>Ygrek</td><td>Russian</td></tr>
+ <tr><td>ZeeWolf</td><td>Polish</td></tr>
+</table>
+
+<p>
+Visit<a href="https://translation.torproject.org/">
+https://translation.torproject.org</a> if you would like to contribute to
+Vidalia's translations.
+</p>
+
+</body>
+</html>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ae.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ae.png
new file mode 100644
index 0000000..407a5bb
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ae.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/af.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/af.png
new file mode 100644
index 0000000..ba01b2b
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/af.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/al.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/al.png
new file mode 100644
index 0000000..06e9cac
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/al.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/am.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/am.png
new file mode 100644
index 0000000..d26210c
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/am.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/an.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/an.png
new file mode 100644
index 0000000..e05e6f8
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/an.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ao.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ao.png
new file mode 100644
index 0000000..5652c15
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ao.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ar.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ar.png
new file mode 100644
index 0000000..95bfc28
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ar.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/at.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/at.png
new file mode 100644
index 0000000..73c287e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/at.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/au.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/au.png
new file mode 100644
index 0000000..11ae4ce
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/au.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/aw.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/aw.png
new file mode 100644
index 0000000..5a3fbdd
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/aw.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/az.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/az.png
new file mode 100644
index 0000000..e6482a6
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/az.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ba.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ba.png
new file mode 100644
index 0000000..765d125
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ba.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bb.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bb.png
new file mode 100644
index 0000000..31ec713
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bb.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bd.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bd.png
new file mode 100644
index 0000000..3063438
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bd.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/be.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/be.png
new file mode 100644
index 0000000..6b6fe60
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/be.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bf.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bf.png
new file mode 100644
index 0000000..94802b8
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bf.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bg.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bg.png
new file mode 100644
index 0000000..6572ba7
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bg.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bh.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bh.png
new file mode 100644
index 0000000..3461737
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bh.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bi.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bi.png
new file mode 100644
index 0000000..fc21beb
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bi.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bj.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bj.png
new file mode 100644
index 0000000..ee88cdf
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bj.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bm.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bm.png
new file mode 100644
index 0000000..10defba
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bm.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bn.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bn.png
new file mode 100644
index 0000000..3edc2f8
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bn.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bo.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bo.png
new file mode 100644
index 0000000..bbfee3e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bo.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/br.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/br.png
new file mode 100644
index 0000000..1b4a7ec
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/br.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bs.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bs.png
new file mode 100644
index 0000000..32daa6d
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bs.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bt.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bt.png
new file mode 100644
index 0000000..6d08ec1
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bt.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bw.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bw.png
new file mode 100644
index 0000000..b667c69
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bw.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/by.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/by.png
new file mode 100644
index 0000000..4b3935d
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/by.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bz.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bz.png
new file mode 100644
index 0000000..adf568f
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/bz.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ca.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ca.png
new file mode 100644
index 0000000..d5013db
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ca.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cf.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cf.png
new file mode 100644
index 0000000..72e22a5
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cf.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cg.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cg.png
new file mode 100644
index 0000000..fc32f71
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cg.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ch.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ch.png
new file mode 100644
index 0000000..dc2323a
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ch.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ci.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ci.png
new file mode 100644
index 0000000..710f35d
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ci.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ck.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ck.png
new file mode 100644
index 0000000..d43361c
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ck.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cl.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cl.png
new file mode 100644
index 0000000..ea7b21b
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cl.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cm.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cm.png
new file mode 100644
index 0000000..318750f
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cm.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cn.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cn.png
new file mode 100644
index 0000000..2d1c880
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cn.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/co.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/co.png
new file mode 100644
index 0000000..06ecdf3
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/co.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cr.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cr.png
new file mode 100644
index 0000000..544333c
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cr.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cs.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cs.png
new file mode 100644
index 0000000..69157da
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cs.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cu.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cu.png
new file mode 100644
index 0000000..c94f37f
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cu.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cv.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cv.png
new file mode 100644
index 0000000..08dd4d1
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cv.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cy.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cy.png
new file mode 100644
index 0000000..c8d32b1
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cy.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cz.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cz.png
new file mode 100644
index 0000000..69157da
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/cz.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/de.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/de.png
new file mode 100644
index 0000000..3e4fa43
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/de.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/dk.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/dk.png
new file mode 100644
index 0000000..ba86668
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/dk.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/dz.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/dz.png
new file mode 100644
index 0000000..fb4e7b9
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/dz.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ec.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ec.png
new file mode 100644
index 0000000..5da356a
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ec.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ee.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ee.png
new file mode 100644
index 0000000..e5fe7f6
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ee.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/eg.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/eg.png
new file mode 100644
index 0000000..676be9d
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/eg.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/er.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/er.png
new file mode 100644
index 0000000..6d34be1
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/er.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/es.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/es.png
new file mode 100644
index 0000000..6219730
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/es.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/et.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/et.png
new file mode 100644
index 0000000..e54a004
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/et.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/eu.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/eu.png
new file mode 100644
index 0000000..aebdae1
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/eu.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/fi.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/fi.png
new file mode 100644
index 0000000..d515674
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/fi.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/fj.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/fj.png
new file mode 100644
index 0000000..0b390f4
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/fj.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/fo.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/fo.png
new file mode 100644
index 0000000..6e1f438
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/fo.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/fr.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/fr.png
new file mode 100644
index 0000000..7102174
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/fr.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ga.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ga.png
new file mode 100644
index 0000000..d913b2a
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ga.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gb.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gb.png
new file mode 100644
index 0000000..a2ad00c
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gb.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ge.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ge.png
new file mode 100644
index 0000000..bc55add
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ge.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gi.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gi.png
new file mode 100644
index 0000000..82d49a9
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gi.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gl.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gl.png
new file mode 100644
index 0000000..cba805a
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gl.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gp.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gp.png
new file mode 100644
index 0000000..887316a
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gp.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gr.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gr.png
new file mode 100644
index 0000000..7803cb4
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gr.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gt.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gt.png
new file mode 100644
index 0000000..31c79c2
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gt.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gu.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gu.png
new file mode 100644
index 0000000..c842809
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gu.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gy.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gy.png
new file mode 100644
index 0000000..8e56db0
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/gy.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/hk.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/hk.png
new file mode 100644
index 0000000..fe3e357
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/hk.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/hr.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/hr.png
new file mode 100644
index 0000000..c6b8ce7
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/hr.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ht.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ht.png
new file mode 100644
index 0000000..5b67b34
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ht.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/hu.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/hu.png
new file mode 100644
index 0000000..9eac7cf
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/hu.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/id.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/id.png
new file mode 100644
index 0000000..57de136
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/id.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ie.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ie.png
new file mode 100644
index 0000000..692c6b0
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ie.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/il.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/il.png
new file mode 100644
index 0000000..8acc027
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/il.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/in.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/in.png
new file mode 100644
index 0000000..9b7dc40
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/in.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/iq.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/iq.png
new file mode 100644
index 0000000..131af96
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/iq.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ir.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ir.png
new file mode 100644
index 0000000..4495d84
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ir.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/is.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/is.png
new file mode 100644
index 0000000..a8cd1d4
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/is.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/it.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/it.png
new file mode 100644
index 0000000..0d68791
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/it.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/jm.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/jm.png
new file mode 100644
index 0000000..2e3db29
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/jm.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/jo.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/jo.png
new file mode 100644
index 0000000..8f1270d
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/jo.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/jp.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/jp.png
new file mode 100644
index 0000000..b656389
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/jp.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ke.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ke.png
new file mode 100644
index 0000000..69f742b
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ke.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kg.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kg.png
new file mode 100644
index 0000000..c455107
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kg.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kh.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kh.png
new file mode 100644
index 0000000..b80b8c4
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kh.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ki.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ki.png
new file mode 100644
index 0000000..a3eac22
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ki.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kp.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kp.png
new file mode 100644
index 0000000..7bce15c
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kp.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kr.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kr.png
new file mode 100644
index 0000000..e2edef5
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kr.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kw.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kw.png
new file mode 100644
index 0000000..8654623
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kw.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ky.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ky.png
new file mode 100644
index 0000000..d7f8a81
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ky.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kz.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kz.png
new file mode 100644
index 0000000..aab3cfb
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/kz.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lb.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lb.png
new file mode 100644
index 0000000..c20823c
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lb.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lc.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lc.png
new file mode 100644
index 0000000..ba202aa
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lc.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lk.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lk.png
new file mode 100644
index 0000000..e8610a0
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lk.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lt.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lt.png
new file mode 100644
index 0000000..553b510
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lt.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lu.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lu.png
new file mode 100644
index 0000000..ca3c4e4
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lu.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lv.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lv.png
new file mode 100644
index 0000000..3f250a6
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/lv.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ly.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ly.png
new file mode 100644
index 0000000..1bf8ede
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ly.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ma.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ma.png
new file mode 100644
index 0000000..d98045e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ma.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mc.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mc.png
new file mode 100644
index 0000000..d398b4a
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mc.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/md.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/md.png
new file mode 100644
index 0000000..81c6d19
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/md.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mg.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mg.png
new file mode 100644
index 0000000..67753ea
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mg.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mk.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mk.png
new file mode 100644
index 0000000..0de419c
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mk.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mn.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mn.png
new file mode 100644
index 0000000..917fd18
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mn.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mo.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mo.png
new file mode 100644
index 0000000..b51ede3
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mo.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mp.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mp.png
new file mode 100644
index 0000000..8260b90
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mp.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ms.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ms.png
new file mode 100644
index 0000000..77e0d1b
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ms.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mt.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mt.png
new file mode 100644
index 0000000..e0b456f
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mt.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mx.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mx.png
new file mode 100644
index 0000000..67db550
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mx.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/my.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/my.png
new file mode 100644
index 0000000..c95ae6f
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/my.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mz.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mz.png
new file mode 100644
index 0000000..3ec9414
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/mz.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/na.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/na.png
new file mode 100644
index 0000000..f87051b
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/na.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/nc.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/nc.png
new file mode 100644
index 0000000..ddd33f3
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/nc.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/nf.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/nf.png
new file mode 100644
index 0000000..2b7d702
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/nf.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/nl.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/nl.png
new file mode 100644
index 0000000..3542a57
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/nl.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/no.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/no.png
new file mode 100644
index 0000000..ededb0d
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/no.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/np.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/np.png
new file mode 100644
index 0000000..d98045e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/np.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/nr.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/nr.png
new file mode 100644
index 0000000..642b2f6
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/nr.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/nz.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/nz.png
new file mode 100644
index 0000000..c5a5c9f
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/nz.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/om.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/om.png
new file mode 100644
index 0000000..814c1d9
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/om.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pa.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pa.png
new file mode 100644
index 0000000..fd99701
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pa.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pe.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pe.png
new file mode 100644
index 0000000..ac0b03f
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pe.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pf.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pf.png
new file mode 100644
index 0000000..11434d0
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pf.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ph.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ph.png
new file mode 100644
index 0000000..a5b331f
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ph.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pk.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pk.png
new file mode 100644
index 0000000..922ab5d
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pk.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pl.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pl.png
new file mode 100644
index 0000000..8f89576
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pl.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pm.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pm.png
new file mode 100644
index 0000000..9ce2d60
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pm.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pr.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pr.png
new file mode 100644
index 0000000..98c28b9
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pr.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pt.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pt.png
new file mode 100644
index 0000000..9d3aa9b
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/pt.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/py.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/py.png
new file mode 100644
index 0000000..b43dfc2
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/py.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/qa.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/qa.png
new file mode 100644
index 0000000..327c604
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/qa.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ro.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ro.png
new file mode 100644
index 0000000..ef0d190
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ro.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ru.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ru.png
new file mode 100644
index 0000000..d0ce881
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ru.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sa.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sa.png
new file mode 100644
index 0000000..f30f75e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sa.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sb.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sb.png
new file mode 100644
index 0000000..ce219d1
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sb.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sd.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sd.png
new file mode 100644
index 0000000..01a54cb
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sd.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/se.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/se.png
new file mode 100644
index 0000000..463382f
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/se.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sg.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sg.png
new file mode 100644
index 0000000..ef5a448
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sg.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/si.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/si.png
new file mode 100644
index 0000000..3f1c159
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/si.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sk.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sk.png
new file mode 100644
index 0000000..6f1bc96
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sk.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sl.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sl.png
new file mode 100644
index 0000000..4daf7d4
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sl.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sm.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sm.png
new file mode 100644
index 0000000..d3c3691
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sm.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/so.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/so.png
new file mode 100644
index 0000000..175d407
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/so.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sy.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sy.png
new file mode 100644
index 0000000..d98045e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/sy.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tc.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tc.png
new file mode 100644
index 0000000..56dff7a
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tc.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tg.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tg.png
new file mode 100644
index 0000000..19a8da2
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tg.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/th.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/th.png
new file mode 100644
index 0000000..ac82f5f
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/th.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tn.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tn.png
new file mode 100644
index 0000000..c03002c
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tn.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/to.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/to.png
new file mode 100644
index 0000000..be306fc
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/to.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tp.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tp.png
new file mode 100644
index 0000000..bdb0b4d
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tp.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tr.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tr.png
new file mode 100644
index 0000000..f799e03
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tr.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tt.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tt.png
new file mode 100644
index 0000000..b6fddae
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tt.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tv.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tv.png
new file mode 100644
index 0000000..df60d61
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tv.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tw.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tw.png
new file mode 100644
index 0000000..27de646
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tw.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tz.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tz.png
new file mode 100644
index 0000000..12832d6
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/tz.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ua.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ua.png
new file mode 100644
index 0000000..9b560a3
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ua.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ug.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ug.png
new file mode 100644
index 0000000..f01a8a8
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ug.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/unknown.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/unknown.png
new file mode 100644
index 0000000..d0a39bd
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/unknown.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/us.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/us.png
new file mode 100644
index 0000000..e203915
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/us.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/uy.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/uy.png
new file mode 100644
index 0000000..580f53e
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/uy.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/va.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/va.png
new file mode 100644
index 0000000..1517d77
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/va.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ve.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ve.png
new file mode 100644
index 0000000..35a1b81
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ve.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/vg.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/vg.png
new file mode 100644
index 0000000..c841cbc
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/vg.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/vi.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/vi.png
new file mode 100644
index 0000000..6152a6b
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/vi.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/vn.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/vn.png
new file mode 100644
index 0000000..175b652
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/vn.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ws.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ws.png
new file mode 100644
index 0000000..a912d36
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ws.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ye.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ye.png
new file mode 100644
index 0000000..deab0e6
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/ye.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/za.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/za.png
new file mode 100644
index 0000000..3d07dbb
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/za.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/zw.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/zw.png
new file mode 100644
index 0000000..b1bf791
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/flags/zw.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-bw-high.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-bw-high.png
new file mode 100644
index 0000000..b40f54b
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-bw-high.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-bw-low.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-bw-low.png
new file mode 100644
index 0000000..86fff8a
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-bw-low.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-bw-med.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-bw-med.png
new file mode 100644
index 0000000..83e2555
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-bw-med.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-bw-none.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-bw-none.png
new file mode 100644
index 0000000..ee98857
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-bw-none.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-hibernating.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-hibernating.png
new file mode 100644
index 0000000..c733599
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-hibernating.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-unresponsive.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-unresponsive.png
new file mode 100644
index 0000000..aa5a1f1
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/node-unresponsive.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/placemark-relay.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/placemark-relay.png
new file mode 100644
index 0000000..dcfe6fc
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/placemark-relay.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/tor-off.icns b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/tor-off.icns
new file mode 100644
index 0000000..79ae1ae
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/tor-off.icns differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/tor-on.icns b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/tor-on.icns
new file mode 100644
index 0000000..7e7842a
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/tor-on.icns differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/tor-starting.icns b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/tor-starting.icns
new file mode 100644
index 0000000..421a95a
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/tor-starting.icns differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/tor-stopping.icns b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/tor-stopping.icns
new file mode 100644
index 0000000..2495af6
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/tor-stopping.icns differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/vidalia.icns b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/vidalia.icns
new file mode 100644
index 0000000..beb6c48
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/vidalia.icns differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/vidalia.ico b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/vidalia.ico
new file mode 100644
index 0000000..cce2759
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/icons/vidalia.ico differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/license.html b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/license.html
new file mode 100644
index 0000000..ef6c365
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/license.html
@@ -0,0 +1,379 @@
+<html>
+<body>
+
+<h2>Vidalia</h2>
+<p>Vidalia is distributed under the following license:</p>
+<pre>
+ Copyright (c) 2006-2007, Matt Edman, Justin Hipple
+ Copyright (c) 2007-2009, Matt Edman
+</pre>
+
+<p>
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License (GPL) as published by
+the Free Software Foundation; either version 2 of the License, or (at
+your option) any later version. The full text of versions 2 and 3 of
+the GPL can be found respectively in the files LICENSE-GPLV2 and
+LICENSE-GPLV3.
+</p>
+
+<p>
+EXCEPTION: This distribution of Vidalia may be linked against OpenSSL
+according to the terms of the section below entitled "OpenSSL Exception."
+</p>
+
+<p>
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+Public License for more details.
+</p>
+
+<p>
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+</p>
+
+<p>
+<i>OpenSSL Exception</i>
+</p>
+
+<p>0. Definitions</p>
+
+<p>
+"Vidalia" means Vidalia software licensed under version 2 or any later
+version of the GNU General Public License (collectively, "GPL"), or a
+work based on such software and licensed under the GPL.
+</p>
+<p>
+"OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL
+Project and licensed under the OpenSSL Licenses, or a work based on such
+software and licensed under the OpenSSL Licenses.
+</p>
+<p>
+"OpenSSL Licenses" means the OpenSSL License and Original SSLeay License
+under which the OpenSSL Project distributes the OpenSSL toolkit software,
+as those licenses appear in the file LICENSE-OPENSSL.
+</p>
+
+<p>1. Exception</p>
+
+<p>
+You have permission to copy, modify, propagate, and distribute a work
+formed by combining OpenSSL with Vidalia, or a work derivative of such a
+combination, even if such copying, modification, propagation, or
+distribution would otherwise violate the terms of the GPL. You must
+comply with the GPL in all respects for all of the code used other than
+OpenSSL.
+</p>
+
+<p>
+You may include this OpenSSL Exception and its grant of permissions when
+you distribute Vidalia. Inclusion of this notice with such a
+distribution constitutes a grant of such permission. If you do not wish
+to grant these permissions, remove this section entitled "OpenSSL
+Exception" from your distribution.
+</p>
+
+<hr>
+
+<h3>KDE Oxygen Icon Theme</h3>
+
+<p>
+Vidalia incorporates icons from KDE's Oxygen icon theme. It is
+licensed as follows:
+</p>
+
+<pre>
+ Copyright (c) 2007 David Vignoni <david at icon-king.com>
+ Copyright (c) 2007 Johann Ollivier Lapeyre <johann at oxygen-icons.org>
+ Copyright (c) 2007 Kenneth Wimer <kwwii at bootsplash.org>
+ Copyright (c) 2007 Nuno Fernades Pinheiro <nf.pinheiro at gmail.com>
+ Copyright (c) 2007 Riccardo Iaconelli <riccardo at oxygen-icons.org>
+ Copyright (c) 2007 David Miller <miller at oxygen-icons.org>
+ and others.
+</pre>
+
+<p>
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 3 of the License, or (at your option) any later version.
+</p>
+
+<p>
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+</p>
+<p>
+You should have received a copy of the GNU Library General Public
+License along with this library. If not, see
+<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.
+</p>
+
+<hr>
+
+<h3>MiniUPnPc</h3>
+
+<p>
+Vidalia uses the MiniUPnPc library for UPnP support. It is licensed as
+follows:
+</p>
+
+<pre>
+ Copyright (c) 2005-2007, Thomas BERNARD
+</pre>
+
+<p>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+</p>
+
+<ul>
+ <li>Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.</li>
+
+ <li>Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials
+ provided with the distribution.</li>
+
+ <li>Neither the names of the copyright owners nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.</li>
+</ul>
+
+<p>
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</p>
+
+<hr>
+
+<h3>GeoLite City Database</h3>
+
+<p>
+Vidalia uses GeoIP data created by MaxMind, available from
+<a href="http://maxmind.com/">http://www.maxmind.com</a>. It is licensed as
+follows:
+</p>
+
+<pre>
+ Copyright (c) 2007 MaxMind LLC. All Rights Reserved.
+</pre>
+
+<p>
+All advertising materials and documentation mentioning features or use of
+this database must display the following acknowledgment:
+"This product includes GeoLite data created by MaxMind, available from
+http://maxmind.com/"
+</p>
+
+<p>
+Redistribution and use with or without modification, are permitted provided
+that the following conditions are met:
+</p>
+<ul>
+ <li>Redistributions must retain the above copyright notice, this list of
+ conditions and the following disclaimer in the documentation and/or other
+ materials provided with the distribution.</li>
+
+ <li>All advertising materials and documentation mentioning features or use
+ of this database must display the following acknowledgement:
+ "This product includes GeoLite data created by MaxMind, available from
+ http://maxmind.com/"</li>
+
+ <li>"MaxMind" may not be used to endorse or promote products derived from
+ this database without specific prior written permission.</li>
+</ul>
+
+<p>
+THIS DATABASE IS PROVIDED BY MAXMIND.COM ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL MAXMIND.COM BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</p>
+
+<hr>
+
+<h3>Qt</h3>
+
+<p>
+Vidalia is built using the Open Source Edition of the Qt GUI toolkit from
+Trolltech. See the <a href="http://doc.trolltech.com/4.4/licenses.html">Qt
+documentation</a> for full information on Qt's licensing terms.
+</p>
+
+<hr>
+
+<h3>Tor</h3>
+<p>The Tor software is distributed under the following license:</p>
+<pre>
+ Copyright (c) 2001-2004, Roger Dingledine
+ Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson
+ Copyright (c) 2007-2009, The Tor Project, Inc.
+</pre>
+
+<p>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+</p>
+
+<ul>
+ <li>Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.</li>
+
+ <li>Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.</li>
+
+ <li>Neither the names of the copyright owners nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.</li>
+</ul>
+
+<p>
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</p>
+
+<p>
+src/common/strlcat.c and src/common/strlcpy.c by Todd C. Miller are licensed
+under the following license:
+</p>
+
+<pre>
+ Copyright (c) 1998 Todd C. Miller <Todd.Miller at courtesan.com>
+ All rights reserved.
+</pre>
+
+<p>Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:</p>
+
+<ul>
+ <li>Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.</li>
+
+ <li>Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.</li>
+
+ <li>The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.</li>
+</ul>
+
+<p>
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</p>
+
+<p>
+<i>If you got Tor as a static binary with OpenSSL included, then you should
+know: "This product includes software developed by the OpenSSL Project
+for use in the OpenSSL Toolkit (<a
+href="http://www.openssl.org/">http://www.openssl.org/</a>)"</i>
+</p>
+
+<p>
+<i>This program uses the IP-to-Country Database provided by
+WebHosting.Info (http://www.webhosting.info), available from
+<a href="http://ip-to-country.webhosting.info">
+http://ip-to-country.webhosting.info</a>. See the src/config/geoip file in
+particular.</i>
+</p>
+
+<hr>
+
+<h3>Tor Documentation</h3>
+
+<p>
+Some of the help documentation text used in Vidalia is derived from the TorFAQ
+Wiki <http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ>. It is licensed
+under the MIT license as follows:
+</p>
+
+<pre>
+ Copyright (c) 2003-2008 Roger Dingledine
+ Copyright (c) 2004-2005 Nick Mathewson
+ Copyright (c) 2004 Douglas F. Calvert
+</pre>
+
+<p>
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+</p>
+
+<p>
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+</p>
+
+<p>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+</p>
+
+<hr>
+
+<p>
+ <i>This product is produced independently from the Tor anonymity
+ software and carries no guarantee from The Tor Project about
+ quality, suitability or anything else.</i>
+</p>
+<p>
+ <i>The Tor(TM) trademark and Tor Onion Logo are trademarks of
+ The Tor Project. More information about the Tor project can be
+ found at the Tor website,
+ <a href="https://www.torproject.org/">https://www.torproject.org</a>.</i>
+</p>
+
+</body>
+</html>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/map/world-map.png b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/map/world-map.png
new file mode 100644
index 0000000..63ec283
Binary files /dev/null and b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/map/world-map.png differ
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/vidalia.qrc b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/vidalia.qrc
new file mode 100644
index 0000000..47a5b6c
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/vidalia.qrc
@@ -0,0 +1,310 @@
+<RCC>
+ <qresource prefix="/docs">
+ <file>credits.html</file>
+ <file>license.html</file>
+ </qresource>
+ <qresource prefix="/images">
+ <file>16x16/application-exit.png</file>
+ <file>16x16/applications-internet.png</file>
+ <file>16x16/applications-system.png</file>
+ <file>16x16/dialog-information.png</file>
+ <file>16x16/dialog-warning.png</file>
+ <file>16x16/emblem-important.png</file>
+ <file>16x16/format-justify-fill.png</file>
+ <file>16x16/graph-area.png</file>
+ <file>16x16/graph-line.png</file>
+ <file>16x16/help-about.png</file>
+ <file>16x16/media-playback-start.png</file>
+ <file>16x16/media-playback-stop.png</file>
+ <file>16x16/preferences-desktop-notification.png</file>
+ <file>16x16/preferences-system.png</file>
+ <file>16x16/system-help.png</file>
+ <file>16x16/system-run.png</file>
+ <file>16x16/tor-off.png</file>
+ <file>16x16/tor-on.png</file>
+ <file>16x16/tor-starting.png</file>
+ <file>16x16/tor-stopping.png</file>
+ <file>16x16/utilities-log-viewer.png</file>
+ <file>16x16/utilities-system-monitor.png</file>
+ <file>16x16/view-media-artist.png</file>
+ </qresource>
+ <qresource prefix="/images">
+ <file>22x22/application-exit.png</file>
+ <file>22x22/dialog-password.png</file>
+ <file>22x22/edit-copy.png</file>
+ <file>22x22/edit-delete.png</file>
+ <file>22x22/folder.png</file>
+ <file>22x22/format-justify-fill.png</file>
+ <file>22x22/go-down-search.png</file>
+ <file>22x22/go-up-search.png</file>
+ <file>22x22/help-about.png</file>
+ <file>22x22/list-add.png</file>
+ <file>22x22/list-remove.png</file>
+ <file>22x22/page-zoom.png</file>
+ <file>22x22/preferences-system.png</file>
+ <file>22x22/system-help.png</file>
+ <file>22x22/tor-off.png</file>
+ <file>22x22/tor-on.png</file>
+ <file>22x22/tor-starting.png</file>
+ <file>22x22/tor-stopping.png</file>
+ <file>22x22/utilities-system-monitor.png</file>
+ </qresource>
+ <qresource prefix="/images">
+ <file>32x32/applications-internet.png</file>
+ <file>32x32/applications-system.png</file>
+ <file>32x32/dialog-ok-apply.png</file>
+ <file>32x32/dialog-warning.png</file>
+ <file>32x32/document-save.png</file>
+ <file>32x32/document-save-all.png</file>
+ <file>32x32/edit-clear.png</file>
+ <file>32x32/edit-copy.png</file>
+ <file>32x32/edit-delete.png</file>
+ <file>32x32/edit-find.png</file>
+ <file>32x32/edit-select-all.png</file>
+ <file>32x32/format-justify-fill.png</file>
+ <file>32x32/go-home.png</file>
+ <file>32x32/go-next.png</file>
+ <file>32x32/go-previous.png</file>
+ <file>32x32/help-about.png</file>
+ <file>32x32/network-workgroup.png</file>
+ <file>32x32/preferences-desktop-locale.png</file>
+ <file>32x32/preferences-other.png</file>
+ <file>32x32/preferences-system.png</file>
+ <file>32x32/preferences-system-network.png</file>
+ <file>32x32/preferences-system-network-sharing.png</file>
+ <file>32x32/script-error.png</file>
+ <file>32x32/security-low.png</file>
+ <file>32x32/security-medium.png</file>
+ <file>32x32/services.png</file>
+ <file>32x32/system-help.png</file>
+ <file>32x32/system-software-update.png</file>
+ <file>32x32/tor-logo.png</file>
+ <file>32x32/tor-off.png</file>
+ <file>32x32/tor-on.png</file>
+ <file>32x32/tor-starting.png</file>
+ <file>32x32/tor-stopping.png</file>
+ <file>32x32/utilities-log-viewer.png</file>
+ <file>32x32/utilities-system-monitor.png</file>
+ <file>32x32/view-fullscreen.png</file>
+ <file>32x32/view-refresh.png</file>
+ <file>32x32/window-close.png</file>
+ <file>32x32/zoom-fit-best.png</file>
+ <file>32x32/zoom-in.png</file>
+ <file>32x32/zoom-out.png</file>
+ </qresource>
+ <qresource prefix="/images">
+ <file>48x48/applications-internet.png</file>
+ <file>48x48/chronometer.png</file>
+ <file>48x48/dialog-password.png</file>
+ <file>48x48/media-playback-start.png</file>
+ <file>48x48/media-playback-stop.png</file>
+ <file>48x48/modem.png</file>
+ <file>48x48/network-connect.png</file>
+ <file>48x48/network-wired.png</file>
+ <file>48x48/network-workgroup.png</file>
+ <file>48x48/preferences-system-network-sharing.png</file>
+ <file>48x48/tor-logo.png</file>
+ <file>48x48/tor-off.png</file>
+ <file>48x48/tor-on.png</file>
+ <file>48x48/tor-starting.png</file>
+ <file>48x48/tor-stopping.png</file>
+ <file>48x48/system-software-update.png</file>
+ <file>48x48/view-media-artist.png</file>
+ </qresource>
+ <qresource prefix="/images">
+ <file>128x128/tor-logo.png</file>
+ <file>128x128/tor-off.png</file>
+ <file>128x128/tor-on.png</file>
+ <file>128x128/tor-starting.png</file>
+ <file>128x128/tor-stopping.png</file>
+ </qresource>
+ <qresource prefix="/images">
+ <file>icons/node-unresponsive.png</file>
+ <file>icons/node-hibernating.png</file>
+ <file>icons/node-bw-none.png</file>
+ <file>icons/node-bw-low.png</file>
+ <file>icons/node-bw-med.png</file>
+ <file>icons/node-bw-high.png</file>
+ <file>icons/placemark-relay.png</file>
+ </qresource>
+ <qresource prefix="/images">
+ <file>flags/ae.png</file>
+ <file>flags/af.png</file>
+ <file>flags/al.png</file>
+ <file>flags/am.png</file>
+ <file>flags/an.png</file>
+ <file>flags/ao.png</file>
+ <file>flags/ar.png</file>
+ <file>flags/at.png</file>
+ <file>flags/au.png</file>
+ <file>flags/aw.png</file>
+ <file>flags/az.png</file>
+ <file>flags/ba.png</file>
+ <file>flags/bb.png</file>
+ <file>flags/bd.png</file>
+ <file>flags/be.png</file>
+ <file>flags/bf.png</file>
+ <file>flags/bg.png</file>
+ <file>flags/bh.png</file>
+ <file>flags/bi.png</file>
+ <file>flags/bj.png</file>
+ <file>flags/bm.png</file>
+ <file>flags/bn.png</file>
+ <file>flags/bo.png</file>
+ <file>flags/br.png</file>
+ <file>flags/bs.png</file>
+ <file>flags/bt.png</file>
+ <file>flags/bw.png</file>
+ <file>flags/by.png</file>
+ <file>flags/bz.png</file>
+ <file>flags/ca.png</file>
+ <file>flags/cf.png</file>
+ <file>flags/cg.png</file>
+ <file>flags/ch.png</file>
+ <file>flags/ci.png</file>
+ <file>flags/ck.png</file>
+ <file>flags/cl.png</file>
+ <file>flags/cm.png</file>
+ <file>flags/cn.png</file>
+ <file>flags/co.png</file>
+ <file>flags/cr.png</file>
+ <file>flags/cs.png</file>
+ <file>flags/cu.png</file>
+ <file>flags/cv.png</file>
+ <file>flags/cy.png</file>
+ <file>flags/cz.png</file>
+ <file>flags/de.png</file>
+ <file>flags/dk.png</file>
+ <file>flags/dz.png</file>
+ <file>flags/ec.png</file>
+ <file>flags/ee.png</file>
+ <file>flags/eg.png</file>
+ <file>flags/er.png</file>
+ <file>flags/es.png</file>
+ <file>flags/et.png</file>
+ <file>flags/eu.png</file>
+ <file>flags/fi.png</file>
+ <file>flags/fj.png</file>
+ <file>flags/fo.png</file>
+ <file>flags/fr.png</file>
+ <file>flags/ga.png</file>
+ <file>flags/gb.png</file>
+ <file>flags/ge.png</file>
+ <file>flags/gi.png</file>
+ <file>flags/gl.png</file>
+ <file>flags/gp.png</file>
+ <file>flags/gr.png</file>
+ <file>flags/gt.png</file>
+ <file>flags/gu.png</file>
+ <file>flags/gy.png</file>
+ <file>flags/hk.png</file>
+ <file>flags/hr.png</file>
+ <file>flags/ht.png</file>
+ <file>flags/hu.png</file>
+ <file>flags/id.png</file>
+ <file>flags/ie.png</file>
+ <file>flags/il.png</file>
+ <file>flags/in.png</file>
+ <file>flags/iq.png</file>
+ <file>flags/ir.png</file>
+ <file>flags/is.png</file>
+ <file>flags/it.png</file>
+ <file>flags/jm.png</file>
+ <file>flags/jo.png</file>
+ <file>flags/jp.png</file>
+ <file>flags/ke.png</file>
+ <file>flags/kg.png</file>
+ <file>flags/kh.png</file>
+ <file>flags/ki.png</file>
+ <file>flags/kp.png</file>
+ <file>flags/kr.png</file>
+ <file>flags/kw.png</file>
+ <file>flags/ky.png</file>
+ <file>flags/kz.png</file>
+ <file>flags/lb.png</file>
+ <file>flags/lc.png</file>
+ <file>flags/lk.png</file>
+ <file>flags/lt.png</file>
+ <file>flags/lu.png</file>
+ <file>flags/lv.png</file>
+ <file>flags/ly.png</file>
+ <file>flags/ma.png</file>
+ <file>flags/mc.png</file>
+ <file>flags/md.png</file>
+ <file>flags/mg.png</file>
+ <file>flags/mk.png</file>
+ <file>flags/mn.png</file>
+ <file>flags/mo.png</file>
+ <file>flags/mp.png</file>
+ <file>flags/ms.png</file>
+ <file>flags/mt.png</file>
+ <file>flags/mx.png</file>
+ <file>flags/my.png</file>
+ <file>flags/mz.png</file>
+ <file>flags/na.png</file>
+ <file>flags/nc.png</file>
+ <file>flags/nf.png</file>
+ <file>flags/nl.png</file>
+ <file>flags/no.png</file>
+ <file>flags/np.png</file>
+ <file>flags/nr.png</file>
+ <file>flags/nz.png</file>
+ <file>flags/om.png</file>
+ <file>flags/pa.png</file>
+ <file>flags/pe.png</file>
+ <file>flags/pf.png</file>
+ <file>flags/ph.png</file>
+ <file>flags/pk.png</file>
+ <file>flags/pl.png</file>
+ <file>flags/pm.png</file>
+ <file>flags/pr.png</file>
+ <file>flags/pt.png</file>
+ <file>flags/py.png</file>
+ <file>flags/qa.png</file>
+ <file>flags/ro.png</file>
+ <file>flags/ru.png</file>
+ <file>flags/sa.png</file>
+ <file>flags/sb.png</file>
+ <file>flags/sd.png</file>
+ <file>flags/se.png</file>
+ <file>flags/sg.png</file>
+ <file>flags/si.png</file>
+ <file>flags/sk.png</file>
+ <file>flags/sl.png</file>
+ <file>flags/sm.png</file>
+ <file>flags/so.png</file>
+ <file>flags/sy.png</file>
+ <file>flags/tc.png</file>
+ <file>flags/tg.png</file>
+ <file>flags/th.png</file>
+ <file>flags/tn.png</file>
+ <file>flags/to.png</file>
+ <file>flags/tp.png</file>
+ <file>flags/tr.png</file>
+ <file>flags/tt.png</file>
+ <file>flags/tv.png</file>
+ <file>flags/tw.png</file>
+ <file>flags/tz.png</file>
+ <file>flags/ua.png</file>
+ <file>flags/ug.png</file>
+ <file>flags/us.png</file>
+ <file>flags/uy.png</file>
+ <file>flags/va.png</file>
+ <file>flags/ve.png</file>
+ <file>flags/vg.png</file>
+ <file>flags/vi.png</file>
+ <file>flags/vn.png</file>
+ <file>flags/ws.png</file>
+ <file>flags/ye.png</file>
+ <file>flags/za.png</file>
+ <file>flags/zw.png</file>
+ <file>flags/unknown.png</file>
+ </qresource>
+ <qresource prefix="/images">
+ <file>map/world-map.png</file>
+ </qresource>
+ <qresource prefix="/pki">
+ <file>cacert_root.crt</file>
+ <file>EquifaxSecureCA.crt</file>
+ </qresource>
+</RCC>
diff --git a/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/vidalia_win.rc.in b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/vidalia_win.rc.in
new file mode 100644
index 0000000..412ec98
--- /dev/null
+++ b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/res/vidalia_win.rc.in
@@ -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 vidalia_win.rc
+** \version $Id: vidalia_win.rc.in 3817 2009-06-05 23:44:51Z edmanm $
+** Defines resource identifiers for icons used on Win32.
+*/
+
+#include <winver.h>
+
+
+1 VERSIONINFO
+FILEVERSION @VER_MAJOR@, at VER_MINOR@, at VER_PATCH@,0
+PRODUCTVERSION @VER_MAJOR@, at VER_MINOR@, at VER_PATCH@,0
+FILEFLAGSMASK 0
+FILEOS VOS__WINDOWS32
+FILETYPE VFT_APP
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "FileVersion", "@VERSION@"
+ VALUE "ProductVersion", "@VERSION@"
+ VALUE "FileDescription", "Vidalia"
+ VALUE "InternalName", "Vidalia"
+ VALUE "ProductName", "Vidalia"
+ VALUE "OriginalFilename", "vidalia.exe"
+ VALUE "CompanyName", "vidalia-project.net"
+ VALUE "LegalCopyright", "Copyright (C) 2007-2009, Matt Edman, Justin Hipple"
+ }
+ }
+}
+
+
+/* Application icon */
+101 ICON DISCARDABLE "icons/vidalia.ico"
+
diff --git a/debian/0.2.x/vidalia.desktop b/testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/vidalia.desktop
similarity index 100%
copy from debian/0.2.x/vidalia.desktop
copy to testing-proposed-updates/vidalia-0.2.9-1+squeeze1/src/vidalia/vidalia.desktop
diff --git a/testing-proposed-updates/vidalia_0.2.9.orig.tar.gz b/testing-proposed-updates/vidalia_0.2.9.orig.tar.gz
new file mode 100644
index 0000000..a8c4f3a
Binary files /dev/null and b/testing-proposed-updates/vidalia_0.2.9.orig.tar.gz differ
--
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