[Pkg-privacy-commits] [vidalia] 66/160: Imported Upstream version 0.3.0alpha
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:14:25 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 d7a660b30bf8668def3f8480169bedea3ccee0de
Author: Dererk <dererk at debian.org>
Date: Mon Jul 25 18:24:59 2011 -0300
Imported Upstream version 0.3.0alpha
---
CHANGELOG | 33 +
CMakeLists.txt | 10 +-
cmake/FindBreakpad.cmake | 9 +-
cmake/FindGeoIP.cmake | 6 +-
cmake/FindMarble.cmake | 6 +-
cmake/FindOpenSSL.cmake | 6 +-
cmake/FindWiX.cmake | 6 +-
cmake/VidaliaMacros.cmake | 6 +-
config.h.in | 6 +-
contrib/geoip.py | 6 +-
doc/CMakeLists.txt | 6 +-
doc/vidalia.1.in | 2 +-
pkg/CMakeLists.txt | 6 +-
pkg/build-geoip-cache.sh | 6 +-
pkg/osx/CMakeLists.txt | 6 +-
pkg/osx/InstallTorbutton.scpt.in | 6 +-
pkg/package.sh | 6 +-
pkg/rpm/CMakeLists.txt | 6 +-
pkg/win32/CMakeLists.txt | 6 +-
pkg/win32/bridge-bundle.nsi.in | 6 +-
pkg/win32/po/.tx/config | 2 +-
pkg/win32/po/af/vidalia_af.po | 2 +-
pkg/win32/po/ak/vidalia_ak.po | 2 +-
pkg/win32/po/am/vidalia_am.po | 2 +-
pkg/win32/po/ar/vidalia_ar.po | 2 +-
pkg/win32/po/arn/vidalia_arn.po | 2 +-
pkg/win32/po/ast/vidalia_ast.po | 2 +-
pkg/win32/po/az/vidalia_az.po | 2 +-
pkg/win32/po/bg/vidalia_bg.po | 2 +-
pkg/win32/po/bn_IN/vidalia_bn_IN.po | 2 +-
pkg/win32/po/ca/vidalia_ca.po | 2 +-
pkg/win32/po/cs/vidalia_cs.po | 2 +-
pkg/win32/po/csb/vidalia_csb.po | 2 +-
pkg/win32/po/cy/vidalia_cy.po | 2 +-
pkg/win32/po/de/vidalia_de.po | 2 +-
pkg/win32/po/de_CH/vidalia_de_CH.po | 2 +-
pkg/win32/po/dz/vidalia_dz.po | 2 +-
pkg/win32/po/el/vidalia_el.po | 2 +-
pkg/win32/po/eo/vidalia_eo.po | 2 +-
pkg/win32/po/es/vidalia_es.po | 4 +-
pkg/win32/po/et/vidalia_et.po | 2 +-
pkg/win32/po/eu/vidalia_eu.po | 2 +-
pkg/win32/po/fil/vidalia_fil.po | 2 +-
pkg/win32/po/fur/vidalia_fur.po | 2 +-
pkg/win32/po/ga/vidalia_ga.po | 2 +-
pkg/win32/po/gl/vidalia_gl.po | 2 +-
pkg/win32/po/gu/vidalia_gu.po | 2 +-
pkg/win32/po/gun/vidalia_gun.po | 2 +-
pkg/win32/po/ha/vidalia_ha.po | 2 +-
pkg/win32/po/he/vidalia_he.po | 2 +-
pkg/win32/po/hi/vidalia_hi.po | 2 +-
pkg/win32/po/hr/vidalia_hr.po | 2 +-
pkg/win32/po/ht/vidalia_ht.po | 2 +-
pkg/win32/po/hu/vidalia_hu.po | 2 +-
pkg/win32/po/id/vidalia_id.po | 2 +-
pkg/win32/po/is/vidalia_is.po | 2 +-
pkg/win32/po/it/vidalia_it.po | 4 +-
pkg/win32/po/kn/vidalia_kn.po | 2 +-
pkg/win32/po/lb/vidalia_lb.po | 2 +-
pkg/win32/po/ln/vidalia_ln.po | 2 +-
pkg/win32/po/lo/vidalia_lo.po | 2 +-
pkg/win32/po/lt/vidalia_lt.po | 2 +-
pkg/win32/po/lv/vidalia_lv.po | 2 +-
pkg/win32/po/mg/vidalia_mg.po | 2 +-
pkg/win32/po/mi/vidalia_mi.po | 2 +-
pkg/win32/po/mk/vidalia_mk.po | 2 +-
pkg/win32/po/ml/vidalia_ml.po | 2 +-
pkg/win32/po/mn/vidalia_mn.po | 2 +-
pkg/win32/po/mr/vidalia_mr.po | 2 +-
pkg/win32/po/ms/vidalia_ms.po | 2 +-
pkg/win32/po/mt/vidalia_mt.po | 2 +-
pkg/win32/po/my/vidalia_my.po | 2 +-
pkg/win32/po/nah/vidalia_nah.po | 2 +-
pkg/win32/po/nap/vidalia_nap.po | 2 +-
pkg/win32/po/nb/vidalia_nb.po | 2 +-
pkg/win32/po/ne/vidalia_ne.po | 2 +-
pkg/win32/po/nl/vidalia_nl.po | 2 +-
pkg/win32/po/nn/vidalia_nn.po | 2 +-
pkg/win32/po/nso/vidalia_nso.po | 2 +-
pkg/win32/po/oc/vidalia_oc.po | 2 +-
pkg/win32/po/pa/vidalia_pa.po | 2 +-
pkg/win32/po/pap/vidalia_pap.po | 2 +-
pkg/win32/po/pl/vidalia_pl.po | 2 +-
pkg/win32/po/pms/vidalia_pms.po | 2 +-
pkg/win32/po/ps/vidalia_ps.po | 2 +-
pkg/win32/po/pt/vidalia_pt.po | 2 +-
pkg/win32/po/pt_BR/vidalia_pt_BR.po | 2 +-
pkg/win32/po/ru/vidalia_ru.po | 20 +-
pkg/win32/po/sco/vidalia_sco.po | 2 +-
pkg/win32/po/son/vidalia_son.po | 2 +-
pkg/win32/po/su/vidalia_su.po | 2 +-
pkg/win32/po/sw/vidalia_sw.po | 2 +-
pkg/win32/po/ta/vidalia_ta.po | 2 +-
pkg/win32/po/te/vidalia_te.po | 2 +-
pkg/win32/po/tg/vidalia_tg.po | 2 +-
pkg/win32/po/th/vidalia_th.po | 2 +-
pkg/win32/po/ti/vidalia_ti.po | 2 +-
pkg/win32/po/tk/vidalia_tk.po | 2 +-
pkg/win32/po/tr/vidalia_tr.po | 2 +-
pkg/win32/po/ur/vidalia_ur.po | 2 +-
pkg/win32/po/ve/vidalia_ve.po | 2 +-
pkg/win32/po/vi/vidalia_vi.po | 2 +-
pkg/win32/po/zh_CN/vidalia_zh_CN.po | 2 +-
pkg/win32/po/zh_HK/vidalia_zh_HK.po | 2 +-
pkg/win32/po/zu/vidalia_zu.po | 2 +-
pkg/win32/vidalia-bundle.nsi.in | 6 +-
src/CMakeLists.txt | 6 +-
src/common/CMakeLists.txt | 6 +-
src/common/Log.cpp | 6 +-
src/common/Log.h | 6 +-
src/common/TorSocket.cpp | 6 +-
src/common/TorSocket.h | 6 +-
src/common/ZlibByteArray.cpp | 6 +-
src/common/ZlibByteArray.h | 6 +-
src/common/crypto.cpp | 6 +-
src/common/crypto.h | 6 +-
src/common/file.cpp | 6 +-
src/common/file.h | 6 +-
src/common/html.cpp | 6 +-
src/common/html.h | 6 +-
src/common/net.cpp | 6 +-
src/common/net.h | 6 +-
src/common/procutil.cpp | 72 +-
src/common/procutil.h | 9 +-
src/common/stringutil.cpp | 6 +-
src/common/stringutil.h | 6 +-
src/common/win32.cpp | 6 +-
src/common/win32.h | 6 +-
src/crashreporter/CMakeLists.txt | 12 +-
src/crashreporter/CrashReportDialog.cpp | 67 +-
src/crashreporter/CrashReportDialog.h | 34 +-
src/crashreporter/CrashReportDialog.ui | 115 +-
src/crashreporter/CrashReportUploader.cpp | 152 --
src/crashreporter/CrashReportUploader.h | 109 -
src/crashreporter/UploadProgressDialog.cpp | 60 -
src/crashreporter/UploadProgressDialog.h | 62 -
src/crashreporter/UploadProgressDialog.ui | 106 -
src/crashreporter/main.cpp | 49 +-
src/crashreporter/res/CrashReporter.rc.in | 6 +-
src/miniupnpc/CMakeLists.txt | 6 +-
src/tools/CMakeLists.txt | 6 +-
src/tools/nostdset/nostdset.sh | 6 +-
src/tools/nsh2po/CMakeLists.txt | 6 +-
src/tools/nsh2po/nsh2po.cpp | 6 +-
src/tools/nsh2po/nsh2po_config.h.in | 6 +-
src/tools/po2nsh/CMakeLists.txt | 6 +-
src/tools/po2nsh/po2nsh.cpp | 6 +-
src/tools/po2ts/CMakeLists.txt | 6 +-
src/tools/po2ts/po2ts.cpp | 6 +-
src/tools/po2wxl/CMakeLists.txt | 6 +-
src/tools/po2wxl/po2wxl.cpp | 6 +-
src/tools/ts2po/CMakeLists.txt | 6 +-
src/tools/ts2po/ts2po.cpp | 6 +-
src/tools/ts2po/ts2po_config.h.in | 6 +-
src/torcontrol/AddressMap.cpp | 6 +-
src/torcontrol/AddressMap.h | 6 +-
src/torcontrol/BootstrapStatus.cpp | 6 +-
src/torcontrol/BootstrapStatus.h | 6 +-
src/torcontrol/CMakeLists.txt | 6 +-
src/torcontrol/Circuit.cpp | 6 +-
src/torcontrol/Circuit.h | 6 +-
src/torcontrol/ControlCommand.cpp | 6 +-
src/torcontrol/ControlCommand.h | 6 +-
src/torcontrol/ControlConnection.cpp | 6 +-
src/torcontrol/ControlConnection.h | 6 +-
src/torcontrol/ControlMethod.cpp | 6 +-
src/torcontrol/ControlMethod.h | 6 +-
src/torcontrol/ControlReply.cpp | 6 +-
src/torcontrol/ControlReply.h | 6 +-
src/torcontrol/ControlSocket.cpp | 6 +-
src/torcontrol/ControlSocket.h | 6 +-
src/torcontrol/LogEvent.cpp | 6 +-
src/torcontrol/LogEvent.h | 6 +-
src/torcontrol/ProtocolInfo.cpp | 6 +-
src/torcontrol/ProtocolInfo.h | 6 +-
src/torcontrol/ReplyLine.cpp | 6 +-
src/torcontrol/ReplyLine.h | 6 +-
src/torcontrol/RouterDescriptor.cpp | 6 +-
src/torcontrol/RouterDescriptor.h | 6 +-
src/torcontrol/RouterStatus.cpp | 6 +-
src/torcontrol/RouterStatus.h | 6 +-
src/torcontrol/SendCommandEvent.cpp | 6 +-
src/torcontrol/SendCommandEvent.h | 6 +-
src/torcontrol/Stream.cpp | 6 +-
src/torcontrol/Stream.h | 6 +-
src/torcontrol/TorControl.cpp | 26 +-
src/torcontrol/TorControl.h | 6 +-
src/torcontrol/TorEvents.cpp | 6 +-
src/torcontrol/TorEvents.h | 6 +-
src/torcontrol/TorProcess.cpp | 6 +-
src/torcontrol/TorProcess.h | 6 +-
src/torcontrol/TorService.cpp | 6 +-
src/torcontrol/TorService.h | 6 +-
src/torcontrol/TorSignal.cpp | 6 +-
src/torcontrol/TorSignal.h | 6 +-
src/torcontrol/tcglobal.cpp | 6 +-
src/torcontrol/tcglobal.h | 6 +-
src/vidalia/CMakeLists.txt | 207 +-
src/vidalia/ControlPasswordInputDialog.cpp | 38 +-
src/vidalia/ControlPasswordInputDialog.h | 21 +-
src/vidalia/ControlPasswordInputDialog.ui | 146 +-
src/vidalia/CrashReporter.cpp | 45 +-
src/vidalia/CrashReporter.h | 6 +-
src/vidalia/HelperProcess.cpp | 6 +-
src/vidalia/HelperProcess.h | 6 +-
src/vidalia/LanguageSupport.cpp | 6 +-
src/vidalia/LanguageSupport.h | 6 +-
src/vidalia/MainWindow.cpp | 2354 ++++++++++----------
src/vidalia/MainWindow.h | 159 +-
src/vidalia/MainWindow.ui | 634 +-----
src/vidalia/PackageInfo.cpp | 6 +-
src/vidalia/PackageInfo.h | 6 +-
src/vidalia/StatusTab.cpp | 93 +
src/vidalia/StatusTab.h | 65 +
src/vidalia/StatusTab.ui | 154 ++
src/vidalia/UpdateProcess.cpp | 6 +-
src/vidalia/UpdateProcess.h | 6 +-
src/vidalia/UpdateProgressDialog.cpp | 6 +-
src/vidalia/UpdateProgressDialog.h | 6 +-
src/vidalia/UpdatesAvailableDialog.cpp | 6 +-
src/vidalia/UpdatesAvailableDialog.h | 6 +-
src/vidalia/VClickLabel.cpp | 95 -
src/vidalia/VClickLabel.h | 59 -
src/vidalia/VMessageBox.cpp | 6 +-
src/vidalia/VMessageBox.h | 6 +-
src/vidalia/VTabWidget.cpp | 52 +
src/vidalia/{about/AboutDialog.h => VTabWidget.h} | 29 +-
src/vidalia/Vidalia.cpp | 15 +-
src/vidalia/Vidalia.h | 6 +-
src/vidalia/VidaliaTab.cpp | 66 +
src/vidalia/{VidaliaWindow.h => VidaliaTab.h} | 53 +-
src/vidalia/VidaliaWindow.cpp | 6 +-
src/vidalia/VidaliaWindow.h | 6 +-
src/vidalia/about/AboutDialog.cpp | 6 +-
src/vidalia/about/AboutDialog.h | 6 +-
src/vidalia/about/LicenseDialog.cpp | 6 +-
src/vidalia/about/LicenseDialog.h | 6 +-
src/vidalia/bwgraph/BandwidthGraph.cpp | 33 +-
src/vidalia/bwgraph/BandwidthGraph.h | 18 +-
src/vidalia/bwgraph/BandwidthGraph.ui | 903 ++++----
src/vidalia/bwgraph/GraphFrame.cpp | 6 +-
src/vidalia/bwgraph/GraphFrame.h | 6 +-
src/vidalia/config/AbstractTorSettings.cpp | 6 +-
src/vidalia/config/AbstractTorSettings.h | 6 +-
src/vidalia/config/AdvancedPage.cpp | 9 +-
src/vidalia/config/AdvancedPage.h | 6 +-
src/vidalia/config/AppearancePage.cpp | 6 +-
src/vidalia/config/AppearancePage.h | 6 +-
src/vidalia/config/BridgeDownloader.cpp | 70 +-
src/vidalia/config/BridgeDownloader.h | 23 +-
.../config/BridgeDownloaderProgressDialog.cpp | 8 +-
.../config/BridgeDownloaderProgressDialog.h | 8 +-
src/vidalia/config/BridgeUsageDialog.cpp | 6 +-
src/vidalia/config/BridgeUsageDialog.h | 6 +-
src/vidalia/config/BridgeUsageDialog.ui | 63 +-
src/vidalia/config/ConfigDialog.cpp | 6 +-
src/vidalia/config/ConfigDialog.h | 10 +-
src/vidalia/config/ConfigPage.h | 6 +-
src/vidalia/config/ConfigPageStack.cpp | 6 +-
src/vidalia/config/ConfigPageStack.h | 6 +-
src/vidalia/config/DomainValidator.cpp | 6 +-
src/vidalia/config/DomainValidator.h | 6 +-
src/vidalia/config/ExitPolicy.cpp | 6 +-
src/vidalia/config/ExitPolicy.h | 6 +-
src/vidalia/config/GeneralPage.cpp | 6 +-
src/vidalia/config/GeneralPage.h | 6 +-
src/vidalia/config/GeneralPage.ui | 109 +-
src/vidalia/config/IpValidator.cpp | 6 +-
src/vidalia/config/IpValidator.h | 6 +-
src/vidalia/config/Local8BitStringValidator.cpp | 6 +-
src/vidalia/config/Local8BitStringValidator.h | 6 +-
src/vidalia/config/NetworkPage.cpp | 10 +-
src/vidalia/config/NetworkPage.h | 6 +-
src/vidalia/config/NetworkSettings.cpp | 6 +-
src/vidalia/config/NetworkSettings.h | 6 +-
src/vidalia/config/NicknameValidator.cpp | 6 +-
src/vidalia/config/NicknameValidator.h | 6 +-
src/vidalia/config/Policy.cpp | 6 +-
src/vidalia/config/Policy.h | 6 +-
src/vidalia/config/PortValidator.cpp | 6 +-
src/vidalia/config/PortValidator.h | 6 +-
src/vidalia/config/ServerPage.cpp | 100 +-
src/vidalia/config/ServerPage.h | 6 +-
src/vidalia/config/ServerPage.ui | 9 +-
src/vidalia/config/ServerSettings.cpp | 24 +-
src/vidalia/config/ServerSettings.h | 12 +-
src/vidalia/config/Service.cpp | 6 +-
src/vidalia/config/Service.h | 6 +-
src/vidalia/config/ServiceList.cpp | 6 +-
src/vidalia/config/ServiceList.h | 6 +-
src/vidalia/config/ServicePage.cpp | 6 +-
src/vidalia/config/ServicePage.h | 7 +-
src/vidalia/config/ServicePage.ui | 117 +-
src/vidalia/config/ServiceSettings.cpp | 6 +-
src/vidalia/config/ServiceSettings.h | 6 +-
src/vidalia/config/TorSettings.cpp | 33 +-
src/vidalia/config/TorSettings.h | 15 +-
src/vidalia/config/TorrcDialog.cpp | 24 +-
src/vidalia/config/TorrcDialog.h | 7 +-
src/vidalia/config/TorrcDialog.ui | 259 +--
src/vidalia/config/UPNPControl.cpp | 6 +-
src/vidalia/config/UPNPControl.h | 6 +-
src/vidalia/config/UPNPControlThread.cpp | 6 +-
src/vidalia/config/UPNPControlThread.h | 6 +-
src/vidalia/config/UPNPTestDialog.cpp | 6 +-
src/vidalia/config/UPNPTestDialog.h | 6 +-
src/vidalia/config/VSettings.cpp | 6 +-
src/vidalia/config/VSettings.h | 6 +-
src/vidalia/config/VidaliaSettings.cpp | 6 +-
src/vidalia/config/VidaliaSettings.h | 6 +-
src/vidalia/help/browser/HelpBrowser.cpp | 6 +-
src/vidalia/help/browser/HelpBrowser.h | 6 +-
src/vidalia/help/browser/HelpTextBrowser.cpp | 6 +-
src/vidalia/help/browser/HelpTextBrowser.h | 6 +-
src/vidalia/help/content/ar/bridges.html | 8 +-
src/vidalia/help/content/ar/config.html | 193 +-
src/vidalia/help/content/ar/index.html | 8 +-
src/vidalia/help/content/ar/links.html | 8 +-
src/vidalia/help/content/ar/log.html | 8 +-
src/vidalia/help/content/ar/netview.html | 8 +-
src/vidalia/help/content/ar/running.html | 8 +-
src/vidalia/help/content/ar/server.html | 8 +-
src/vidalia/help/content/ar/services.html | 6 +-
src/vidalia/help/content/ar/troubleshooting.html | 8 +-
src/vidalia/help/content/bms/bridges.html | 6 +-
src/vidalia/help/content/bms/config.html | 6 +-
src/vidalia/help/content/bms/index.html | 6 +-
src/vidalia/help/content/bms/links.html | 6 +-
src/vidalia/help/content/bms/log.html | 6 +-
src/vidalia/help/content/bms/netview.html | 6 +-
src/vidalia/help/content/bms/running.html | 6 +-
src/vidalia/help/content/bms/server.html | 6 +-
src/vidalia/help/content/bms/services.html | 6 +-
src/vidalia/help/content/bms/troubleshooting.html | 6 +-
src/vidalia/help/content/de/config.html | 6 +-
src/vidalia/help/content/de/index.html | 6 +-
src/vidalia/help/content/de/links.html | 6 +-
src/vidalia/help/content/de/log.html | 6 +-
src/vidalia/help/content/de/netview.html | 6 +-
src/vidalia/help/content/de/running.html | 6 +-
src/vidalia/help/content/de/server.html | 6 +-
src/vidalia/help/content/de/troubleshooting.html | 6 +-
src/vidalia/help/content/en/bridges.html | 6 +-
src/vidalia/help/content/en/config.html | 6 +-
src/vidalia/help/content/en/contents.xml | 6 +-
src/vidalia/help/content/en/index.html | 6 +-
src/vidalia/help/content/en/links.html | 38 +-
src/vidalia/help/content/en/log.html | 6 +-
src/vidalia/help/content/en/netview.html | 6 +-
src/vidalia/help/content/en/running.html | 6 +-
src/vidalia/help/content/en/server.html | 6 +-
src/vidalia/help/content/en/services.html | 6 +-
src/vidalia/help/content/en/troubleshooting.html | 6 +-
src/vidalia/help/content/es/bridges.html | 8 +-
src/vidalia/help/content/fa/bridges.html | 8 +-
src/vidalia/help/content/fa/config.html | 8 +-
src/vidalia/help/content/fa/index.html | 8 +-
src/vidalia/help/content/fa/links.html | 8 +-
src/vidalia/help/content/fa/log.html | 8 +-
src/vidalia/help/content/fa/netview.html | 8 +-
src/vidalia/help/content/fa/running.html | 8 +-
src/vidalia/help/content/fa/server.html | 8 +-
src/vidalia/help/content/fa/services.html | 6 +-
src/vidalia/help/content/fa/troubleshooting.html | 8 +-
src/vidalia/help/content/fi/bridges.html | 6 +-
src/vidalia/help/content/fi/config.html | 6 +-
src/vidalia/help/content/fi/index.html | 6 +-
src/vidalia/help/content/fi/links.html | 6 +-
src/vidalia/help/content/fi/log.html | 6 +-
src/vidalia/help/content/fi/netview.html | 6 +-
src/vidalia/help/content/fi/running.html | 6 +-
src/vidalia/help/content/fi/server.html | 6 +-
src/vidalia/help/content/fi/troubleshooting.html | 6 +-
src/vidalia/help/content/fr/bridges.html | 6 +-
src/vidalia/help/content/fr/config.html | 6 +-
src/vidalia/help/content/fr/index.html | 6 +-
src/vidalia/help/content/fr/links.html | 6 +-
src/vidalia/help/content/fr/log.html | 6 +-
src/vidalia/help/content/fr/netview.html | 6 +-
src/vidalia/help/content/fr/running.html | 6 +-
src/vidalia/help/content/fr/server.html | 6 +-
src/vidalia/help/content/fr/services.html | 6 +-
src/vidalia/help/content/fr/troubleshooting.html | 6 +-
src/vidalia/help/content/it/links.html | 8 +-
src/vidalia/help/content/my/bridges.html | 8 +-
src/vidalia/help/content/my/config.html | 8 +-
src/vidalia/help/content/my/index.html | 8 +-
src/vidalia/help/content/my/links.html | 8 +-
src/vidalia/help/content/my/log.html | 8 +-
src/vidalia/help/content/my/netview.html | 8 +-
src/vidalia/help/content/my/running.html | 8 +-
src/vidalia/help/content/my/server.html | 8 +-
src/vidalia/help/content/my/services.html | 6 +-
src/vidalia/help/content/my/troubleshooting.html | 8 +-
src/vidalia/help/content/nl/index.html | 8 +-
src/vidalia/help/content/nl/links.html | 8 +-
src/vidalia/help/content/nl/running.html | 8 +-
src/vidalia/help/content/pl/bridges.html | 8 +-
src/vidalia/help/content/pl/index.html | 8 +-
src/vidalia/help/content/pl/links.html | 8 +-
src/vidalia/help/content/po/.tx/config | 20 +-
src/vidalia/help/content/po/af/config.po | 4 +-
src/vidalia/help/content/po/af/index.po | 4 +-
src/vidalia/help/content/po/af/links.po | 80 +-
src/vidalia/help/content/po/af/log.po | 4 +-
src/vidalia/help/content/po/af/netview.po | 37 +-
src/vidalia/help/content/po/af/running.po | 4 +-
src/vidalia/help/content/po/af/server.po | 4 +-
src/vidalia/help/content/po/af/services.po | 4 +-
src/vidalia/help/content/po/af/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ak/config.po | 4 +-
src/vidalia/help/content/po/ak/index.po | 4 +-
src/vidalia/help/content/po/ak/links.po | 80 +-
src/vidalia/help/content/po/ak/log.po | 4 +-
src/vidalia/help/content/po/ak/netview.po | 37 +-
src/vidalia/help/content/po/ak/running.po | 4 +-
src/vidalia/help/content/po/ak/server.po | 4 +-
src/vidalia/help/content/po/ak/services.po | 4 +-
src/vidalia/help/content/po/ak/troubleshooting.po | 4 +-
src/vidalia/help/content/po/am/config.po | 4 +-
src/vidalia/help/content/po/am/index.po | 4 +-
src/vidalia/help/content/po/am/links.po | 80 +-
src/vidalia/help/content/po/am/log.po | 4 +-
src/vidalia/help/content/po/am/netview.po | 37 +-
src/vidalia/help/content/po/am/running.po | 4 +-
src/vidalia/help/content/po/am/server.po | 4 +-
src/vidalia/help/content/po/am/services.po | 4 +-
src/vidalia/help/content/po/am/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ar/config.po | 279 ++-
src/vidalia/help/content/po/ar/index.po | 4 +-
src/vidalia/help/content/po/ar/links.po | 94 +-
src/vidalia/help/content/po/ar/log.po | 4 +-
src/vidalia/help/content/po/ar/netview.po | 4 +-
src/vidalia/help/content/po/ar/running.po | 4 +-
src/vidalia/help/content/po/ar/server.po | 4 +-
src/vidalia/help/content/po/ar/services.po | 4 +-
src/vidalia/help/content/po/ar/troubleshooting.po | 4 +-
src/vidalia/help/content/po/arn/config.po | 4 +-
src/vidalia/help/content/po/arn/index.po | 4 +-
src/vidalia/help/content/po/arn/links.po | 80 +-
src/vidalia/help/content/po/arn/log.po | 4 +-
src/vidalia/help/content/po/arn/netview.po | 37 +-
src/vidalia/help/content/po/arn/running.po | 4 +-
src/vidalia/help/content/po/arn/server.po | 4 +-
src/vidalia/help/content/po/arn/services.po | 4 +-
src/vidalia/help/content/po/arn/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ast/config.po | 4 +-
src/vidalia/help/content/po/ast/index.po | 4 +-
src/vidalia/help/content/po/ast/links.po | 80 +-
src/vidalia/help/content/po/ast/log.po | 4 +-
src/vidalia/help/content/po/ast/netview.po | 37 +-
src/vidalia/help/content/po/ast/running.po | 4 +-
src/vidalia/help/content/po/ast/server.po | 4 +-
src/vidalia/help/content/po/ast/services.po | 4 +-
src/vidalia/help/content/po/ast/troubleshooting.po | 4 +-
src/vidalia/help/content/po/az/config.po | 4 +-
src/vidalia/help/content/po/az/index.po | 4 +-
src/vidalia/help/content/po/az/links.po | 80 +-
src/vidalia/help/content/po/az/log.po | 4 +-
src/vidalia/help/content/po/az/netview.po | 37 +-
src/vidalia/help/content/po/az/running.po | 4 +-
src/vidalia/help/content/po/az/server.po | 4 +-
src/vidalia/help/content/po/az/services.po | 4 +-
src/vidalia/help/content/po/az/troubleshooting.po | 4 +-
src/vidalia/help/content/po/be/config.po | 4 +-
src/vidalia/help/content/po/be/index.po | 4 +-
src/vidalia/help/content/po/be/links.po | 80 +-
src/vidalia/help/content/po/be/log.po | 4 +-
src/vidalia/help/content/po/be/netview.po | 37 +-
src/vidalia/help/content/po/be/running.po | 4 +-
src/vidalia/help/content/po/be/server.po | 4 +-
src/vidalia/help/content/po/be/services.po | 4 +-
src/vidalia/help/content/po/be/troubleshooting.po | 4 +-
src/vidalia/help/content/po/bg/config.po | 4 +-
src/vidalia/help/content/po/bg/index.po | 4 +-
src/vidalia/help/content/po/bg/links.po | 80 +-
src/vidalia/help/content/po/bg/log.po | 4 +-
src/vidalia/help/content/po/bg/netview.po | 37 +-
src/vidalia/help/content/po/bg/running.po | 4 +-
src/vidalia/help/content/po/bg/server.po | 4 +-
src/vidalia/help/content/po/bg/services.po | 4 +-
src/vidalia/help/content/po/bg/troubleshooting.po | 4 +-
src/vidalia/help/content/po/bn/config.po | 4 +-
src/vidalia/help/content/po/bn/index.po | 4 +-
src/vidalia/help/content/po/bn/links.po | 80 +-
src/vidalia/help/content/po/bn/log.po | 4 +-
src/vidalia/help/content/po/bn/netview.po | 37 +-
src/vidalia/help/content/po/bn/running.po | 4 +-
src/vidalia/help/content/po/bn/server.po | 4 +-
src/vidalia/help/content/po/bn/services.po | 4 +-
src/vidalia/help/content/po/bn/troubleshooting.po | 4 +-
src/vidalia/help/content/po/bn_IN/config.po | 4 +-
src/vidalia/help/content/po/bn_IN/index.po | 4 +-
src/vidalia/help/content/po/bn_IN/links.po | 80 +-
src/vidalia/help/content/po/bn_IN/log.po | 4 +-
src/vidalia/help/content/po/bn_IN/netview.po | 37 +-
src/vidalia/help/content/po/bn_IN/running.po | 4 +-
src/vidalia/help/content/po/bn_IN/server.po | 4 +-
src/vidalia/help/content/po/bn_IN/services.po | 4 +-
.../help/content/po/bn_IN/troubleshooting.po | 4 +-
src/vidalia/help/content/po/bo/bridges.po | 4 +-
src/vidalia/help/content/po/bo/config.po | 4 +-
src/vidalia/help/content/po/bo/index.po | 4 +-
src/vidalia/help/content/po/bo/links.po | 4 +-
src/vidalia/help/content/po/bo/log.po | 4 +-
src/vidalia/help/content/po/bo/netview.po | 4 +-
src/vidalia/help/content/po/bo/running.po | 4 +-
src/vidalia/help/content/po/bo/server.po | 4 +-
src/vidalia/help/content/po/bo/services.po | 4 +-
src/vidalia/help/content/po/bo/troubleshooting.po | 4 +-
src/vidalia/help/content/po/br/bridges.po | 4 +-
src/vidalia/help/content/po/br/config.po | 4 +-
src/vidalia/help/content/po/br/index.po | 4 +-
src/vidalia/help/content/po/br/links.po | 4 +-
src/vidalia/help/content/po/br/log.po | 4 +-
src/vidalia/help/content/po/br/netview.po | 4 +-
src/vidalia/help/content/po/br/running.po | 4 +-
src/vidalia/help/content/po/br/server.po | 4 +-
src/vidalia/help/content/po/br/services.po | 4 +-
src/vidalia/help/content/po/br/troubleshooting.po | 4 +-
src/vidalia/help/content/po/bs/bridges.po | 4 +-
src/vidalia/help/content/po/bs/config.po | 4 +-
src/vidalia/help/content/po/bs/index.po | 4 +-
src/vidalia/help/content/po/bs/links.po | 4 +-
src/vidalia/help/content/po/bs/log.po | 4 +-
src/vidalia/help/content/po/bs/netview.po | 4 +-
src/vidalia/help/content/po/bs/running.po | 4 +-
src/vidalia/help/content/po/bs/server.po | 4 +-
src/vidalia/help/content/po/bs/services.po | 4 +-
src/vidalia/help/content/po/bs/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ca/config.po | 4 +-
src/vidalia/help/content/po/ca/index.po | 4 +-
src/vidalia/help/content/po/ca/links.po | 98 +-
src/vidalia/help/content/po/ca/log.po | 4 +-
src/vidalia/help/content/po/ca/netview.po | 37 +-
src/vidalia/help/content/po/ca/running.po | 4 +-
src/vidalia/help/content/po/ca/server.po | 4 +-
src/vidalia/help/content/po/ca/services.po | 4 +-
src/vidalia/help/content/po/ca/troubleshooting.po | 4 +-
src/vidalia/help/content/po/cs/config.po | 4 +-
src/vidalia/help/content/po/cs/index.po | 4 +-
src/vidalia/help/content/po/cs/links.po | 80 +-
src/vidalia/help/content/po/cs/log.po | 4 +-
src/vidalia/help/content/po/cs/netview.po | 37 +-
src/vidalia/help/content/po/cs/running.po | 4 +-
src/vidalia/help/content/po/cs/server.po | 4 +-
src/vidalia/help/content/po/cs/services.po | 4 +-
src/vidalia/help/content/po/cs/troubleshooting.po | 4 +-
src/vidalia/help/content/po/csb/config.po | 4 +-
src/vidalia/help/content/po/csb/index.po | 4 +-
src/vidalia/help/content/po/csb/links.po | 80 +-
src/vidalia/help/content/po/csb/log.po | 4 +-
src/vidalia/help/content/po/csb/netview.po | 37 +-
src/vidalia/help/content/po/csb/running.po | 4 +-
src/vidalia/help/content/po/csb/server.po | 4 +-
src/vidalia/help/content/po/csb/services.po | 4 +-
src/vidalia/help/content/po/csb/troubleshooting.po | 4 +-
src/vidalia/help/content/po/cy/config.po | 4 +-
src/vidalia/help/content/po/cy/index.po | 4 +-
src/vidalia/help/content/po/cy/links.po | 80 +-
src/vidalia/help/content/po/cy/log.po | 4 +-
src/vidalia/help/content/po/cy/netview.po | 37 +-
src/vidalia/help/content/po/cy/running.po | 4 +-
src/vidalia/help/content/po/cy/server.po | 4 +-
src/vidalia/help/content/po/cy/services.po | 4 +-
src/vidalia/help/content/po/cy/troubleshooting.po | 4 +-
src/vidalia/help/content/po/da/bridges.po | 4 +-
src/vidalia/help/content/po/da/config.po | 132 +-
src/vidalia/help/content/po/da/index.po | 4 +-
src/vidalia/help/content/po/da/links.po | 4 +-
src/vidalia/help/content/po/da/log.po | 4 +-
src/vidalia/help/content/po/da/netview.po | 4 +-
src/vidalia/help/content/po/da/running.po | 4 +-
src/vidalia/help/content/po/da/server.po | 4 +-
src/vidalia/help/content/po/da/services.po | 4 +-
src/vidalia/help/content/po/da/troubleshooting.po | 4 +-
src/vidalia/help/content/po/de/bridges.po | 4 +-
src/vidalia/help/content/po/de/config.po | 4 +-
src/vidalia/help/content/po/de/index.po | 4 +-
src/vidalia/help/content/po/de/links.po | 4 +-
src/vidalia/help/content/po/de/log.po | 4 +-
src/vidalia/help/content/po/de/netview.po | 4 +-
src/vidalia/help/content/po/de/running.po | 4 +-
src/vidalia/help/content/po/de/server.po | 4 +-
src/vidalia/help/content/po/de/services.po | 4 +-
src/vidalia/help/content/po/de/troubleshooting.po | 4 +-
src/vidalia/help/content/po/dz/config.po | 4 +-
src/vidalia/help/content/po/dz/index.po | 4 +-
src/vidalia/help/content/po/dz/links.po | 80 +-
src/vidalia/help/content/po/dz/log.po | 4 +-
src/vidalia/help/content/po/dz/netview.po | 37 +-
src/vidalia/help/content/po/dz/running.po | 4 +-
src/vidalia/help/content/po/dz/server.po | 4 +-
src/vidalia/help/content/po/dz/services.po | 4 +-
src/vidalia/help/content/po/dz/troubleshooting.po | 4 +-
src/vidalia/help/content/po/el/config.po | 4 +-
src/vidalia/help/content/po/el/index.po | 4 +-
src/vidalia/help/content/po/el/links.po | 80 +-
src/vidalia/help/content/po/el/log.po | 4 +-
src/vidalia/help/content/po/el/netview.po | 37 +-
src/vidalia/help/content/po/el/running.po | 4 +-
src/vidalia/help/content/po/el/server.po | 4 +-
src/vidalia/help/content/po/el/services.po | 4 +-
src/vidalia/help/content/po/el/troubleshooting.po | 4 +-
src/vidalia/help/content/po/en/bridges.po | 4 +-
src/vidalia/help/content/po/en/config.po | 4 +-
src/vidalia/help/content/po/en/index.po | 4 +-
src/vidalia/help/content/po/en/links.po | 4 +-
src/vidalia/help/content/po/en/log.po | 4 +-
src/vidalia/help/content/po/en/netview.po | 4 +-
src/vidalia/help/content/po/en/running.po | 4 +-
src/vidalia/help/content/po/en/server.po | 4 +-
src/vidalia/help/content/po/en/services.po | 4 +-
src/vidalia/help/content/po/en/troubleshooting.po | 4 +-
src/vidalia/help/content/po/eo/config.po | 4 +-
src/vidalia/help/content/po/eo/index.po | 4 +-
src/vidalia/help/content/po/eo/links.po | 80 +-
src/vidalia/help/content/po/eo/log.po | 4 +-
src/vidalia/help/content/po/eo/netview.po | 37 +-
src/vidalia/help/content/po/eo/running.po | 4 +-
src/vidalia/help/content/po/eo/server.po | 4 +-
src/vidalia/help/content/po/eo/services.po | 4 +-
src/vidalia/help/content/po/eo/troubleshooting.po | 4 +-
src/vidalia/help/content/po/es/config.po | 4 +-
src/vidalia/help/content/po/es/index.po | 4 +-
src/vidalia/help/content/po/es/links.po | 82 +-
src/vidalia/help/content/po/es/log.po | 4 +-
src/vidalia/help/content/po/es/netview.po | 4 +-
src/vidalia/help/content/po/es/running.po | 4 +-
src/vidalia/help/content/po/es/server.po | 4 +-
src/vidalia/help/content/po/es/services.po | 4 +-
src/vidalia/help/content/po/es/troubleshooting.po | 4 +-
src/vidalia/help/content/po/et/config.po | 4 +-
src/vidalia/help/content/po/et/index.po | 4 +-
src/vidalia/help/content/po/et/links.po | 80 +-
src/vidalia/help/content/po/et/log.po | 4 +-
src/vidalia/help/content/po/et/netview.po | 37 +-
src/vidalia/help/content/po/et/running.po | 4 +-
src/vidalia/help/content/po/et/server.po | 4 +-
src/vidalia/help/content/po/et/services.po | 4 +-
src/vidalia/help/content/po/et/troubleshooting.po | 4 +-
src/vidalia/help/content/po/eu/config.po | 4 +-
src/vidalia/help/content/po/eu/index.po | 4 +-
src/vidalia/help/content/po/eu/links.po | 80 +-
src/vidalia/help/content/po/eu/log.po | 4 +-
src/vidalia/help/content/po/eu/netview.po | 37 +-
src/vidalia/help/content/po/eu/running.po | 4 +-
src/vidalia/help/content/po/eu/server.po | 4 +-
src/vidalia/help/content/po/eu/services.po | 4 +-
src/vidalia/help/content/po/eu/troubleshooting.po | 4 +-
src/vidalia/help/content/po/fa/bridges.po | 4 +-
src/vidalia/help/content/po/fa/config.po | 4 +-
src/vidalia/help/content/po/fa/index.po | 4 +-
src/vidalia/help/content/po/fa/links.po | 4 +-
src/vidalia/help/content/po/fa/log.po | 4 +-
src/vidalia/help/content/po/fa/netview.po | 4 +-
src/vidalia/help/content/po/fa/running.po | 4 +-
src/vidalia/help/content/po/fa/server.po | 4 +-
src/vidalia/help/content/po/fa/services.po | 4 +-
src/vidalia/help/content/po/fa/troubleshooting.po | 4 +-
src/vidalia/help/content/po/fi/bridges.po | 4 +-
src/vidalia/help/content/po/fi/config.po | 4 +-
src/vidalia/help/content/po/fi/index.po | 4 +-
src/vidalia/help/content/po/fi/links.po | 4 +-
src/vidalia/help/content/po/fi/log.po | 4 +-
src/vidalia/help/content/po/fi/netview.po | 4 +-
src/vidalia/help/content/po/fi/running.po | 4 +-
src/vidalia/help/content/po/fi/server.po | 4 +-
src/vidalia/help/content/po/fi/services.po | 4 +-
src/vidalia/help/content/po/fi/troubleshooting.po | 4 +-
src/vidalia/help/content/po/fil/config.po | 4 +-
src/vidalia/help/content/po/fil/index.po | 4 +-
src/vidalia/help/content/po/fil/links.po | 80 +-
src/vidalia/help/content/po/fil/log.po | 4 +-
src/vidalia/help/content/po/fil/netview.po | 37 +-
src/vidalia/help/content/po/fil/running.po | 4 +-
src/vidalia/help/content/po/fil/server.po | 4 +-
src/vidalia/help/content/po/fil/services.po | 4 +-
src/vidalia/help/content/po/fil/troubleshooting.po | 4 +-
src/vidalia/help/content/po/fo/bridges.po | 4 +-
src/vidalia/help/content/po/fo/config.po | 4 +-
src/vidalia/help/content/po/fo/index.po | 4 +-
src/vidalia/help/content/po/fo/links.po | 4 +-
src/vidalia/help/content/po/fo/log.po | 4 +-
src/vidalia/help/content/po/fo/netview.po | 4 +-
src/vidalia/help/content/po/fo/running.po | 4 +-
src/vidalia/help/content/po/fo/server.po | 4 +-
src/vidalia/help/content/po/fo/services.po | 4 +-
src/vidalia/help/content/po/fo/troubleshooting.po | 4 +-
src/vidalia/help/content/po/fr/config.po | 4 +-
src/vidalia/help/content/po/fr/index.po | 4 +-
src/vidalia/help/content/po/fr/links.po | 91 +-
src/vidalia/help/content/po/fr/log.po | 4 +-
src/vidalia/help/content/po/fr/netview.po | 4 +-
src/vidalia/help/content/po/fr/running.po | 4 +-
src/vidalia/help/content/po/fr/server.po | 4 +-
src/vidalia/help/content/po/fr/services.po | 4 +-
src/vidalia/help/content/po/fr/troubleshooting.po | 4 +-
src/vidalia/help/content/po/fur/config.po | 4 +-
src/vidalia/help/content/po/fur/index.po | 4 +-
src/vidalia/help/content/po/fur/links.po | 80 +-
src/vidalia/help/content/po/fur/log.po | 4 +-
src/vidalia/help/content/po/fur/netview.po | 37 +-
src/vidalia/help/content/po/fur/running.po | 4 +-
src/vidalia/help/content/po/fur/server.po | 4 +-
src/vidalia/help/content/po/fur/services.po | 4 +-
src/vidalia/help/content/po/fur/troubleshooting.po | 4 +-
src/vidalia/help/content/po/fy/bridges.po | 4 +-
src/vidalia/help/content/po/fy/config.po | 4 +-
src/vidalia/help/content/po/fy/index.po | 4 +-
src/vidalia/help/content/po/fy/links.po | 4 +-
src/vidalia/help/content/po/fy/log.po | 4 +-
src/vidalia/help/content/po/fy/netview.po | 4 +-
src/vidalia/help/content/po/fy/running.po | 4 +-
src/vidalia/help/content/po/fy/server.po | 4 +-
src/vidalia/help/content/po/fy/services.po | 4 +-
src/vidalia/help/content/po/fy/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ga/config.po | 4 +-
src/vidalia/help/content/po/ga/index.po | 4 +-
src/vidalia/help/content/po/ga/links.po | 80 +-
src/vidalia/help/content/po/ga/log.po | 4 +-
src/vidalia/help/content/po/ga/netview.po | 37 +-
src/vidalia/help/content/po/ga/running.po | 4 +-
src/vidalia/help/content/po/ga/server.po | 4 +-
src/vidalia/help/content/po/ga/services.po | 4 +-
src/vidalia/help/content/po/ga/troubleshooting.po | 4 +-
src/vidalia/help/content/po/gl/config.po | 4 +-
src/vidalia/help/content/po/gl/index.po | 4 +-
src/vidalia/help/content/po/gl/links.po | 80 +-
src/vidalia/help/content/po/gl/log.po | 4 +-
src/vidalia/help/content/po/gl/netview.po | 37 +-
src/vidalia/help/content/po/gl/running.po | 4 +-
src/vidalia/help/content/po/gl/server.po | 4 +-
src/vidalia/help/content/po/gl/services.po | 4 +-
src/vidalia/help/content/po/gl/troubleshooting.po | 4 +-
src/vidalia/help/content/po/gu/config.po | 4 +-
src/vidalia/help/content/po/gu/index.po | 4 +-
src/vidalia/help/content/po/gu/links.po | 80 +-
src/vidalia/help/content/po/gu/log.po | 4 +-
src/vidalia/help/content/po/gu/netview.po | 37 +-
src/vidalia/help/content/po/gu/running.po | 4 +-
src/vidalia/help/content/po/gu/server.po | 4 +-
src/vidalia/help/content/po/gu/services.po | 4 +-
src/vidalia/help/content/po/gu/troubleshooting.po | 4 +-
src/vidalia/help/content/po/gun/config.po | 4 +-
src/vidalia/help/content/po/gun/index.po | 4 +-
src/vidalia/help/content/po/gun/links.po | 80 +-
src/vidalia/help/content/po/gun/log.po | 4 +-
src/vidalia/help/content/po/gun/netview.po | 37 +-
src/vidalia/help/content/po/gun/running.po | 4 +-
src/vidalia/help/content/po/gun/server.po | 4 +-
src/vidalia/help/content/po/gun/services.po | 4 +-
src/vidalia/help/content/po/gun/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ha/config.po | 4 +-
src/vidalia/help/content/po/ha/index.po | 4 +-
src/vidalia/help/content/po/ha/links.po | 80 +-
src/vidalia/help/content/po/ha/log.po | 4 +-
src/vidalia/help/content/po/ha/netview.po | 37 +-
src/vidalia/help/content/po/ha/running.po | 4 +-
src/vidalia/help/content/po/ha/server.po | 4 +-
src/vidalia/help/content/po/ha/services.po | 4 +-
src/vidalia/help/content/po/ha/troubleshooting.po | 4 +-
src/vidalia/help/content/po/he/config.po | 4 +-
src/vidalia/help/content/po/he/index.po | 4 +-
src/vidalia/help/content/po/he/links.po | 80 +-
src/vidalia/help/content/po/he/log.po | 4 +-
src/vidalia/help/content/po/he/netview.po | 37 +-
src/vidalia/help/content/po/he/running.po | 4 +-
src/vidalia/help/content/po/he/server.po | 4 +-
src/vidalia/help/content/po/he/services.po | 4 +-
src/vidalia/help/content/po/he/troubleshooting.po | 4 +-
src/vidalia/help/content/po/hi/config.po | 4 +-
src/vidalia/help/content/po/hi/index.po | 4 +-
src/vidalia/help/content/po/hi/links.po | 80 +-
src/vidalia/help/content/po/hi/log.po | 4 +-
src/vidalia/help/content/po/hi/netview.po | 37 +-
src/vidalia/help/content/po/hi/running.po | 4 +-
src/vidalia/help/content/po/hi/server.po | 4 +-
src/vidalia/help/content/po/hi/services.po | 4 +-
src/vidalia/help/content/po/hi/troubleshooting.po | 4 +-
src/vidalia/help/content/po/hr/config.po | 4 +-
src/vidalia/help/content/po/hr/index.po | 4 +-
src/vidalia/help/content/po/hr/links.po | 80 +-
src/vidalia/help/content/po/hr/log.po | 4 +-
src/vidalia/help/content/po/hr/netview.po | 37 +-
src/vidalia/help/content/po/hr/running.po | 4 +-
src/vidalia/help/content/po/hr/server.po | 4 +-
src/vidalia/help/content/po/hr/services.po | 4 +-
src/vidalia/help/content/po/hr/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ht/config.po | 4 +-
src/vidalia/help/content/po/ht/index.po | 4 +-
src/vidalia/help/content/po/ht/links.po | 80 +-
src/vidalia/help/content/po/ht/log.po | 4 +-
src/vidalia/help/content/po/ht/netview.po | 37 +-
src/vidalia/help/content/po/ht/running.po | 4 +-
src/vidalia/help/content/po/ht/server.po | 4 +-
src/vidalia/help/content/po/ht/services.po | 4 +-
src/vidalia/help/content/po/ht/troubleshooting.po | 4 +-
src/vidalia/help/content/po/hu/config.po | 4 +-
src/vidalia/help/content/po/hu/index.po | 4 +-
src/vidalia/help/content/po/hu/links.po | 80 +-
src/vidalia/help/content/po/hu/log.po | 4 +-
src/vidalia/help/content/po/hu/netview.po | 37 +-
src/vidalia/help/content/po/hu/running.po | 4 +-
src/vidalia/help/content/po/hu/server.po | 4 +-
src/vidalia/help/content/po/hu/services.po | 4 +-
src/vidalia/help/content/po/hu/troubleshooting.po | 4 +-
src/vidalia/help/content/po/hy/bridges.po | 4 +-
src/vidalia/help/content/po/hy/config.po | 4 +-
src/vidalia/help/content/po/hy/index.po | 4 +-
src/vidalia/help/content/po/hy/links.po | 4 +-
src/vidalia/help/content/po/hy/log.po | 4 +-
src/vidalia/help/content/po/hy/netview.po | 4 +-
src/vidalia/help/content/po/hy/running.po | 4 +-
src/vidalia/help/content/po/hy/server.po | 4 +-
src/vidalia/help/content/po/hy/services.po | 4 +-
src/vidalia/help/content/po/hy/troubleshooting.po | 4 +-
src/vidalia/help/content/po/id/config.po | 4 +-
src/vidalia/help/content/po/id/index.po | 4 +-
src/vidalia/help/content/po/id/links.po | 80 +-
src/vidalia/help/content/po/id/log.po | 4 +-
src/vidalia/help/content/po/id/netview.po | 37 +-
src/vidalia/help/content/po/id/running.po | 4 +-
src/vidalia/help/content/po/id/server.po | 4 +-
src/vidalia/help/content/po/id/services.po | 4 +-
src/vidalia/help/content/po/id/troubleshooting.po | 4 +-
src/vidalia/help/content/po/is/config.po | 4 +-
src/vidalia/help/content/po/is/index.po | 4 +-
src/vidalia/help/content/po/is/links.po | 80 +-
src/vidalia/help/content/po/is/log.po | 4 +-
src/vidalia/help/content/po/is/netview.po | 37 +-
src/vidalia/help/content/po/is/running.po | 4 +-
src/vidalia/help/content/po/is/server.po | 4 +-
src/vidalia/help/content/po/is/services.po | 4 +-
src/vidalia/help/content/po/is/troubleshooting.po | 4 +-
src/vidalia/help/content/po/it/config.po | 4 +-
src/vidalia/help/content/po/it/index.po | 4 +-
src/vidalia/help/content/po/it/links.po | 92 +-
src/vidalia/help/content/po/it/log.po | 4 +-
src/vidalia/help/content/po/it/netview.po | 4 +-
src/vidalia/help/content/po/it/running.po | 4 +-
src/vidalia/help/content/po/it/server.po | 4 +-
src/vidalia/help/content/po/it/services.po | 4 +-
src/vidalia/help/content/po/it/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ja/bridges.po | 4 +-
src/vidalia/help/content/po/ja/config.po | 4 +-
src/vidalia/help/content/po/ja/index.po | 4 +-
src/vidalia/help/content/po/ja/links.po | 4 +-
src/vidalia/help/content/po/ja/log.po | 4 +-
src/vidalia/help/content/po/ja/netview.po | 4 +-
src/vidalia/help/content/po/ja/running.po | 4 +-
src/vidalia/help/content/po/ja/server.po | 4 +-
src/vidalia/help/content/po/ja/services.po | 4 +-
src/vidalia/help/content/po/ja/troubleshooting.po | 4 +-
src/vidalia/help/content/po/jv/bridges.po | 4 +-
src/vidalia/help/content/po/jv/config.po | 4 +-
src/vidalia/help/content/po/jv/index.po | 4 +-
src/vidalia/help/content/po/jv/links.po | 4 +-
src/vidalia/help/content/po/jv/log.po | 4 +-
src/vidalia/help/content/po/jv/netview.po | 4 +-
src/vidalia/help/content/po/jv/running.po | 4 +-
src/vidalia/help/content/po/jv/server.po | 4 +-
src/vidalia/help/content/po/jv/services.po | 4 +-
src/vidalia/help/content/po/jv/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ka/bridges.po | 4 +-
src/vidalia/help/content/po/ka/config.po | 4 +-
src/vidalia/help/content/po/ka/index.po | 4 +-
src/vidalia/help/content/po/ka/links.po | 4 +-
src/vidalia/help/content/po/ka/log.po | 4 +-
src/vidalia/help/content/po/ka/netview.po | 4 +-
src/vidalia/help/content/po/ka/running.po | 4 +-
src/vidalia/help/content/po/ka/server.po | 4 +-
src/vidalia/help/content/po/ka/services.po | 4 +-
src/vidalia/help/content/po/ka/troubleshooting.po | 4 +-
src/vidalia/help/content/po/km/bridges.po | 4 +-
src/vidalia/help/content/po/km/config.po | 4 +-
src/vidalia/help/content/po/km/index.po | 4 +-
src/vidalia/help/content/po/km/links.po | 4 +-
src/vidalia/help/content/po/km/log.po | 4 +-
src/vidalia/help/content/po/km/netview.po | 4 +-
src/vidalia/help/content/po/km/running.po | 4 +-
src/vidalia/help/content/po/km/server.po | 4 +-
src/vidalia/help/content/po/km/services.po | 4 +-
src/vidalia/help/content/po/km/troubleshooting.po | 4 +-
src/vidalia/help/content/po/kn/config.po | 4 +-
src/vidalia/help/content/po/kn/index.po | 4 +-
src/vidalia/help/content/po/kn/links.po | 80 +-
src/vidalia/help/content/po/kn/log.po | 4 +-
src/vidalia/help/content/po/kn/netview.po | 37 +-
src/vidalia/help/content/po/kn/running.po | 4 +-
src/vidalia/help/content/po/kn/server.po | 4 +-
src/vidalia/help/content/po/kn/services.po | 4 +-
src/vidalia/help/content/po/kn/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ko/bridges.po | 4 +-
src/vidalia/help/content/po/ko/config.po | 4 +-
src/vidalia/help/content/po/ko/index.po | 4 +-
src/vidalia/help/content/po/ko/links.po | 4 +-
src/vidalia/help/content/po/ko/log.po | 4 +-
src/vidalia/help/content/po/ko/netview.po | 4 +-
src/vidalia/help/content/po/ko/running.po | 4 +-
src/vidalia/help/content/po/ko/server.po | 4 +-
src/vidalia/help/content/po/ko/services.po | 4 +-
src/vidalia/help/content/po/ko/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ku/bridges.po | 4 +-
src/vidalia/help/content/po/ku/config.po | 4 +-
src/vidalia/help/content/po/ku/index.po | 4 +-
src/vidalia/help/content/po/ku/links.po | 4 +-
src/vidalia/help/content/po/ku/log.po | 4 +-
src/vidalia/help/content/po/ku/netview.po | 4 +-
src/vidalia/help/content/po/ku/running.po | 4 +-
src/vidalia/help/content/po/ku/server.po | 4 +-
src/vidalia/help/content/po/ku/services.po | 4 +-
src/vidalia/help/content/po/ku/troubleshooting.po | 4 +-
src/vidalia/help/content/po/kw/config.po | 4 +-
src/vidalia/help/content/po/kw/index.po | 4 +-
src/vidalia/help/content/po/kw/links.po | 80 +-
src/vidalia/help/content/po/kw/log.po | 4 +-
src/vidalia/help/content/po/kw/netview.po | 37 +-
src/vidalia/help/content/po/kw/running.po | 4 +-
src/vidalia/help/content/po/kw/server.po | 4 +-
src/vidalia/help/content/po/kw/services.po | 4 +-
src/vidalia/help/content/po/kw/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ky/bridges.po | 4 +-
src/vidalia/help/content/po/ky/config.po | 4 +-
src/vidalia/help/content/po/ky/index.po | 4 +-
src/vidalia/help/content/po/ky/links.po | 4 +-
src/vidalia/help/content/po/ky/log.po | 4 +-
src/vidalia/help/content/po/ky/netview.po | 4 +-
src/vidalia/help/content/po/ky/running.po | 4 +-
src/vidalia/help/content/po/ky/server.po | 4 +-
src/vidalia/help/content/po/ky/services.po | 4 +-
src/vidalia/help/content/po/ky/troubleshooting.po | 4 +-
src/vidalia/help/content/po/lb/config.po | 4 +-
src/vidalia/help/content/po/lb/index.po | 4 +-
src/vidalia/help/content/po/lb/links.po | 80 +-
src/vidalia/help/content/po/lb/log.po | 4 +-
src/vidalia/help/content/po/lb/netview.po | 37 +-
src/vidalia/help/content/po/lb/running.po | 4 +-
src/vidalia/help/content/po/lb/server.po | 4 +-
src/vidalia/help/content/po/lb/services.po | 4 +-
src/vidalia/help/content/po/lb/troubleshooting.po | 4 +-
src/vidalia/help/content/po/lg/bridges.po | 4 +-
src/vidalia/help/content/po/lg/config.po | 4 +-
src/vidalia/help/content/po/lg/index.po | 4 +-
src/vidalia/help/content/po/lg/links.po | 4 +-
src/vidalia/help/content/po/lg/log.po | 4 +-
src/vidalia/help/content/po/lg/netview.po | 4 +-
src/vidalia/help/content/po/lg/running.po | 4 +-
src/vidalia/help/content/po/lg/server.po | 4 +-
src/vidalia/help/content/po/lg/services.po | 4 +-
src/vidalia/help/content/po/lg/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ln/config.po | 4 +-
src/vidalia/help/content/po/ln/index.po | 4 +-
src/vidalia/help/content/po/ln/links.po | 80 +-
src/vidalia/help/content/po/ln/log.po | 4 +-
src/vidalia/help/content/po/ln/netview.po | 37 +-
src/vidalia/help/content/po/ln/running.po | 4 +-
src/vidalia/help/content/po/ln/server.po | 4 +-
src/vidalia/help/content/po/ln/services.po | 4 +-
src/vidalia/help/content/po/ln/troubleshooting.po | 4 +-
src/vidalia/help/content/po/lo/config.po | 4 +-
src/vidalia/help/content/po/lo/index.po | 4 +-
src/vidalia/help/content/po/lo/links.po | 80 +-
src/vidalia/help/content/po/lo/log.po | 4 +-
src/vidalia/help/content/po/lo/netview.po | 37 +-
src/vidalia/help/content/po/lo/running.po | 4 +-
src/vidalia/help/content/po/lo/server.po | 4 +-
src/vidalia/help/content/po/lo/services.po | 4 +-
src/vidalia/help/content/po/lo/troubleshooting.po | 4 +-
src/vidalia/help/content/po/lt/config.po | 4 +-
src/vidalia/help/content/po/lt/index.po | 4 +-
src/vidalia/help/content/po/lt/links.po | 80 +-
src/vidalia/help/content/po/lt/log.po | 4 +-
src/vidalia/help/content/po/lt/netview.po | 37 +-
src/vidalia/help/content/po/lt/running.po | 4 +-
src/vidalia/help/content/po/lt/server.po | 4 +-
src/vidalia/help/content/po/lt/services.po | 4 +-
src/vidalia/help/content/po/lt/troubleshooting.po | 4 +-
src/vidalia/help/content/po/lv/config.po | 4 +-
src/vidalia/help/content/po/lv/index.po | 4 +-
src/vidalia/help/content/po/lv/links.po | 80 +-
src/vidalia/help/content/po/lv/log.po | 4 +-
src/vidalia/help/content/po/lv/netview.po | 37 +-
src/vidalia/help/content/po/lv/running.po | 4 +-
src/vidalia/help/content/po/lv/server.po | 4 +-
src/vidalia/help/content/po/lv/services.po | 4 +-
src/vidalia/help/content/po/lv/troubleshooting.po | 4 +-
src/vidalia/help/content/po/mg/config.po | 4 +-
src/vidalia/help/content/po/mg/index.po | 4 +-
src/vidalia/help/content/po/mg/links.po | 80 +-
src/vidalia/help/content/po/mg/log.po | 4 +-
src/vidalia/help/content/po/mg/netview.po | 37 +-
src/vidalia/help/content/po/mg/running.po | 4 +-
src/vidalia/help/content/po/mg/server.po | 4 +-
src/vidalia/help/content/po/mg/services.po | 4 +-
src/vidalia/help/content/po/mg/troubleshooting.po | 4 +-
src/vidalia/help/content/po/mi/config.po | 4 +-
src/vidalia/help/content/po/mi/index.po | 4 +-
src/vidalia/help/content/po/mi/links.po | 80 +-
src/vidalia/help/content/po/mi/log.po | 4 +-
src/vidalia/help/content/po/mi/netview.po | 37 +-
src/vidalia/help/content/po/mi/running.po | 4 +-
src/vidalia/help/content/po/mi/server.po | 4 +-
src/vidalia/help/content/po/mi/services.po | 4 +-
src/vidalia/help/content/po/mi/troubleshooting.po | 4 +-
src/vidalia/help/content/po/mk/config.po | 4 +-
src/vidalia/help/content/po/mk/index.po | 4 +-
src/vidalia/help/content/po/mk/links.po | 80 +-
src/vidalia/help/content/po/mk/log.po | 4 +-
src/vidalia/help/content/po/mk/netview.po | 37 +-
src/vidalia/help/content/po/mk/running.po | 4 +-
src/vidalia/help/content/po/mk/server.po | 4 +-
src/vidalia/help/content/po/mk/services.po | 4 +-
src/vidalia/help/content/po/mk/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ml/config.po | 4 +-
src/vidalia/help/content/po/ml/index.po | 4 +-
src/vidalia/help/content/po/ml/links.po | 80 +-
src/vidalia/help/content/po/ml/log.po | 4 +-
src/vidalia/help/content/po/ml/netview.po | 37 +-
src/vidalia/help/content/po/ml/running.po | 4 +-
src/vidalia/help/content/po/ml/server.po | 4 +-
src/vidalia/help/content/po/ml/services.po | 4 +-
src/vidalia/help/content/po/ml/troubleshooting.po | 4 +-
src/vidalia/help/content/po/mn/config.po | 4 +-
src/vidalia/help/content/po/mn/index.po | 4 +-
src/vidalia/help/content/po/mn/links.po | 80 +-
src/vidalia/help/content/po/mn/log.po | 4 +-
src/vidalia/help/content/po/mn/netview.po | 37 +-
src/vidalia/help/content/po/mn/running.po | 4 +-
src/vidalia/help/content/po/mn/server.po | 4 +-
src/vidalia/help/content/po/mn/services.po | 4 +-
src/vidalia/help/content/po/mn/troubleshooting.po | 4 +-
src/vidalia/help/content/po/mr/config.po | 4 +-
src/vidalia/help/content/po/mr/index.po | 4 +-
src/vidalia/help/content/po/mr/links.po | 80 +-
src/vidalia/help/content/po/mr/log.po | 4 +-
src/vidalia/help/content/po/mr/netview.po | 37 +-
src/vidalia/help/content/po/mr/running.po | 4 +-
src/vidalia/help/content/po/mr/server.po | 4 +-
src/vidalia/help/content/po/mr/services.po | 4 +-
src/vidalia/help/content/po/mr/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ms/config.po | 4 +-
src/vidalia/help/content/po/ms/index.po | 4 +-
src/vidalia/help/content/po/ms/links.po | 80 +-
src/vidalia/help/content/po/ms/log.po | 4 +-
src/vidalia/help/content/po/ms/netview.po | 37 +-
src/vidalia/help/content/po/ms/running.po | 4 +-
src/vidalia/help/content/po/ms/server.po | 4 +-
src/vidalia/help/content/po/ms/services.po | 4 +-
src/vidalia/help/content/po/ms/troubleshooting.po | 4 +-
src/vidalia/help/content/po/mt/config.po | 4 +-
src/vidalia/help/content/po/mt/index.po | 4 +-
src/vidalia/help/content/po/mt/links.po | 80 +-
src/vidalia/help/content/po/mt/log.po | 4 +-
src/vidalia/help/content/po/mt/netview.po | 37 +-
src/vidalia/help/content/po/mt/running.po | 4 +-
src/vidalia/help/content/po/mt/server.po | 4 +-
src/vidalia/help/content/po/mt/services.po | 4 +-
src/vidalia/help/content/po/mt/troubleshooting.po | 4 +-
src/vidalia/help/content/po/my/config.po | 4 +-
src/vidalia/help/content/po/my/index.po | 4 +-
src/vidalia/help/content/po/my/links.po | 90 +-
src/vidalia/help/content/po/my/log.po | 4 +-
src/vidalia/help/content/po/my/netview.po | 4 +-
src/vidalia/help/content/po/my/running.po | 4 +-
src/vidalia/help/content/po/my/server.po | 4 +-
src/vidalia/help/content/po/my/services.po | 4 +-
src/vidalia/help/content/po/my/troubleshooting.po | 4 +-
src/vidalia/help/content/po/nah/bridges.po | 4 +-
src/vidalia/help/content/po/nah/config.po | 4 +-
src/vidalia/help/content/po/nah/index.po | 4 +-
src/vidalia/help/content/po/nah/links.po | 4 +-
src/vidalia/help/content/po/nah/log.po | 4 +-
src/vidalia/help/content/po/nah/netview.po | 4 +-
src/vidalia/help/content/po/nah/running.po | 4 +-
src/vidalia/help/content/po/nah/server.po | 4 +-
src/vidalia/help/content/po/nah/services.po | 4 +-
src/vidalia/help/content/po/nah/troubleshooting.po | 4 +-
src/vidalia/help/content/po/nap/config.po | 4 +-
src/vidalia/help/content/po/nap/index.po | 4 +-
src/vidalia/help/content/po/nap/links.po | 80 +-
src/vidalia/help/content/po/nap/log.po | 4 +-
src/vidalia/help/content/po/nap/netview.po | 37 +-
src/vidalia/help/content/po/nap/running.po | 4 +-
src/vidalia/help/content/po/nap/server.po | 4 +-
src/vidalia/help/content/po/nap/services.po | 4 +-
src/vidalia/help/content/po/nap/troubleshooting.po | 4 +-
src/vidalia/help/content/po/nb/config.po | 4 +-
src/vidalia/help/content/po/nb/index.po | 4 +-
src/vidalia/help/content/po/nb/links.po | 80 +-
src/vidalia/help/content/po/nb/log.po | 4 +-
src/vidalia/help/content/po/nb/netview.po | 37 +-
src/vidalia/help/content/po/nb/running.po | 4 +-
src/vidalia/help/content/po/nb/server.po | 4 +-
src/vidalia/help/content/po/nb/services.po | 4 +-
src/vidalia/help/content/po/nb/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ne/config.po | 4 +-
src/vidalia/help/content/po/ne/index.po | 4 +-
src/vidalia/help/content/po/ne/links.po | 80 +-
src/vidalia/help/content/po/ne/log.po | 4 +-
src/vidalia/help/content/po/ne/netview.po | 37 +-
src/vidalia/help/content/po/ne/running.po | 4 +-
src/vidalia/help/content/po/ne/server.po | 4 +-
src/vidalia/help/content/po/ne/services.po | 4 +-
src/vidalia/help/content/po/ne/troubleshooting.po | 4 +-
src/vidalia/help/content/po/nl/config.po | 4 +-
src/vidalia/help/content/po/nl/index.po | 4 +-
src/vidalia/help/content/po/nl/links.po | 93 +-
src/vidalia/help/content/po/nl/log.po | 4 +-
src/vidalia/help/content/po/nl/netview.po | 37 +-
src/vidalia/help/content/po/nl/running.po | 4 +-
src/vidalia/help/content/po/nl/server.po | 4 +-
src/vidalia/help/content/po/nl/services.po | 4 +-
src/vidalia/help/content/po/nl/troubleshooting.po | 4 +-
src/vidalia/help/content/po/nn/config.po | 4 +-
src/vidalia/help/content/po/nn/index.po | 4 +-
src/vidalia/help/content/po/nn/links.po | 80 +-
src/vidalia/help/content/po/nn/log.po | 4 +-
src/vidalia/help/content/po/nn/netview.po | 37 +-
src/vidalia/help/content/po/nn/running.po | 4 +-
src/vidalia/help/content/po/nn/server.po | 4 +-
src/vidalia/help/content/po/nn/services.po | 4 +-
src/vidalia/help/content/po/nn/troubleshooting.po | 4 +-
src/vidalia/help/content/po/nso/config.po | 4 +-
src/vidalia/help/content/po/nso/index.po | 4 +-
src/vidalia/help/content/po/nso/links.po | 80 +-
src/vidalia/help/content/po/nso/log.po | 4 +-
src/vidalia/help/content/po/nso/netview.po | 37 +-
src/vidalia/help/content/po/nso/running.po | 4 +-
src/vidalia/help/content/po/nso/server.po | 4 +-
src/vidalia/help/content/po/nso/services.po | 4 +-
src/vidalia/help/content/po/nso/troubleshooting.po | 4 +-
src/vidalia/help/content/po/oc/config.po | 4 +-
src/vidalia/help/content/po/oc/index.po | 4 +-
src/vidalia/help/content/po/oc/links.po | 80 +-
src/vidalia/help/content/po/oc/log.po | 4 +-
src/vidalia/help/content/po/oc/netview.po | 37 +-
src/vidalia/help/content/po/oc/running.po | 4 +-
src/vidalia/help/content/po/oc/server.po | 4 +-
src/vidalia/help/content/po/oc/services.po | 4 +-
src/vidalia/help/content/po/oc/troubleshooting.po | 4 +-
src/vidalia/help/content/po/or/bridges.po | 4 +-
src/vidalia/help/content/po/or/config.po | 4 +-
src/vidalia/help/content/po/or/index.po | 4 +-
src/vidalia/help/content/po/or/links.po | 4 +-
src/vidalia/help/content/po/or/log.po | 4 +-
src/vidalia/help/content/po/or/netview.po | 4 +-
src/vidalia/help/content/po/or/running.po | 4 +-
src/vidalia/help/content/po/or/server.po | 4 +-
src/vidalia/help/content/po/or/services.po | 4 +-
src/vidalia/help/content/po/or/troubleshooting.po | 4 +-
src/vidalia/help/content/po/pa/config.po | 4 +-
src/vidalia/help/content/po/pa/index.po | 4 +-
src/vidalia/help/content/po/pa/links.po | 80 +-
src/vidalia/help/content/po/pa/log.po | 4 +-
src/vidalia/help/content/po/pa/netview.po | 37 +-
src/vidalia/help/content/po/pa/running.po | 4 +-
src/vidalia/help/content/po/pa/server.po | 4 +-
src/vidalia/help/content/po/pa/services.po | 4 +-
src/vidalia/help/content/po/pa/troubleshooting.po | 4 +-
src/vidalia/help/content/po/pap/config.po | 4 +-
src/vidalia/help/content/po/pap/index.po | 4 +-
src/vidalia/help/content/po/pap/links.po | 80 +-
src/vidalia/help/content/po/pap/log.po | 4 +-
src/vidalia/help/content/po/pap/netview.po | 37 +-
src/vidalia/help/content/po/pap/running.po | 4 +-
src/vidalia/help/content/po/pap/server.po | 4 +-
src/vidalia/help/content/po/pap/services.po | 4 +-
src/vidalia/help/content/po/pap/troubleshooting.po | 4 +-
src/vidalia/help/content/po/pl/config.po | 4 +-
src/vidalia/help/content/po/pl/index.po | 4 +-
src/vidalia/help/content/po/pl/links.po | 94 +-
src/vidalia/help/content/po/pl/log.po | 4 +-
src/vidalia/help/content/po/pl/netview.po | 37 +-
src/vidalia/help/content/po/pl/running.po | 4 +-
src/vidalia/help/content/po/pl/server.po | 4 +-
src/vidalia/help/content/po/pl/services.po | 4 +-
src/vidalia/help/content/po/pl/troubleshooting.po | 4 +-
src/vidalia/help/content/po/pms/config.po | 4 +-
src/vidalia/help/content/po/pms/index.po | 4 +-
src/vidalia/help/content/po/pms/links.po | 80 +-
src/vidalia/help/content/po/pms/log.po | 4 +-
src/vidalia/help/content/po/pms/netview.po | 37 +-
src/vidalia/help/content/po/pms/running.po | 4 +-
src/vidalia/help/content/po/pms/server.po | 4 +-
src/vidalia/help/content/po/pms/services.po | 4 +-
src/vidalia/help/content/po/pms/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ps/config.po | 4 +-
src/vidalia/help/content/po/ps/index.po | 4 +-
src/vidalia/help/content/po/ps/links.po | 80 +-
src/vidalia/help/content/po/ps/log.po | 4 +-
src/vidalia/help/content/po/ps/netview.po | 37 +-
src/vidalia/help/content/po/ps/running.po | 4 +-
src/vidalia/help/content/po/ps/server.po | 4 +-
src/vidalia/help/content/po/ps/services.po | 4 +-
src/vidalia/help/content/po/ps/troubleshooting.po | 4 +-
src/vidalia/help/content/po/pt/config.po | 4 +-
src/vidalia/help/content/po/pt/index.po | 4 +-
src/vidalia/help/content/po/pt/links.po | 80 +-
src/vidalia/help/content/po/pt/log.po | 4 +-
src/vidalia/help/content/po/pt/netview.po | 37 +-
src/vidalia/help/content/po/pt/running.po | 4 +-
src/vidalia/help/content/po/pt/server.po | 4 +-
src/vidalia/help/content/po/pt/services.po | 4 +-
src/vidalia/help/content/po/pt/troubleshooting.po | 4 +-
src/vidalia/help/content/po/pt_BR/config.po | 4 +-
src/vidalia/help/content/po/pt_BR/index.po | 4 +-
src/vidalia/help/content/po/pt_BR/links.po | 80 +-
src/vidalia/help/content/po/pt_BR/log.po | 4 +-
src/vidalia/help/content/po/pt_BR/netview.po | 37 +-
src/vidalia/help/content/po/pt_BR/running.po | 4 +-
src/vidalia/help/content/po/pt_BR/server.po | 4 +-
src/vidalia/help/content/po/pt_BR/services.po | 4 +-
.../help/content/po/pt_BR/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ro/config.po | 4 +-
src/vidalia/help/content/po/ro/index.po | 4 +-
src/vidalia/help/content/po/ro/links.po | 80 +-
src/vidalia/help/content/po/ro/log.po | 4 +-
src/vidalia/help/content/po/ro/netview.po | 37 +-
src/vidalia/help/content/po/ro/running.po | 4 +-
src/vidalia/help/content/po/ro/server.po | 4 +-
src/vidalia/help/content/po/ro/services.po | 4 +-
src/vidalia/help/content/po/ro/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ru/config.po | 4 +-
src/vidalia/help/content/po/ru/index.po | 4 +-
src/vidalia/help/content/po/ru/links.po | 96 +-
src/vidalia/help/content/po/ru/log.po | 4 +-
src/vidalia/help/content/po/ru/netview.po | 4 +-
src/vidalia/help/content/po/ru/running.po | 4 +-
src/vidalia/help/content/po/ru/server.po | 4 +-
src/vidalia/help/content/po/ru/services.po | 4 +-
src/vidalia/help/content/po/ru/troubleshooting.po | 4 +-
src/vidalia/help/content/po/sco/config.po | 4 +-
src/vidalia/help/content/po/sco/index.po | 4 +-
src/vidalia/help/content/po/sco/links.po | 80 +-
src/vidalia/help/content/po/sco/log.po | 4 +-
src/vidalia/help/content/po/sco/netview.po | 37 +-
src/vidalia/help/content/po/sco/running.po | 4 +-
src/vidalia/help/content/po/sco/server.po | 4 +-
src/vidalia/help/content/po/sco/services.po | 4 +-
src/vidalia/help/content/po/sco/troubleshooting.po | 4 +-
src/vidalia/help/content/po/sk/bridges.po | 4 +-
src/vidalia/help/content/po/sk/config.po | 4 +-
src/vidalia/help/content/po/sk/index.po | 4 +-
src/vidalia/help/content/po/sk/links.po | 4 +-
src/vidalia/help/content/po/sk/log.po | 4 +-
src/vidalia/help/content/po/sk/netview.po | 4 +-
src/vidalia/help/content/po/sk/running.po | 4 +-
src/vidalia/help/content/po/sk/server.po | 4 +-
src/vidalia/help/content/po/sk/services.po | 4 +-
src/vidalia/help/content/po/sk/troubleshooting.po | 4 +-
src/vidalia/help/content/po/sl/bridges.po | 4 +-
src/vidalia/help/content/po/sl/config.po | 4 +-
src/vidalia/help/content/po/sl/index.po | 4 +-
src/vidalia/help/content/po/sl/links.po | 4 +-
src/vidalia/help/content/po/sl/log.po | 4 +-
src/vidalia/help/content/po/sl/netview.po | 4 +-
src/vidalia/help/content/po/sl/running.po | 4 +-
src/vidalia/help/content/po/sl/server.po | 4 +-
src/vidalia/help/content/po/sl/services.po | 4 +-
src/vidalia/help/content/po/sl/troubleshooting.po | 4 +-
src/vidalia/help/content/po/so/bridges.po | 4 +-
src/vidalia/help/content/po/so/config.po | 4 +-
src/vidalia/help/content/po/so/index.po | 4 +-
src/vidalia/help/content/po/so/links.po | 4 +-
src/vidalia/help/content/po/so/log.po | 4 +-
src/vidalia/help/content/po/so/netview.po | 4 +-
src/vidalia/help/content/po/so/running.po | 4 +-
src/vidalia/help/content/po/so/server.po | 4 +-
src/vidalia/help/content/po/so/services.po | 4 +-
src/vidalia/help/content/po/so/troubleshooting.po | 4 +-
src/vidalia/help/content/po/son/config.po | 4 +-
src/vidalia/help/content/po/son/index.po | 4 +-
src/vidalia/help/content/po/son/links.po | 80 +-
src/vidalia/help/content/po/son/log.po | 4 +-
src/vidalia/help/content/po/son/netview.po | 37 +-
src/vidalia/help/content/po/son/running.po | 4 +-
src/vidalia/help/content/po/son/server.po | 4 +-
src/vidalia/help/content/po/son/services.po | 4 +-
src/vidalia/help/content/po/son/troubleshooting.po | 4 +-
src/vidalia/help/content/po/sq/bridges.po | 4 +-
src/vidalia/help/content/po/sq/config.po | 4 +-
src/vidalia/help/content/po/sq/index.po | 4 +-
src/vidalia/help/content/po/sq/links.po | 4 +-
src/vidalia/help/content/po/sq/log.po | 4 +-
src/vidalia/help/content/po/sq/netview.po | 4 +-
src/vidalia/help/content/po/sq/running.po | 4 +-
src/vidalia/help/content/po/sq/server.po | 4 +-
src/vidalia/help/content/po/sq/services.po | 4 +-
src/vidalia/help/content/po/sq/troubleshooting.po | 4 +-
src/vidalia/help/content/po/sr/bridges.po | 4 +-
src/vidalia/help/content/po/sr/config.po | 4 +-
src/vidalia/help/content/po/sr/index.po | 4 +-
src/vidalia/help/content/po/sr/links.po | 4 +-
src/vidalia/help/content/po/sr/log.po | 4 +-
src/vidalia/help/content/po/sr/netview.po | 4 +-
src/vidalia/help/content/po/sr/running.po | 4 +-
src/vidalia/help/content/po/sr/server.po | 4 +-
src/vidalia/help/content/po/sr/services.po | 4 +-
src/vidalia/help/content/po/sr/troubleshooting.po | 4 +-
src/vidalia/help/content/po/st/bridges.po | 4 +-
src/vidalia/help/content/po/st/config.po | 4 +-
src/vidalia/help/content/po/st/index.po | 4 +-
src/vidalia/help/content/po/st/links.po | 4 +-
src/vidalia/help/content/po/st/log.po | 4 +-
src/vidalia/help/content/po/st/netview.po | 4 +-
src/vidalia/help/content/po/st/running.po | 4 +-
src/vidalia/help/content/po/st/server.po | 4 +-
src/vidalia/help/content/po/st/services.po | 4 +-
src/vidalia/help/content/po/st/troubleshooting.po | 4 +-
src/vidalia/help/content/po/su/config.po | 4 +-
src/vidalia/help/content/po/su/index.po | 4 +-
src/vidalia/help/content/po/su/links.po | 80 +-
src/vidalia/help/content/po/su/log.po | 4 +-
src/vidalia/help/content/po/su/netview.po | 37 +-
src/vidalia/help/content/po/su/running.po | 4 +-
src/vidalia/help/content/po/su/server.po | 4 +-
src/vidalia/help/content/po/su/services.po | 4 +-
src/vidalia/help/content/po/su/troubleshooting.po | 4 +-
src/vidalia/help/content/po/sv/bridges.po | 4 +-
src/vidalia/help/content/po/sv/config.po | 4 +-
src/vidalia/help/content/po/sv/index.po | 4 +-
src/vidalia/help/content/po/sv/links.po | 4 +-
src/vidalia/help/content/po/sv/log.po | 4 +-
src/vidalia/help/content/po/sv/netview.po | 4 +-
src/vidalia/help/content/po/sv/running.po | 4 +-
src/vidalia/help/content/po/sv/server.po | 4 +-
src/vidalia/help/content/po/sv/services.po | 4 +-
src/vidalia/help/content/po/sv/troubleshooting.po | 4 +-
src/vidalia/help/content/po/sw/config.po | 4 +-
src/vidalia/help/content/po/sw/index.po | 4 +-
src/vidalia/help/content/po/sw/links.po | 80 +-
src/vidalia/help/content/po/sw/log.po | 4 +-
src/vidalia/help/content/po/sw/netview.po | 37 +-
src/vidalia/help/content/po/sw/running.po | 4 +-
src/vidalia/help/content/po/sw/server.po | 4 +-
src/vidalia/help/content/po/sw/services.po | 4 +-
src/vidalia/help/content/po/sw/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ta/config.po | 4 +-
src/vidalia/help/content/po/ta/index.po | 4 +-
src/vidalia/help/content/po/ta/links.po | 80 +-
src/vidalia/help/content/po/ta/log.po | 4 +-
src/vidalia/help/content/po/ta/netview.po | 37 +-
src/vidalia/help/content/po/ta/running.po | 4 +-
src/vidalia/help/content/po/ta/server.po | 4 +-
src/vidalia/help/content/po/ta/services.po | 4 +-
src/vidalia/help/content/po/ta/troubleshooting.po | 4 +-
src/vidalia/help/content/po/te/config.po | 4 +-
src/vidalia/help/content/po/te/index.po | 4 +-
src/vidalia/help/content/po/te/links.po | 80 +-
src/vidalia/help/content/po/te/log.po | 4 +-
src/vidalia/help/content/po/te/netview.po | 37 +-
src/vidalia/help/content/po/te/running.po | 4 +-
src/vidalia/help/content/po/te/server.po | 4 +-
src/vidalia/help/content/po/te/services.po | 4 +-
src/vidalia/help/content/po/te/troubleshooting.po | 4 +-
src/vidalia/help/content/po/templates/links.pot | 66 +-
src/vidalia/help/content/po/tg/config.po | 4 +-
src/vidalia/help/content/po/tg/index.po | 4 +-
src/vidalia/help/content/po/tg/links.po | 80 +-
src/vidalia/help/content/po/tg/log.po | 4 +-
src/vidalia/help/content/po/tg/netview.po | 37 +-
src/vidalia/help/content/po/tg/running.po | 4 +-
src/vidalia/help/content/po/tg/server.po | 4 +-
src/vidalia/help/content/po/tg/services.po | 4 +-
src/vidalia/help/content/po/tg/troubleshooting.po | 4 +-
src/vidalia/help/content/po/th/config.po | 4 +-
src/vidalia/help/content/po/th/index.po | 4 +-
src/vidalia/help/content/po/th/links.po | 80 +-
src/vidalia/help/content/po/th/log.po | 4 +-
src/vidalia/help/content/po/th/netview.po | 37 +-
src/vidalia/help/content/po/th/running.po | 4 +-
src/vidalia/help/content/po/th/server.po | 4 +-
src/vidalia/help/content/po/th/services.po | 4 +-
src/vidalia/help/content/po/th/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ti/config.po | 4 +-
src/vidalia/help/content/po/ti/index.po | 4 +-
src/vidalia/help/content/po/ti/links.po | 80 +-
src/vidalia/help/content/po/ti/log.po | 4 +-
src/vidalia/help/content/po/ti/netview.po | 37 +-
src/vidalia/help/content/po/ti/running.po | 4 +-
src/vidalia/help/content/po/ti/server.po | 4 +-
src/vidalia/help/content/po/ti/services.po | 4 +-
src/vidalia/help/content/po/ti/troubleshooting.po | 4 +-
src/vidalia/help/content/po/tk/config.po | 4 +-
src/vidalia/help/content/po/tk/index.po | 4 +-
src/vidalia/help/content/po/tk/links.po | 80 +-
src/vidalia/help/content/po/tk/log.po | 4 +-
src/vidalia/help/content/po/tk/netview.po | 37 +-
src/vidalia/help/content/po/tk/running.po | 4 +-
src/vidalia/help/content/po/tk/server.po | 4 +-
src/vidalia/help/content/po/tk/services.po | 4 +-
src/vidalia/help/content/po/tk/troubleshooting.po | 4 +-
src/vidalia/help/content/po/tr/config.po | 118 +-
src/vidalia/help/content/po/tr/index.po | 4 +-
src/vidalia/help/content/po/tr/links.po | 90 +-
src/vidalia/help/content/po/tr/log.po | 4 +-
src/vidalia/help/content/po/tr/netview.po | 37 +-
src/vidalia/help/content/po/tr/running.po | 4 +-
src/vidalia/help/content/po/tr/server.po | 4 +-
src/vidalia/help/content/po/tr/services.po | 4 +-
src/vidalia/help/content/po/tr/troubleshooting.po | 4 +-
src/vidalia/help/content/po/uk/config.po | 4 +-
src/vidalia/help/content/po/uk/index.po | 4 +-
src/vidalia/help/content/po/uk/links.po | 80 +-
src/vidalia/help/content/po/uk/log.po | 4 +-
src/vidalia/help/content/po/uk/netview.po | 37 +-
src/vidalia/help/content/po/uk/running.po | 4 +-
src/vidalia/help/content/po/uk/server.po | 4 +-
src/vidalia/help/content/po/uk/services.po | 4 +-
src/vidalia/help/content/po/uk/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ur/config.po | 4 +-
src/vidalia/help/content/po/ur/index.po | 4 +-
src/vidalia/help/content/po/ur/links.po | 80 +-
src/vidalia/help/content/po/ur/log.po | 4 +-
src/vidalia/help/content/po/ur/netview.po | 37 +-
src/vidalia/help/content/po/ur/running.po | 4 +-
src/vidalia/help/content/po/ur/server.po | 4 +-
src/vidalia/help/content/po/ur/services.po | 4 +-
src/vidalia/help/content/po/ur/troubleshooting.po | 4 +-
src/vidalia/help/content/po/ve/config.po | 4 +-
src/vidalia/help/content/po/ve/index.po | 4 +-
src/vidalia/help/content/po/ve/links.po | 80 +-
src/vidalia/help/content/po/ve/log.po | 4 +-
src/vidalia/help/content/po/ve/netview.po | 37 +-
src/vidalia/help/content/po/ve/running.po | 4 +-
src/vidalia/help/content/po/ve/server.po | 4 +-
src/vidalia/help/content/po/ve/services.po | 4 +-
src/vidalia/help/content/po/ve/troubleshooting.po | 4 +-
src/vidalia/help/content/po/vi/config.po | 4 +-
src/vidalia/help/content/po/vi/index.po | 4 +-
src/vidalia/help/content/po/vi/links.po | 80 +-
src/vidalia/help/content/po/vi/log.po | 4 +-
src/vidalia/help/content/po/vi/netview.po | 37 +-
src/vidalia/help/content/po/vi/running.po | 4 +-
src/vidalia/help/content/po/vi/server.po | 4 +-
src/vidalia/help/content/po/vi/services.po | 4 +-
src/vidalia/help/content/po/vi/troubleshooting.po | 4 +-
src/vidalia/help/content/po/wa/config.po | 4 +-
src/vidalia/help/content/po/wa/index.po | 4 +-
src/vidalia/help/content/po/wa/links.po | 80 +-
src/vidalia/help/content/po/wa/log.po | 4 +-
src/vidalia/help/content/po/wa/netview.po | 37 +-
src/vidalia/help/content/po/wa/running.po | 4 +-
src/vidalia/help/content/po/wa/server.po | 4 +-
src/vidalia/help/content/po/wa/services.po | 4 +-
src/vidalia/help/content/po/wa/troubleshooting.po | 4 +-
src/vidalia/help/content/po/wo/bridges.po | 4 +-
src/vidalia/help/content/po/wo/config.po | 4 +-
src/vidalia/help/content/po/wo/index.po | 4 +-
src/vidalia/help/content/po/wo/links.po | 4 +-
src/vidalia/help/content/po/wo/log.po | 4 +-
src/vidalia/help/content/po/wo/netview.po | 4 +-
src/vidalia/help/content/po/wo/running.po | 4 +-
src/vidalia/help/content/po/wo/server.po | 4 +-
src/vidalia/help/content/po/wo/services.po | 4 +-
src/vidalia/help/content/po/wo/troubleshooting.po | 4 +-
src/vidalia/help/content/po/zh_CN/config.po | 4 +-
src/vidalia/help/content/po/zh_CN/index.po | 4 +-
src/vidalia/help/content/po/zh_CN/links.po | 93 +-
src/vidalia/help/content/po/zh_CN/log.po | 4 +-
src/vidalia/help/content/po/zh_CN/netview.po | 124 +-
src/vidalia/help/content/po/zh_CN/running.po | 4 +-
src/vidalia/help/content/po/zh_CN/server.po | 4 +-
src/vidalia/help/content/po/zh_CN/services.po | 4 +-
.../help/content/po/zh_CN/troubleshooting.po | 4 +-
src/vidalia/help/content/po/zh_HK/config.po | 4 +-
src/vidalia/help/content/po/zh_HK/index.po | 4 +-
src/vidalia/help/content/po/zh_HK/links.po | 80 +-
src/vidalia/help/content/po/zh_HK/log.po | 4 +-
src/vidalia/help/content/po/zh_HK/netview.po | 37 +-
src/vidalia/help/content/po/zh_HK/running.po | 4 +-
src/vidalia/help/content/po/zh_HK/server.po | 4 +-
src/vidalia/help/content/po/zh_HK/services.po | 4 +-
.../help/content/po/zh_HK/troubleshooting.po | 4 +-
src/vidalia/help/content/po/zh_TW/config.po | 4 +-
src/vidalia/help/content/po/zh_TW/index.po | 4 +-
src/vidalia/help/content/po/zh_TW/links.po | 80 +-
src/vidalia/help/content/po/zh_TW/log.po | 4 +-
src/vidalia/help/content/po/zh_TW/netview.po | 37 +-
src/vidalia/help/content/po/zh_TW/running.po | 4 +-
src/vidalia/help/content/po/zh_TW/server.po | 4 +-
src/vidalia/help/content/po/zh_TW/services.po | 4 +-
.../help/content/po/zh_TW/troubleshooting.po | 4 +-
src/vidalia/help/content/po/zu/config.po | 4 +-
src/vidalia/help/content/po/zu/index.po | 4 +-
src/vidalia/help/content/po/zu/links.po | 80 +-
src/vidalia/help/content/po/zu/log.po | 4 +-
src/vidalia/help/content/po/zu/netview.po | 37 +-
src/vidalia/help/content/po/zu/running.po | 4 +-
src/vidalia/help/content/po/zu/server.po | 4 +-
src/vidalia/help/content/po/zu/services.po | 4 +-
src/vidalia/help/content/po/zu/troubleshooting.po | 4 +-
src/vidalia/help/content/po2html.sh | 4 +-
src/vidalia/help/content/pt_BR/bridges.html | 8 +-
src/vidalia/help/content/ru/bridges.html | 6 +-
src/vidalia/help/content/ru/config.html | 6 +-
src/vidalia/help/content/ru/index.html | 6 +-
src/vidalia/help/content/ru/links.html | 6 +-
src/vidalia/help/content/ru/log.html | 6 +-
src/vidalia/help/content/ru/netview.html | 6 +-
src/vidalia/help/content/ru/running.html | 6 +-
src/vidalia/help/content/ru/server.html | 6 +-
src/vidalia/help/content/ru/services.html | 6 +-
src/vidalia/help/content/ru/troubleshooting.html | 6 +-
src/vidalia/help/content/sv/bridges.html | 6 +-
src/vidalia/help/content/sv/config.html | 6 +-
src/vidalia/help/content/sv/index.html | 6 +-
src/vidalia/help/content/sv/links.html | 8 +-
src/vidalia/help/content/sv/log.html | 6 +-
src/vidalia/help/content/sv/netview.html | 6 +-
src/vidalia/help/content/sv/running.html | 6 +-
src/vidalia/help/content/sv/server.html | 6 +-
src/vidalia/help/content/sv/services.html | 6 +-
src/vidalia/help/content/sv/troubleshooting.html | 6 +-
src/vidalia/help/content/tr/links.html | 8 +-
src/vidalia/help/content/zh_CN/bridges.html | 6 +-
src/vidalia/help/content/zh_CN/config.html | 6 +-
src/vidalia/help/content/zh_CN/index.html | 6 +-
src/vidalia/help/content/zh_CN/links.html | 6 +-
src/vidalia/help/content/zh_CN/log.html | 6 +-
src/vidalia/help/content/zh_CN/netview.html | 6 +-
src/vidalia/help/content/zh_CN/running.html | 6 +-
src/vidalia/help/content/zh_CN/server.html | 6 +-
.../help/content/zh_CN/troubleshooting.html | 6 +-
src/vidalia/i18n/CMakeLists.txt | 6 +-
src/vidalia/i18n/po/.tx/config | 129 +-
src/vidalia/i18n/po/af/vidalia_af.po | 298 ++-
src/vidalia/i18n/po/ak/vidalia_ak.po | 298 ++-
src/vidalia/i18n/po/am/vidalia_am.po | 298 ++-
src/vidalia/i18n/po/ar/vidalia_ar.po | 352 ++-
src/vidalia/i18n/po/arn/vidalia_arn.po | 298 ++-
src/vidalia/i18n/po/ast/vidalia_ast.po | 298 ++-
src/vidalia/i18n/po/az/vidalia_az.po | 298 ++-
src/vidalia/i18n/po/bg/vidalia_bg.po | 300 ++-
src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po | 298 ++-
src/vidalia/i18n/po/ca/vidalia_ca.po | 298 ++-
src/vidalia/i18n/po/cs/vidalia_cs.po | 304 ++-
src/vidalia/i18n/po/csb/vidalia_csb.po | 298 ++-
src/vidalia/i18n/po/cy/vidalia_cy.po | 298 ++-
src/vidalia/i18n/po/de/vidalia_de.po | 566 +++--
src/vidalia/i18n/po/de_CH/vidalia_de_CH.po | 298 ++-
src/vidalia/i18n/po/dz/vidalia_dz.po | 298 ++-
src/vidalia/i18n/po/el/vidalia_el.po | 312 ++-
src/vidalia/i18n/po/eo/vidalia_eo.po | 310 ++-
src/vidalia/i18n/po/es/vidalia_es.po | 323 ++-
src/vidalia/i18n/po/et/vidalia_et.po | 298 ++-
src/vidalia/i18n/po/eu/vidalia_eu.po | 298 ++-
src/vidalia/i18n/po/fil/vidalia_fil.po | 298 ++-
src/vidalia/i18n/po/fur/vidalia_fur.po | 298 ++-
src/vidalia/i18n/po/ga/vidalia_ga.po | 298 ++-
src/vidalia/i18n/po/gl/vidalia_gl.po | 298 ++-
src/vidalia/i18n/po/gu/vidalia_gu.po | 298 ++-
src/vidalia/i18n/po/gun/vidalia_gun.po | 298 ++-
src/vidalia/i18n/po/ha/vidalia_ha.po | 298 ++-
src/vidalia/i18n/po/he/vidalia_he.po | 302 ++-
src/vidalia/i18n/po/hi/vidalia_hi.po | 298 ++-
src/vidalia/i18n/po/hr/vidalia_hr.po | 298 ++-
src/vidalia/i18n/po/ht/vidalia_ht.po | 298 ++-
src/vidalia/i18n/po/hu/vidalia_hu.po | 309 ++-
src/vidalia/i18n/po/id/vidalia_id.po | 302 ++-
src/vidalia/i18n/po/is/vidalia_is.po | 302 ++-
src/vidalia/i18n/po/it/vidalia_it.po | 320 ++-
src/vidalia/i18n/po/kn/vidalia_kn.po | 298 ++-
src/vidalia/i18n/po/lb/vidalia_lb.po | 298 ++-
src/vidalia/i18n/po/ln/vidalia_ln.po | 298 ++-
src/vidalia/i18n/po/lo/vidalia_lo.po | 298 ++-
src/vidalia/i18n/po/lt/vidalia_lt.po | 298 ++-
src/vidalia/i18n/po/lv/vidalia_lv.po | 298 ++-
src/vidalia/i18n/po/mg/vidalia_mg.po | 298 ++-
src/vidalia/i18n/po/mi/vidalia_mi.po | 298 ++-
src/vidalia/i18n/po/mk/vidalia_mk.po | 298 ++-
src/vidalia/i18n/po/ml/vidalia_ml.po | 298 ++-
src/vidalia/i18n/po/mn/vidalia_mn.po | 298 ++-
src/vidalia/i18n/po/mr/vidalia_mr.po | 298 ++-
src/vidalia/i18n/po/ms/vidalia_ms.po | 298 ++-
src/vidalia/i18n/po/mt/vidalia_mt.po | 298 ++-
src/vidalia/i18n/po/my/vidalia_my.po | 312 ++-
src/vidalia/i18n/po/nah/vidalia_nah.po | 298 ++-
src/vidalia/i18n/po/nap/vidalia_nap.po | 298 ++-
src/vidalia/i18n/po/nb/vidalia_nb.po | 317 ++-
src/vidalia/i18n/po/ne/vidalia_ne.po | 298 ++-
src/vidalia/i18n/po/nl/vidalia_nl.po | 318 ++-
src/vidalia/i18n/po/nn/vidalia_nn.po | 298 ++-
src/vidalia/i18n/po/nso/vidalia_nso.po | 298 ++-
src/vidalia/i18n/po/oc/vidalia_oc.po | 298 ++-
src/vidalia/i18n/po/pa/vidalia_pa.po | 298 ++-
src/vidalia/i18n/po/pap/vidalia_pap.po | 298 ++-
src/vidalia/i18n/po/pl/qt_pl.po | 2 +-
src/vidalia/i18n/po/pl/vidalia_pl.po | 321 ++-
src/vidalia/i18n/po/pms/vidalia_pms.po | 298 ++-
src/vidalia/i18n/po/ps/vidalia_ps.po | 298 ++-
src/vidalia/i18n/po/pt/vidalia_pt.po | 319 ++-
src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po | 309 ++-
src/vidalia/i18n/po/ru/vidalia_ru.po | 322 ++-
src/vidalia/i18n/po/sco/vidalia_sco.po | 298 ++-
src/vidalia/i18n/po/son/vidalia_son.po | 298 ++-
src/vidalia/i18n/po/su/vidalia_su.po | 298 ++-
src/vidalia/i18n/po/sw/vidalia_sw.po | 298 ++-
src/vidalia/i18n/po/ta/vidalia_ta.po | 298 ++-
src/vidalia/i18n/po/te/vidalia_te.po | 298 ++-
src/vidalia/i18n/po/templates/vidalia.pot | 262 +--
src/vidalia/i18n/po/tg/vidalia_tg.po | 298 ++-
src/vidalia/i18n/po/th/vidalia_th.po | 309 ++-
src/vidalia/i18n/po/ti/vidalia_ti.po | 298 ++-
src/vidalia/i18n/po/tk/vidalia_tk.po | 298 ++-
src/vidalia/i18n/po/tr/vidalia_tr.po | 315 ++-
src/vidalia/i18n/po/ur/vidalia_ur.po | 298 ++-
src/vidalia/i18n/po/ve/vidalia_ve.po | 298 ++-
src/vidalia/i18n/po/vi/vidalia_vi.po | 310 ++-
src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po | 314 ++-
src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po | 298 ++-
src/vidalia/i18n/po/zu/vidalia_zu.po | 298 ++-
src/vidalia/log/LogFile.cpp | 6 +-
src/vidalia/log/LogFile.h | 6 +-
src/vidalia/log/LogHeaderView.cpp | 6 +-
src/vidalia/log/LogHeaderView.h | 6 +-
src/vidalia/log/LogMessageColumnDelegate.cpp | 6 +-
src/vidalia/log/LogMessageColumnDelegate.h | 6 +-
src/vidalia/log/LogTreeItem.cpp | 6 +-
src/vidalia/log/LogTreeItem.h | 6 +-
src/vidalia/log/LogTreeWidget.cpp | 6 +-
src/vidalia/log/LogTreeWidget.h | 6 +-
src/vidalia/log/MessageLog.cpp | 85 +-
src/vidalia/log/MessageLog.h | 14 +-
src/vidalia/log/MessageLog.ui | 814 +++----
src/vidalia/log/StatusEventItem.cpp | 6 +-
src/vidalia/log/StatusEventItem.h | 6 +-
src/vidalia/log/StatusEventItemDelegate.cpp | 6 +-
src/vidalia/log/StatusEventItemDelegate.h | 6 +-
src/vidalia/log/StatusEventWidget.cpp | 6 +-
src/vidalia/log/StatusEventWidget.h | 6 +-
src/vidalia/main.cpp | 8 +-
src/vidalia/network/CircuitItem.cpp | 6 +-
src/vidalia/network/CircuitItem.h | 6 +-
src/vidalia/network/CircuitListWidget.cpp | 6 +-
src/vidalia/network/CircuitListWidget.h | 6 +-
src/vidalia/network/CountryInfo.cpp | 6 +-
src/vidalia/network/CountryInfo.h | 6 +-
src/vidalia/network/GeoIpDatabase.cpp | 6 +-
src/vidalia/network/GeoIpDatabase.h | 6 +-
src/vidalia/network/GeoIpRecord.cpp | 6 +-
src/vidalia/network/GeoIpRecord.h | 6 +-
src/vidalia/network/GeoIpResolver.cpp | 6 +-
src/vidalia/network/GeoIpResolver.h | 6 +-
src/vidalia/network/NetViewer.cpp | 26 +-
src/vidalia/network/NetViewer.h | 10 +-
src/vidalia/network/NetViewer.ui | 464 ++--
src/vidalia/network/RouterDescriptorView.cpp | 11 +-
src/vidalia/network/RouterDescriptorView.h | 6 +-
src/vidalia/network/RouterInfoDialog.cpp | 6 +-
src/vidalia/network/RouterInfoDialog.h | 6 +-
src/vidalia/network/RouterListItem.cpp | 10 +-
src/vidalia/network/RouterListItem.h | 6 +-
src/vidalia/network/RouterListWidget.cpp | 6 +-
src/vidalia/network/RouterListWidget.h | 6 +-
src/vidalia/network/StreamItem.cpp | 6 +-
src/vidalia/network/StreamItem.h | 6 +-
src/vidalia/network/TorMapImageView.cpp | 6 +-
src/vidalia/network/TorMapImageView.h | 6 +-
src/vidalia/network/TorMapWidget.cpp | 6 +-
src/vidalia/network/TorMapWidget.h | 6 +-
src/vidalia/network/TorMapWidgetInputHandler.cpp | 6 +-
src/vidalia/network/TorMapWidgetInputHandler.h | 6 +-
src/vidalia/network/TorMapWidgetPopupMenu.cpp | 6 +-
src/vidalia/network/TorMapWidgetPopupMenu.h | 6 +-
src/vidalia/network/ZImageView.cpp | 6 +-
src/vidalia/network/ZImageView.h | 6 +-
src/vidalia/res/DigiCertAssuredCA.crt | 22 +
src/vidalia/res/DigiCertCA.crt | 22 +
src/vidalia/res/DigiCertHighAssuranceCA.crt | 23 +
src/vidalia/res/vidalia.qrc | 3 +
src/vidalia/res/vidalia_win.rc.in | 6 +-
1673 files changed, 22629 insertions(+), 29200 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 64c301f..ee6c005 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,36 @@
+0.3.0 06-May-2011
+ o Vidalia has got a new GUI. Instead of separate dialogs, each functionality
+ is organized in tabs arranged in a common main window. This new tab
+ organization will give Vidalia a generic way of organizing the GUI plug-ins
+ that will be available in later releases. Resolves bug 2939.
+ o When a Tor instance is already running and Vidalia doesn't know the control
+ password, don't ask for the it but rather explain the situation and display
+ the few possible choices the user has. Resolves bug 2132.
+ o Add an option for setting up a non-exit relay to the Sharing configuration
+ panel. This is meant to clarify what an exit policy and an exit relay are.
+ Resolves bug 2644.
+ o Add a way to reload Tor's configuration without having to stop it. Tor can
+ reload its configuration while it is running, Vidalia now provides a menu
+ option for that, so, for example, relay operators won't be affected by the
+ fact that their relay was down for a while. Resolves bug 2724.
+ o Reintegrate Breakpad, and make available in other platforms other than
+ Windows. Resolves bug 2105.
+ o Fix bandwidth assigned to relays on the Network Map. A lot of relays are
+ displaying an erroneous bandwidth and since they are ordered by that value
+ in the Network Map, it leads to confusion. Vidalia now specifies the
+ bandwidth as the minimum of the three possible values (burst, average and
+ observed). Fixes bug 2744.
+ o Minor change to the checkbox for starting Tor when Vidalia starts. It was
+ suggested that the way the phrasing was done was missleading. Resolves bug
+ 2806.
+ o Add a way to bootstrap Tor's torrc file (copy the torrc to a given directory
+ before Vidalia starts) so that packages such as Bridge-by-default portable
+ bundles for OSX don't violate the directory structure of the operative
+ system. Fixes bug 2821.
+ o Add the proper CA Certificates so that the "Find Bridges" button works
+ again. Fixes bug 2835.
+ o Update the useful links help page. Fixes bug 2809.
+
0.2.12 10-Apr-2011
o Vidalia's SVN repository has been migrated to Git. All branches but
master have been archived for later review, since SVN trunk had changed
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03c6b5f..af75563 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,15 +5,15 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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 "12")
+set(VER_MINOR "3")
+set(VER_PATCH "0")
set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}")
message(STATUS "Configuring Vidalia ${VERSION}")
project(Vidalia)
diff --git a/cmake/FindBreakpad.cmake b/cmake/FindBreakpad.cmake
index 607d054..f1806ae 100644
--- a/cmake/FindBreakpad.cmake
+++ b/cmake/FindBreakpad.cmake
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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
@@ -43,8 +43,5 @@ if (WIN32)
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/cmake/FindGeoIP.cmake b/cmake/FindGeoIP.cmake
index 15227d8..76986bf 100644
--- a/cmake/FindGeoIP.cmake
+++ b/cmake/FindGeoIP.cmake
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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 MaxMind GeoIPlibraries. Once done this will
diff --git a/cmake/FindMarble.cmake b/cmake/FindMarble.cmake
index 4986fc1..12382b8 100644
--- a/cmake/FindMarble.cmake
+++ b/cmake/FindMarble.cmake
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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:
diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake
index ec7b91d..0f931b0 100644
--- a/cmake/FindOpenSSL.cmake
+++ b/cmake/FindOpenSSL.cmake
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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:
diff --git a/cmake/FindWiX.cmake b/cmake/FindWiX.cmake
index 2a49d61..590889b 100644
--- a/cmake/FindWiX.cmake
+++ b/cmake/FindWiX.cmake
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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")
diff --git a/cmake/VidaliaMacros.cmake b/cmake/VidaliaMacros.cmake
index 306feca..7e468b2 100644
--- a/cmake/VidaliaMacros.cmake
+++ b/cmake/VidaliaMacros.cmake
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/config.h.in b/config.h.in
index c55b7a7..0b5ede1 100644
--- a/config.h.in
+++ b/config.h.in
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
**
*/
diff --git a/contrib/geoip.py b/contrib/geoip.py
index 92de9ca..23f3540 100755
--- a/contrib/geoip.py
+++ b/contrib/geoip.py
@@ -6,9 +6,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 323bacc..c708c9a 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/doc/vidalia.1.in b/doc/vidalia.1.in
index ff17542..8b2b692 100644
--- a/doc/vidalia.1.in
+++ b/doc/vidalia.1.in
@@ -45,7 +45,7 @@ of available language codes.
.SH SEE ALSO
.BR tor (1)
-.BR http://www.vidalia-project.net/
+.BR http://www.torproject.org/projects/vidalia.html
.SH AUTHORS
Matt Edman <edmanm at vidalia-project.net>
diff --git a/pkg/CMakeLists.txt b/pkg/CMakeLists.txt
index dbf1067..bafa506 100644
--- a/pkg/CMakeLists.txt
+++ b/pkg/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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)
diff --git a/pkg/build-geoip-cache.sh b/pkg/build-geoip-cache.sh
index f19de99..31696b6 100755
--- a/pkg/build-geoip-cache.sh
+++ b/pkg/build-geoip-cache.sh
@@ -6,9 +6,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/pkg/osx/CMakeLists.txt b/pkg/osx/CMakeLists.txt
index 2d06895..e757864 100644
--- a/pkg/osx/CMakeLists.txt
+++ b/pkg/osx/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/pkg/osx/InstallTorbutton.scpt.in b/pkg/osx/InstallTorbutton.scpt.in
index c8f28dc..3e487ef 100644
--- a/pkg/osx/InstallTorbutton.scpt.in
+++ b/pkg/osx/InstallTorbutton.scpt.in
@@ -5,9 +5,9 @@
-- LICENSE file, found in the top level directory of this distribution. If
-- you did not receive the LICENSE file with this file, you may obtain it
-- from the Vidalia source package distributed by the Vidalia Project at
--- http://www.vidalia-project.net/. No part of Vidalia, including this file,
--- may be copied, modified, propagated, or distributed except according to
--- the terms described in the LICENSE file.
+-- http://www.torproject.org/projects/vidalia.html. 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
diff --git a/pkg/package.sh b/pkg/package.sh
index d85fb5e..b5e628d 100755
--- a/pkg/package.sh
+++ b/pkg/package.sh
@@ -6,9 +6,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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.
diff --git a/pkg/rpm/CMakeLists.txt b/pkg/rpm/CMakeLists.txt
index 9a928bc..8269ee0 100644
--- a/pkg/rpm/CMakeLists.txt
+++ b/pkg/rpm/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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
diff --git a/pkg/win32/CMakeLists.txt b/pkg/win32/CMakeLists.txt
index e03973f..13306e7 100644
--- a/pkg/win32/CMakeLists.txt
+++ b/pkg/win32/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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)
diff --git a/pkg/win32/bridge-bundle.nsi.in b/pkg/win32/bridge-bundle.nsi.in
index 649cd24..37eb4a8 100644
--- a/pkg/win32/bridge-bundle.nsi.in
+++ b/pkg/win32/bridge-bundle.nsi.in
@@ -5,9 +5,9 @@
;; LICENSE file, found in the top level directory of this distribution. If
;; you did not receive the LICENSE file with this file, you may obtain it
;; from the Vidalia source package distributed by the Vidalia Project at
-;; http://www.vidalia-project.net/. No part of Vidalia, including this file,
-;; may be copied, modified, propagated, or distributed except according to
-;; the terms described in the LICENSE file.
+;; http://www.torproject.org/projects/vidalia.html. 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"
diff --git a/pkg/win32/po/.tx/config b/pkg/win32/po/.tx/config
index 7ac2c35..a066f41 100644
--- a/pkg/win32/po/.tx/config
+++ b/pkg/win32/po/.tx/config
@@ -1,7 +1,7 @@
[main]
host = https://www.transifex.net
-[torproject.vidalia-installer-vidalia-pot]
+[torproject.2-vidalia-installer-vidalia-pot]
source_file = templates/vidalia.pot
source_lang = en
trans.af = af/vidalia_af.po
diff --git a/pkg/win32/po/af/vidalia_af.po b/pkg/win32/po/af/vidalia_af.po
index 818022c..d9e2027 100755
--- a/pkg/win32/po/af/vidalia_af.po
+++ b/pkg/win32/po/af/vidalia_af.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/ak/vidalia_ak.po b/pkg/win32/po/ak/vidalia_ak.po
index 70ba5c9..707d4a5 100644
--- a/pkg/win32/po/ak/vidalia_ak.po
+++ b/pkg/win32/po/ak/vidalia_ak.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/am/vidalia_am.po b/pkg/win32/po/am/vidalia_am.po
index 06db5d4..d5e1073 100755
--- a/pkg/win32/po/am/vidalia_am.po
+++ b/pkg/win32/po/am/vidalia_am.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/ar/vidalia_ar.po b/pkg/win32/po/ar/vidalia_ar.po
index cfc289a..f31d661 100644
--- a/pkg/win32/po/ar/vidalia_ar.po
+++ b/pkg/win32/po/ar/vidalia_ar.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/arn/vidalia_arn.po b/pkg/win32/po/arn/vidalia_arn.po
index 4000d3f..082ebce 100755
--- a/pkg/win32/po/arn/vidalia_arn.po
+++ b/pkg/win32/po/arn/vidalia_arn.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/ast/vidalia_ast.po b/pkg/win32/po/ast/vidalia_ast.po
index 79153b4..87b1b47 100755
--- a/pkg/win32/po/ast/vidalia_ast.po
+++ b/pkg/win32/po/ast/vidalia_ast.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/az/vidalia_az.po b/pkg/win32/po/az/vidalia_az.po
index 74a363e..6a28bb4 100755
--- a/pkg/win32/po/az/vidalia_az.po
+++ b/pkg/win32/po/az/vidalia_az.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/bg/vidalia_bg.po b/pkg/win32/po/bg/vidalia_bg.po
index 1634d8c..00f335d 100755
--- a/pkg/win32/po/bg/vidalia_bg.po
+++ b/pkg/win32/po/bg/vidalia_bg.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/bn_IN/vidalia_bn_IN.po b/pkg/win32/po/bn_IN/vidalia_bn_IN.po
index 456bc02..b018b91 100755
--- a/pkg/win32/po/bn_IN/vidalia_bn_IN.po
+++ b/pkg/win32/po/bn_IN/vidalia_bn_IN.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/ca/vidalia_ca.po b/pkg/win32/po/ca/vidalia_ca.po
index 9e4fb16..8393dcf 100755
--- a/pkg/win32/po/ca/vidalia_ca.po
+++ b/pkg/win32/po/ca/vidalia_ca.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:25+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/cs/vidalia_cs.po b/pkg/win32/po/cs/vidalia_cs.po
index 77cac01..7cfb4e8 100644
--- a/pkg/win32/po/cs/vidalia_cs.po
+++ b/pkg/win32/po/cs/vidalia_cs.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:25+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/csb/vidalia_csb.po b/pkg/win32/po/csb/vidalia_csb.po
index 2812d40..d2afbb8 100755
--- a/pkg/win32/po/csb/vidalia_csb.po
+++ b/pkg/win32/po/csb/vidalia_csb.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/cy/vidalia_cy.po b/pkg/win32/po/cy/vidalia_cy.po
index c9deb5a..36f8891 100755
--- a/pkg/win32/po/cy/vidalia_cy.po
+++ b/pkg/win32/po/cy/vidalia_cy.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:25+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/de/vidalia_de.po b/pkg/win32/po/de/vidalia_de.po
index 8e49e44..badea4b 100644
--- a/pkg/win32/po/de/vidalia_de.po
+++ b/pkg/win32/po/de/vidalia_de.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/de_CH/vidalia_de_CH.po b/pkg/win32/po/de_CH/vidalia_de_CH.po
index 29269ac..da198b5 100755
--- a/pkg/win32/po/de_CH/vidalia_de_CH.po
+++ b/pkg/win32/po/de_CH/vidalia_de_CH.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:25+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/dz/vidalia_dz.po b/pkg/win32/po/dz/vidalia_dz.po
index d9b6c65..f5cee71 100755
--- a/pkg/win32/po/dz/vidalia_dz.po
+++ b/pkg/win32/po/dz/vidalia_dz.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/el/vidalia_el.po b/pkg/win32/po/el/vidalia_el.po
index b2f65a5..a0a1311 100755
--- a/pkg/win32/po/el/vidalia_el.po
+++ b/pkg/win32/po/el/vidalia_el.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-04 18:51+0000\n"
+"PO-Revision-Date: 2011-03-22 16:14+0000\n"
"Last-Translator: Evropi <yannanth at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/eo/vidalia_eo.po b/pkg/win32/po/eo/vidalia_eo.po
index 6da7a87..b6a4349 100755
--- a/pkg/win32/po/eo/vidalia_eo.po
+++ b/pkg/win32/po/eo/vidalia_eo.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/es/vidalia_es.po b/pkg/win32/po/es/vidalia_es.po
index d9a8949..02e5913 100644
--- a/pkg/win32/po/es/vidalia_es.po
+++ b/pkg/win32/po/es/vidalia_es.po
@@ -4,9 +4,9 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
-"Language-Team: Spanish (Castilian) <None>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/pkg/win32/po/et/vidalia_et.po b/pkg/win32/po/et/vidalia_et.po
index 860f824..9fc7f62 100644
--- a/pkg/win32/po/et/vidalia_et.po
+++ b/pkg/win32/po/et/vidalia_et.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/eu/vidalia_eu.po b/pkg/win32/po/eu/vidalia_eu.po
index 0b57202..200446a 100755
--- a/pkg/win32/po/eu/vidalia_eu.po
+++ b/pkg/win32/po/eu/vidalia_eu.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/fil/vidalia_fil.po b/pkg/win32/po/fil/vidalia_fil.po
index cbbc76f..265c869 100755
--- a/pkg/win32/po/fil/vidalia_fil.po
+++ b/pkg/win32/po/fil/vidalia_fil.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/fur/vidalia_fur.po b/pkg/win32/po/fur/vidalia_fur.po
index a0ad804..c85ec51 100755
--- a/pkg/win32/po/fur/vidalia_fur.po
+++ b/pkg/win32/po/fur/vidalia_fur.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/ga/vidalia_ga.po b/pkg/win32/po/ga/vidalia_ga.po
index 2019493..c5b5ac3 100755
--- a/pkg/win32/po/ga/vidalia_ga.po
+++ b/pkg/win32/po/ga/vidalia_ga.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:25+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/gl/vidalia_gl.po b/pkg/win32/po/gl/vidalia_gl.po
index 46e9187..f6840a3 100755
--- a/pkg/win32/po/gl/vidalia_gl.po
+++ b/pkg/win32/po/gl/vidalia_gl.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:25+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/gu/vidalia_gu.po b/pkg/win32/po/gu/vidalia_gu.po
index 75d9c08..a4ebbfe 100755
--- a/pkg/win32/po/gu/vidalia_gu.po
+++ b/pkg/win32/po/gu/vidalia_gu.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:25+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/gun/vidalia_gun.po b/pkg/win32/po/gun/vidalia_gun.po
index 206ceea..bb9ed37 100755
--- a/pkg/win32/po/gun/vidalia_gun.po
+++ b/pkg/win32/po/gun/vidalia_gun.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/ha/vidalia_ha.po b/pkg/win32/po/ha/vidalia_ha.po
index c570605..ea52bbf 100755
--- a/pkg/win32/po/ha/vidalia_ha.po
+++ b/pkg/win32/po/ha/vidalia_ha.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/he/vidalia_he.po b/pkg/win32/po/he/vidalia_he.po
index 6a77bbe..9925c35 100644
--- a/pkg/win32/po/he/vidalia_he.po
+++ b/pkg/win32/po/he/vidalia_he.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/hi/vidalia_hi.po b/pkg/win32/po/hi/vidalia_hi.po
index d19aa1b..0ff1deb 100755
--- a/pkg/win32/po/hi/vidalia_hi.po
+++ b/pkg/win32/po/hi/vidalia_hi.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/hr/vidalia_hr.po b/pkg/win32/po/hr/vidalia_hr.po
index df95129..b4af1f0 100755
--- a/pkg/win32/po/hr/vidalia_hr.po
+++ b/pkg/win32/po/hr/vidalia_hr.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/ht/vidalia_ht.po b/pkg/win32/po/ht/vidalia_ht.po
index b30c0a1..6346d36 100755
--- a/pkg/win32/po/ht/vidalia_ht.po
+++ b/pkg/win32/po/ht/vidalia_ht.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/hu/vidalia_hu.po b/pkg/win32/po/hu/vidalia_hu.po
index 22049d6..062f087 100755
--- a/pkg/win32/po/hu/vidalia_hu.po
+++ b/pkg/win32/po/hu/vidalia_hu.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/id/vidalia_id.po b/pkg/win32/po/id/vidalia_id.po
index 96a6a3b..75a3521 100755
--- a/pkg/win32/po/id/vidalia_id.po
+++ b/pkg/win32/po/id/vidalia_id.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/is/vidalia_is.po b/pkg/win32/po/is/vidalia_is.po
index 7a9fcda..3615c7a 100755
--- a/pkg/win32/po/is/vidalia_is.po
+++ b/pkg/win32/po/is/vidalia_is.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/it/vidalia_it.po b/pkg/win32/po/it/vidalia_it.po
index 1ff1417..f206616 100644
--- a/pkg/win32/po/it/vidalia_it.po
+++ b/pkg/win32/po/it/vidalia_it.po
@@ -4,9 +4,9 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
-"Language-Team: Italian <None>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/pkg/win32/po/kn/vidalia_kn.po b/pkg/win32/po/kn/vidalia_kn.po
index b97e483..8956c98 100755
--- a/pkg/win32/po/kn/vidalia_kn.po
+++ b/pkg/win32/po/kn/vidalia_kn.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/lb/vidalia_lb.po b/pkg/win32/po/lb/vidalia_lb.po
index 99b1a48..ffdfa4d 100755
--- a/pkg/win32/po/lb/vidalia_lb.po
+++ b/pkg/win32/po/lb/vidalia_lb.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/ln/vidalia_ln.po b/pkg/win32/po/ln/vidalia_ln.po
index 8593bcc..d438efc 100755
--- a/pkg/win32/po/ln/vidalia_ln.po
+++ b/pkg/win32/po/ln/vidalia_ln.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/lo/vidalia_lo.po b/pkg/win32/po/lo/vidalia_lo.po
index 3ccfe48..c65ea65 100755
--- a/pkg/win32/po/lo/vidalia_lo.po
+++ b/pkg/win32/po/lo/vidalia_lo.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/lt/vidalia_lt.po b/pkg/win32/po/lt/vidalia_lt.po
index 9dccf3b..5922c84 100755
--- a/pkg/win32/po/lt/vidalia_lt.po
+++ b/pkg/win32/po/lt/vidalia_lt.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/lv/vidalia_lv.po b/pkg/win32/po/lv/vidalia_lv.po
index f9e9b99..d8e70e4 100755
--- a/pkg/win32/po/lv/vidalia_lv.po
+++ b/pkg/win32/po/lv/vidalia_lv.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/mg/vidalia_mg.po b/pkg/win32/po/mg/vidalia_mg.po
index 570475d..79451bb 100755
--- a/pkg/win32/po/mg/vidalia_mg.po
+++ b/pkg/win32/po/mg/vidalia_mg.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/mi/vidalia_mi.po b/pkg/win32/po/mi/vidalia_mi.po
index bea829b..1394c29 100755
--- a/pkg/win32/po/mi/vidalia_mi.po
+++ b/pkg/win32/po/mi/vidalia_mi.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/mk/vidalia_mk.po b/pkg/win32/po/mk/vidalia_mk.po
index 13c4e74..2efa63d 100755
--- a/pkg/win32/po/mk/vidalia_mk.po
+++ b/pkg/win32/po/mk/vidalia_mk.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/ml/vidalia_ml.po b/pkg/win32/po/ml/vidalia_ml.po
index 4e1e643..506e72a 100755
--- a/pkg/win32/po/ml/vidalia_ml.po
+++ b/pkg/win32/po/ml/vidalia_ml.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/mn/vidalia_mn.po b/pkg/win32/po/mn/vidalia_mn.po
index d6a79b8..e81f0ee 100755
--- a/pkg/win32/po/mn/vidalia_mn.po
+++ b/pkg/win32/po/mn/vidalia_mn.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/mr/vidalia_mr.po b/pkg/win32/po/mr/vidalia_mr.po
index 2e36ed1..7796ef5 100755
--- a/pkg/win32/po/mr/vidalia_mr.po
+++ b/pkg/win32/po/mr/vidalia_mr.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/ms/vidalia_ms.po b/pkg/win32/po/ms/vidalia_ms.po
index 55867fa..aad06e3 100755
--- a/pkg/win32/po/ms/vidalia_ms.po
+++ b/pkg/win32/po/ms/vidalia_ms.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/mt/vidalia_mt.po b/pkg/win32/po/mt/vidalia_mt.po
index a13235d..39e4244 100755
--- a/pkg/win32/po/mt/vidalia_mt.po
+++ b/pkg/win32/po/mt/vidalia_mt.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/my/vidalia_my.po b/pkg/win32/po/my/vidalia_my.po
index bbf95a7..46befc5 100755
--- a/pkg/win32/po/my/vidalia_my.po
+++ b/pkg/win32/po/my/vidalia_my.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/nah/vidalia_nah.po b/pkg/win32/po/nah/vidalia_nah.po
index 1492114..54ab505 100755
--- a/pkg/win32/po/nah/vidalia_nah.po
+++ b/pkg/win32/po/nah/vidalia_nah.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/nap/vidalia_nap.po b/pkg/win32/po/nap/vidalia_nap.po
index bce3106..5756df9 100755
--- a/pkg/win32/po/nap/vidalia_nap.po
+++ b/pkg/win32/po/nap/vidalia_nap.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/nb/vidalia_nb.po b/pkg/win32/po/nb/vidalia_nb.po
index 94efefa..af95788 100755
--- a/pkg/win32/po/nb/vidalia_nb.po
+++ b/pkg/win32/po/nb/vidalia_nb.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/ne/vidalia_ne.po b/pkg/win32/po/ne/vidalia_ne.po
index 0dabd12..0bf0b42 100755
--- a/pkg/win32/po/ne/vidalia_ne.po
+++ b/pkg/win32/po/ne/vidalia_ne.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/nl/vidalia_nl.po b/pkg/win32/po/nl/vidalia_nl.po
index 10a8abb..dbe4361 100644
--- a/pkg/win32/po/nl/vidalia_nl.po
+++ b/pkg/win32/po/nl/vidalia_nl.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/nn/vidalia_nn.po b/pkg/win32/po/nn/vidalia_nn.po
index 30be0da..309cac4 100755
--- a/pkg/win32/po/nn/vidalia_nn.po
+++ b/pkg/win32/po/nn/vidalia_nn.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/nso/vidalia_nso.po b/pkg/win32/po/nso/vidalia_nso.po
index 823d065..5cec10c 100755
--- a/pkg/win32/po/nso/vidalia_nso.po
+++ b/pkg/win32/po/nso/vidalia_nso.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:25+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/oc/vidalia_oc.po b/pkg/win32/po/oc/vidalia_oc.po
index 77ff6e8..24d8fbc 100755
--- a/pkg/win32/po/oc/vidalia_oc.po
+++ b/pkg/win32/po/oc/vidalia_oc.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/pa/vidalia_pa.po b/pkg/win32/po/pa/vidalia_pa.po
index 42d892d..0563f13 100755
--- a/pkg/win32/po/pa/vidalia_pa.po
+++ b/pkg/win32/po/pa/vidalia_pa.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/pap/vidalia_pap.po b/pkg/win32/po/pap/vidalia_pap.po
index 52af2fb..fcad213 100755
--- a/pkg/win32/po/pap/vidalia_pap.po
+++ b/pkg/win32/po/pap/vidalia_pap.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/pl/vidalia_pl.po b/pkg/win32/po/pl/vidalia_pl.po
index 9e22662..0b537fc 100644
--- a/pkg/win32/po/pl/vidalia_pl.po
+++ b/pkg/win32/po/pl/vidalia_pl.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/pms/vidalia_pms.po b/pkg/win32/po/pms/vidalia_pms.po
index 39aca2e..a7ef9a4 100755
--- a/pkg/win32/po/pms/vidalia_pms.po
+++ b/pkg/win32/po/pms/vidalia_pms.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/ps/vidalia_ps.po b/pkg/win32/po/ps/vidalia_ps.po
index c38311e..e651a04 100644
--- a/pkg/win32/po/ps/vidalia_ps.po
+++ b/pkg/win32/po/ps/vidalia_ps.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/pt/vidalia_pt.po b/pkg/win32/po/pt/vidalia_pt.po
index 7999283..9490ef3 100644
--- a/pkg/win32/po/pt/vidalia_pt.po
+++ b/pkg/win32/po/pt/vidalia_pt.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/pt_BR/vidalia_pt_BR.po b/pkg/win32/po/pt_BR/vidalia_pt_BR.po
index af398db..f8def11 100755
--- a/pkg/win32/po/pt_BR/vidalia_pt_BR.po
+++ b/pkg/win32/po/pt_BR/vidalia_pt_BR.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/ru/vidalia_ru.po b/pkg/win32/po/ru/vidalia_ru.po
index 06f8fd9..4067e6b 100644
--- a/pkg/win32/po/ru/vidalia_ru.po
+++ b/pkg/win32/po/ru/vidalia_ru.po
@@ -4,14 +4,14 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-04 18:51+0000\n"
-"Last-Translator: RK2 <nord115 at mail.ru>\n"
-"Language-Team: Russian <None>\n"
+"PO-Revision-Date: 2011-04-12 10:00+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"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"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
@@ -112,11 +112,11 @@ msgstr "Автоматически запускать ${VIDALIA_NAME} при в
msgctxt "VidaliaShortcuts"
msgid "Add to Start Menu"
-msgstr "Добавить в меню \"Пуск\""
+msgstr "Добавить в меню Пуск"
msgctxt "VidaliaShortcutsDesc"
msgid "Add ${VIDALIA_NAME} to your Start menu."
-msgstr "Добавить ${VIDALIA_NAME} в меню \"Пуск\""
+msgstr "Добавить ${VIDALIA_NAME} в меню Пуск"
msgctxt "VidaliaRunNow"
msgid "Run ${VIDALIA_NAME}"
@@ -159,11 +159,11 @@ msgstr "Установить документацию ${TOR_NAME}."
msgctxt "TorShortcuts"
msgid "Add to Start Menu"
-msgstr "Добавить в меню \"Пуск\""
+msgstr "Добавить в меню Пуск"
msgctxt "TorShortcutsDesc"
msgid "Add ${TOR_NAME} to your Start menu."
-msgstr "Добавить ${TOR_NAME} в меню \"Пуск\""
+msgstr "Добавить ${TOR_NAME} в меню Пуск"
msgctxt "PolipoGroupDesc"
msgid ""
@@ -183,11 +183,11 @@ msgstr "Установить ${POLIPO_DESC}."
msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
-msgstr "Добавить в меню \"Пуск\""
+msgstr "Добавить в меню Пуск"
msgctxt "PolipoShortcutsDesc"
msgid "Add ${POLIPO_NAME} to your Start menu."
-msgstr "Добавить ${POLIPO_NAME} в меню \"Пуск\""
+msgstr "Добавить ${POLIPO_NAME} в меню Пуск"
msgctxt "PolipoStartup"
msgid "Run At Startup"
diff --git a/pkg/win32/po/sco/vidalia_sco.po b/pkg/win32/po/sco/vidalia_sco.po
index fa8c593..98a1868 100755
--- a/pkg/win32/po/sco/vidalia_sco.po
+++ b/pkg/win32/po/sco/vidalia_sco.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:25+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/son/vidalia_son.po b/pkg/win32/po/son/vidalia_son.po
index b966ed4..dab2414 100755
--- a/pkg/win32/po/son/vidalia_son.po
+++ b/pkg/win32/po/son/vidalia_son.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:25+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/su/vidalia_su.po b/pkg/win32/po/su/vidalia_su.po
index acafb8c..52232de 100755
--- a/pkg/win32/po/su/vidalia_su.po
+++ b/pkg/win32/po/su/vidalia_su.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/sw/vidalia_sw.po b/pkg/win32/po/sw/vidalia_sw.po
index eda29d8..f3550cd 100755
--- a/pkg/win32/po/sw/vidalia_sw.po
+++ b/pkg/win32/po/sw/vidalia_sw.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/ta/vidalia_ta.po b/pkg/win32/po/ta/vidalia_ta.po
index a23970d..a1e5aaa 100755
--- a/pkg/win32/po/ta/vidalia_ta.po
+++ b/pkg/win32/po/ta/vidalia_ta.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/te/vidalia_te.po b/pkg/win32/po/te/vidalia_te.po
index f6353c6..8ad0952 100755
--- a/pkg/win32/po/te/vidalia_te.po
+++ b/pkg/win32/po/te/vidalia_te.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/tg/vidalia_tg.po b/pkg/win32/po/tg/vidalia_tg.po
index eeceab8..cecc03f 100755
--- a/pkg/win32/po/tg/vidalia_tg.po
+++ b/pkg/win32/po/tg/vidalia_tg.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/th/vidalia_th.po b/pkg/win32/po/th/vidalia_th.po
index 0962ccc..425d415 100755
--- a/pkg/win32/po/th/vidalia_th.po
+++ b/pkg/win32/po/th/vidalia_th.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/ti/vidalia_ti.po b/pkg/win32/po/ti/vidalia_ti.po
index 9d7bf07..a496ed9 100755
--- a/pkg/win32/po/ti/vidalia_ti.po
+++ b/pkg/win32/po/ti/vidalia_ti.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/tk/vidalia_tk.po b/pkg/win32/po/tk/vidalia_tk.po
index df2cade..ef1e357 100755
--- a/pkg/win32/po/tk/vidalia_tk.po
+++ b/pkg/win32/po/tk/vidalia_tk.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/tr/vidalia_tr.po b/pkg/win32/po/tr/vidalia_tr.po
index e755ef5..31bc57f 100644
--- a/pkg/win32/po/tr/vidalia_tr.po
+++ b/pkg/win32/po/tr/vidalia_tr.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/ur/vidalia_ur.po b/pkg/win32/po/ur/vidalia_ur.po
index d57a9da..88ae6e0 100644
--- a/pkg/win32/po/ur/vidalia_ur.po
+++ b/pkg/win32/po/ur/vidalia_ur.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/ve/vidalia_ve.po b/pkg/win32/po/ve/vidalia_ve.po
index 01e42c7..acee9c9 100755
--- a/pkg/win32/po/ve/vidalia_ve.po
+++ b/pkg/win32/po/ve/vidalia_ve.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/vi/vidalia_vi.po b/pkg/win32/po/vi/vidalia_vi.po
index 3fd3f92..bbfd5a6 100755
--- a/pkg/win32/po/vi/vidalia_vi.po
+++ b/pkg/win32/po/vi/vidalia_vi.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:25+0000\n"
+"PO-Revision-Date: 2011-05-06 15:17+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/zh_CN/vidalia_zh_CN.po b/pkg/win32/po/zh_CN/vidalia_zh_CN.po
index cdd5659..4792574 100644
--- a/pkg/win32/po/zh_CN/vidalia_zh_CN.po
+++ b/pkg/win32/po/zh_CN/vidalia_zh_CN.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/zh_HK/vidalia_zh_HK.po b/pkg/win32/po/zh_HK/vidalia_zh_HK.po
index bfd053b..d4694a8 100755
--- a/pkg/win32/po/zh_HK/vidalia_zh_HK.po
+++ b/pkg/win32/po/zh_HK/vidalia_zh_HK.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:26+0000\n"
+"PO-Revision-Date: 2011-05-06 15:18+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/po/zu/vidalia_zu.po b/pkg/win32/po/zu/vidalia_zu.po
index e3856b8..aa82f74 100755
--- a/pkg/win32/po/zu/vidalia_zu.po
+++ b/pkg/win32/po/zu/vidalia_zu.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-03-18 11:27+0000\n"
+"PO-Revision-Date: 2011-05-06 15:19+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
diff --git a/pkg/win32/vidalia-bundle.nsi.in b/pkg/win32/vidalia-bundle.nsi.in
index 0b7a595..fc9b30e 100644
--- a/pkg/win32/vidalia-bundle.nsi.in
+++ b/pkg/win32/vidalia-bundle.nsi.in
@@ -5,9 +5,9 @@
;; LICENSE file, found in the top level directory of this distribution. If
;; you did not receive the LICENSE file with this file, you may obtain it
;; from the Vidalia source package distributed by the Vidalia Project at
-;; http://www.vidalia-project.net/. No part of Vidalia, including this file,
-;; may be copied, modified, propagated, or distributed except according to
-;; the terms described in the LICENSE file.
+;; http://www.torproject.org/projects/vidalia.html. 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"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 580c194..4a25aac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index dae0eb3..92ec489 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/src/common/Log.cpp b/src/common/Log.cpp
index d38cb9e..8f1d4db 100644
--- a/src/common/Log.cpp
+++ b/src/common/Log.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/common/Log.h b/src/common/Log.h
index 592b597..89fc529 100644
--- a/src/common/Log.h
+++ b/src/common/Log.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/common/TorSocket.cpp b/src/common/TorSocket.cpp
index 10651a1..4d37a2d 100644
--- a/src/common/TorSocket.cpp
+++ b/src/common/TorSocket.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/common/TorSocket.h b/src/common/TorSocket.h
index 46c2581..2b724f8 100644
--- a/src/common/TorSocket.h
+++ b/src/common/TorSocket.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/common/ZlibByteArray.cpp b/src/common/ZlibByteArray.cpp
index fc6cada..e851dd4 100644
--- a/src/common/ZlibByteArray.cpp
+++ b/src/common/ZlibByteArray.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
**
** * * *
**
diff --git a/src/common/ZlibByteArray.h b/src/common/ZlibByteArray.h
index bd6f6fe..85f6dde 100644
--- a/src/common/ZlibByteArray.h
+++ b/src/common/ZlibByteArray.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
**
** * * *
**
diff --git a/src/common/crypto.cpp b/src/common/crypto.cpp
index 4c2eb99..73c1e44 100644
--- a/src/common/crypto.cpp
+++ b/src/common/crypto.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
**
** * * *
**
diff --git a/src/common/crypto.h b/src/common/crypto.h
index bea1d80..39a4b90 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
**
** * * *
**
diff --git a/src/common/file.cpp b/src/common/file.cpp
index cc8e1c2..a91c06a 100644
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/common/file.h b/src/common/file.h
index 3086701..bc0acf3 100644
--- a/src/common/file.h
+++ b/src/common/file.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/common/html.cpp b/src/common/html.cpp
index 01a7c70..f1a4563 100644
--- a/src/common/html.cpp
+++ b/src/common/html.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/common/html.h b/src/common/html.h
index 6242158..aa84561 100644
--- a/src/common/html.h
+++ b/src/common/html.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/common/net.cpp b/src/common/net.cpp
index 2b0690d..c4c68c8 100644
--- a/src/common/net.cpp
+++ b/src/common/net.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/common/net.h b/src/common/net.h
index 1cf122a..4ab5790 100644
--- a/src/common/net.h
+++ b/src/common/net.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/common/procutil.cpp b/src/common/procutil.cpp
index c2fbbc4..2e06e16 100644
--- a/src/common/procutil.cpp
+++ b/src/common/procutil.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -21,6 +21,11 @@
#include <QFileInfo>
#include <QTextStream>
#include <QApplication>
+#include <QProcess>
+
+#if !defined(Q_OS_WIN)
+#include <signal.h>
+#endif
/** Returns the PID of the current process. */
@@ -104,13 +109,9 @@ read_pidfile(const QString &pidFileName, QString *errmsg)
}
QHash<qint64, QString>
-process_list()
+process_list(quint16 port)
{
-#if defined(Q_OS_WIN32)
- return win32_process_list();
-#else
- return QHash<qint64, QString>();
-#endif
+ return universal_process_list(port);
}
bool
@@ -127,7 +128,60 @@ process_kill(qint64 pid)
return (ret != FALSE);
#else
+ if(!kill(pid, 15))
+ return true;
return false;
#endif
}
+QHash<qint64, QString>
+universal_process_list(quint16 port)
+{
+ QHash<qint64, QString> pl;
+
+ QProcess ps;
+ QStringList args;
+#if defined(Q_OS_LINUX)
+ args << "-npl";
+#else
+ args << "-no";
+#endif
+
+ ps.start("netstat", args, QIODevice::ReadOnly);
+ while(!ps.waitForFinished());
+
+ QString flt = QString("127.0.0.1:%1").arg(port);
+ QStringList lines = QString(ps.readAllStandardOutput()).split("\n");
+ QStringList filtered = lines.filter(flt);
+
+#if defined(Q_OS_WIN)
+ filtered = filtered.filter("LISTENING");
+#endif
+
+ if(filtered.length() == 0)
+ return QHash<qint64, QString>();
+
+ qint64 pid = 0;
+ QString proc = "";
+#if defined(Q_OS_LINUX)
+ foreach(QString line, lines) {
+ QStringList items = line.trimmed().split(" ");
+ if(items.length() < 1)
+ continue;
+ items = items.last().trimmed().split("/");
+ if(items.length() < 2)
+ continue;
+
+ pid = items[0].toLong();
+ proc = items[1];
+
+ pl.insert(pid, proc);
+ }
+#else
+ pid = filtered[0].split(" ").last().trimmed().toLong();
+ proc = "tor";
+ pl.insert(pid, proc);
+#endif
+
+ return pl;
+}
diff --git a/src/common/procutil.h b/src/common/procutil.h
index 7e9b7dc..f82ec43 100644
--- a/src/common/procutil.h
+++ b/src/common/procutil.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -45,7 +45,8 @@ qint64 read_pidfile(const QString &pidfile, QString *errmsg = 0);
/** Return a list of all currently running PIDs and their associated process
* names. */
-QHash<qint64, QString> process_list();
+QHash<qint64, QString> process_list(quint16 port = 0);
+QHash<qint64, QString> universal_process_list(quint16 port);
/** Attempt to kill process <b>pid</b>. Return true if the specified process
* was successfully terminated. Otherwise, return false. */
diff --git a/src/common/stringutil.cpp b/src/common/stringutil.cpp
index 91398f3..404261a 100644
--- a/src/common/stringutil.cpp
+++ b/src/common/stringutil.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/common/stringutil.h b/src/common/stringutil.h
index 7bf124d..5feb392 100644
--- a/src/common/stringutil.h
+++ b/src/common/stringutil.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/common/win32.cpp b/src/common/win32.cpp
index e245c3c..814b5a1 100644
--- a/src/common/win32.cpp
+++ b/src/common/win32.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/common/win32.h b/src/common/win32.h
index b1ae9d5..b555d43 100644
--- a/src/common/win32.h
+++ b/src/common/win32.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt
index f396d9a..7dc5e69 100644
--- a/src/crashreporter/CMakeLists.txt
+++ b/src/crashreporter/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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(
@@ -19,17 +19,12 @@ include_directories(
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
@@ -57,6 +52,7 @@ target_link_libraries(crashreporter
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTNETWORK_LIBRARY}
+ ${BREAKPAD_LIBRARY}
common
)
if (WIN32)
diff --git a/src/crashreporter/CrashReportDialog.cpp b/src/crashreporter/CrashReportDialog.cpp
index f3acc68..30e186e 100644
--- a/src/crashreporter/CrashReportDialog.cpp
+++ b/src/crashreporter/CrashReportDialog.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -16,8 +16,6 @@
*/
#include "CrashReportDialog.h"
-#include "CrashReportUploader.h"
-#include "UploadProgressDialog.h"
#include "stringutil.h"
@@ -48,57 +46,17 @@ CrashReportDialog::setCrashAnnotations(const QHash<QString,QString> &annotations
}
void
-CrashReportDialog::setMinidump(const QString &id, const QByteArray &minidump)
+CrashReportDialog::setMinidumpFiles(const QString &minidump, const QString &annotations)
{
- _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);
+ _minidumpPath = minidump;
+ _annotationsPath = annotations;
- /* 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;
+ ui.textDetails->setPlainText(QString("%1\n%2\n").arg(_minidumpPath).arg(_annotationsPath));
}
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");
@@ -115,14 +73,3 @@ CrashReportDialog::accept()
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/src/crashreporter/CrashReportDialog.h b/src/crashreporter/CrashReportDialog.h
index bc05892..05a697b 100644
--- a/src/crashreporter/CrashReportDialog.h
+++ b/src/crashreporter/CrashReportDialog.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -40,15 +40,7 @@ public:
/** 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();
+ void setMinidumpFiles(const QString &minidump, const QString &annotations);
public slots:
/** Called when the user clicks the "Restart Vidalia" button on the
@@ -60,24 +52,14 @@ public slots:
*/
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.
+ /** Minidump path
*/
- QString _minidumpId;
+ QString _minidumpPath;
- /** Contents of the generated minidump.
+ /** Minidump info path
*/
- QByteArray _minidump;
+ QString _annotationsPath;
/** Set of parsed key-value pairs generated by the crashed application's
* exception handler and written alongside the minidump.
diff --git a/src/crashreporter/CrashReportDialog.ui b/src/crashreporter/CrashReportDialog.ui
index b565822..a4be3e5 100644
--- a/src/crashreporter/CrashReportDialog.ui
+++ b/src/crashreporter/CrashReportDialog.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>434</width>
- <height>310</height>
+ <width>492</width>
+ <height>257</height>
</rect>
</property>
<property name="windowTitle">
@@ -18,7 +18,7 @@
<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">
+ <item row="1" column="0" rowspan="2">
<widget class="QLabel" name="lblHeaderImage">
<property name="text">
<string/>
@@ -28,89 +28,112 @@
</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>
+ <item row="5" column="0" colspan="2">
+ <widget class="Line" name="line">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
+ </widget>
+ </item>
+ <item row="6" column="0" colspan="2">
+ <widget class="QLabel" name="lblDetails">
<property name="text">
- <string>Vidalia encountered an error and needed to close</string>
+ <string>Please fill a ticket in:</string>
</property>
<property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ <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="QLabel" name="lblHeader">
+ <item row="7" column="0" colspan="2">
+ <widget class="QLabel" name="lblLink">
<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>
+ <string><a href="https://trac.torproject.org/projects/tor/newticket">https://trac.torproject.org/projects/tor/newticket</a></string>
</property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ <property name="openExternalLinks">
+ <bool>true</bool>
</property>
- <property name="wordWrap">
+ </widget>
+ </item>
+ <item row="9" 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="2" column="0" colspan="2">
- <widget class="Line" name="line">
+ <item row="10" column="0" colspan="2">
+ <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>
- <item row="3" column="0" colspan="2">
- <widget class="QLabel" name="lblDetails">
+ <item row="1" 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>Please also describe what you were doing before the application crashed (optional):</string>
+ <string>Vidalia encountered an error and needed to close</string>
</property>
<property name="alignment">
- <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</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">
+ <item row="2" column="1">
+ <widget class="QLabel" name="lblHeader">
<property name="text">
- <string>Send my crash report to the Vidalia developers</string>
+ <string>A crash report has been created that you can send to the Vidalia developers to help identify and fix the problem. The submitted report does not contain any personally identifying information.</string>
</property>
- <property name="checked">
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="6" column="1">
- <widget class="QDialogButtonBox" name="buttonBox">
+ <item row="0" column="1">
+ <spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="8" column="0" colspan="2">
+ <widget class="QLabel" name="lblDetails2">
+ <property name="text">
+ <string>with a description of what you were doing before the application crashed, along with the following files corresponding to the crash report:</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
</property>
</widget>
</item>
diff --git a/src/crashreporter/CrashReportUploader.cpp b/src/crashreporter/CrashReportUploader.cpp
deleted file mode 100644
index cd59ee3..0000000
--- a/src/crashreporter/CrashReportUploader.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-** This file is part of Vidalia, and is subject to the license terms in the
-** LICENSE file, found in the top level directory of this distribution. If you
-** did not receive the LICENSE file with this file, you may obtain it from the
-** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
-*/
-
-/*
-** \file CrashReportUploader.cpp
-** \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/src/crashreporter/CrashReportUploader.h b/src/crashreporter/CrashReportUploader.h
deleted file mode 100644
index dd97954..0000000
--- a/src/crashreporter/CrashReportUploader.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-** This file is part of Vidalia, and is subject to the license terms in the
-** LICENSE file, found in the top level directory of this distribution. If you
-** did not receive the LICENSE file with this file, you may obtain it from the
-** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
-*/
-
-/*
-** \file CrashReportUploader.h
-** \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/src/crashreporter/UploadProgressDialog.cpp b/src/crashreporter/UploadProgressDialog.cpp
deleted file mode 100644
index 4030e10..0000000
--- a/src/crashreporter/UploadProgressDialog.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-** This file is part of Vidalia, and is subject to the license terms in the
-** LICENSE file, found in the top level directory of this distribution. If you
-** did not receive the LICENSE file with this file, you may obtain it from the
-** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
-*/
-
-/*
-** \file UploadProgressDialog.cpp
-** \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/src/crashreporter/UploadProgressDialog.h b/src/crashreporter/UploadProgressDialog.h
deleted file mode 100644
index e2cfcec..0000000
--- a/src/crashreporter/UploadProgressDialog.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-** This file is part of Vidalia, and is subject to the license terms in the
-** LICENSE file, found in the top level directory of this distribution. If you
-** did not receive the LICENSE file with this file, you may obtain it from the
-** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
-*/
-
-/*
-** \file UploadProgressDialog.cpp
-** \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/src/crashreporter/UploadProgressDialog.ui b/src/crashreporter/UploadProgressDialog.ui
deleted file mode 100644
index 4b985ac..0000000
--- a/src/crashreporter/UploadProgressDialog.ui
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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/src/crashreporter/main.cpp b/src/crashreporter/main.cpp
index 9d77dfd..c63d9f5 100644
--- a/src/crashreporter/main.cpp
+++ b/src/crashreporter/main.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -22,34 +22,6 @@
#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
@@ -94,7 +66,6 @@ main(int argc, char *argv[])
QFileInfo minidumpFile, extraInfoFile;
QString minidumpFilePath, extraInfoFilePath, errorMessage;
QHash<QString,QString> annotations;
- QByteArray minidump;
if (argc < 2) {
errorMessage = "No minidump file specified.";
@@ -131,14 +102,6 @@ main(int argc, char *argv[])
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()) {
@@ -149,8 +112,8 @@ main(int argc, char *argv[])
}
/* Display the crash reporting dialog */
- crashDialog.setMinidump(minidumpFile.baseName(), minidump);
crashDialog.setCrashAnnotations(annotations);
+ crashDialog.setMinidumpFiles(minidumpFilePath, extraInfoFilePath);
crashDialog.show();
return app.exec();
@@ -171,8 +134,8 @@ err:
"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> "
+ "<a href=\"https://trac.torproject.org/projects/tor/newticket\">"
+ "https://trac.torproject.org/projects/tor/newticket</a></p> "
"<p>Click \"Show Details\" below for information about the problem "
"encountered.");
diff --git a/src/crashreporter/res/CrashReporter.rc.in b/src/crashreporter/res/CrashReporter.rc.in
index d3e5951..a1f98a2 100644
--- a/src/crashreporter/res/CrashReporter.rc.in
+++ b/src/crashreporter/res/CrashReporter.rc.in
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/miniupnpc/CMakeLists.txt b/src/miniupnpc/CMakeLists.txt
index 28e18c5..53e2340 100644
--- a/src/miniupnpc/CMakeLists.txt
+++ b/src/miniupnpc/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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)
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 40af38a..08501ca 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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)
diff --git a/src/tools/nostdset/nostdset.sh b/src/tools/nostdset/nostdset.sh
index 9558526..5a41062 100644
--- a/src/tools/nostdset/nostdset.sh
+++ b/src/tools/nostdset/nostdset.sh
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
find -name *.ui | xargs sed "s/sizeHint\" stdset=\"0\" /sizeHint\"/" -i
diff --git a/src/tools/nsh2po/CMakeLists.txt b/src/tools/nsh2po/CMakeLists.txt
index f438f7b..8011ed3 100644
--- a/src/tools/nsh2po/CMakeLists.txt
+++ b/src/tools/nsh2po/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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
diff --git a/src/tools/nsh2po/nsh2po.cpp b/src/tools/nsh2po/nsh2po.cpp
index 9e6ddf4..3f129b2 100644
--- a/src/tools/nsh2po/nsh2po.cpp
+++ b/src/tools/nsh2po/nsh2po.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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>
diff --git a/src/tools/nsh2po/nsh2po_config.h.in b/src/tools/nsh2po/nsh2po_config.h.in
index 2e3e68b..e9d9c85 100644
--- a/src/tools/nsh2po/nsh2po_config.h.in
+++ b/src/tools/nsh2po/nsh2po_config.h.in
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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
diff --git a/src/tools/po2nsh/CMakeLists.txt b/src/tools/po2nsh/CMakeLists.txt
index 68de001..45b291f 100644
--- a/src/tools/po2nsh/CMakeLists.txt
+++ b/src/tools/po2nsh/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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
diff --git a/src/tools/po2nsh/po2nsh.cpp b/src/tools/po2nsh/po2nsh.cpp
index 979d00a..c83a738 100644
--- a/src/tools/po2nsh/po2nsh.cpp
+++ b/src/tools/po2nsh/po2nsh.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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>
diff --git a/src/tools/po2ts/CMakeLists.txt b/src/tools/po2ts/CMakeLists.txt
index a6f38a4..fff76bc 100644
--- a/src/tools/po2ts/CMakeLists.txt
+++ b/src/tools/po2ts/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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
diff --git a/src/tools/po2ts/po2ts.cpp b/src/tools/po2ts/po2ts.cpp
index 6d401eb..844d348 100644
--- a/src/tools/po2ts/po2ts.cpp
+++ b/src/tools/po2ts/po2ts.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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>
diff --git a/src/tools/po2wxl/CMakeLists.txt b/src/tools/po2wxl/CMakeLists.txt
index 0e4c7c1..5e8e547 100644
--- a/src/tools/po2wxl/CMakeLists.txt
+++ b/src/tools/po2wxl/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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
diff --git a/src/tools/po2wxl/po2wxl.cpp b/src/tools/po2wxl/po2wxl.cpp
index b62ea52..51edcf5 100644
--- a/src/tools/po2wxl/po2wxl.cpp
+++ b/src/tools/po2wxl/po2wxl.cpp
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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>
diff --git a/src/tools/ts2po/CMakeLists.txt b/src/tools/ts2po/CMakeLists.txt
index af6915e..b98725c 100644
--- a/src/tools/ts2po/CMakeLists.txt
+++ b/src/tools/ts2po/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. 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
diff --git a/src/tools/ts2po/ts2po.cpp b/src/tools/ts2po/ts2po.cpp
index f225dac..02719c3 100644
--- a/src/tools/ts2po/ts2po.cpp
+++ b/src/tools/ts2po/ts2po.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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>
diff --git a/src/tools/ts2po/ts2po_config.h.in b/src/tools/ts2po/ts2po_config.h.in
index 55f8828..50f69fc 100644
--- a/src/tools/ts2po/ts2po_config.h.in
+++ b/src/tools/ts2po/ts2po_config.h.in
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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
diff --git a/src/torcontrol/AddressMap.cpp b/src/torcontrol/AddressMap.cpp
index 802d3f3..69d0d62 100644
--- a/src/torcontrol/AddressMap.cpp
+++ b/src/torcontrol/AddressMap.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/AddressMap.h b/src/torcontrol/AddressMap.h
index 10a7b87..791e964 100644
--- a/src/torcontrol/AddressMap.h
+++ b/src/torcontrol/AddressMap.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/BootstrapStatus.cpp b/src/torcontrol/BootstrapStatus.cpp
index 32adaea..8184ffe 100644
--- a/src/torcontrol/BootstrapStatus.cpp
+++ b/src/torcontrol/BootstrapStatus.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/BootstrapStatus.h b/src/torcontrol/BootstrapStatus.h
index 4123def..7526fdb 100644
--- a/src/torcontrol/BootstrapStatus.h
+++ b/src/torcontrol/BootstrapStatus.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/CMakeLists.txt b/src/torcontrol/CMakeLists.txt
index 5f3b325..735cc70 100644
--- a/src/torcontrol/CMakeLists.txt
+++ b/src/torcontrol/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/src/torcontrol/Circuit.cpp b/src/torcontrol/Circuit.cpp
index 4855290..3b6cb80 100644
--- a/src/torcontrol/Circuit.cpp
+++ b/src/torcontrol/Circuit.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/Circuit.h b/src/torcontrol/Circuit.h
index cb6e41a..33f12ef 100644
--- a/src/torcontrol/Circuit.h
+++ b/src/torcontrol/Circuit.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/ControlCommand.cpp b/src/torcontrol/ControlCommand.cpp
index 6dd8ae0..953ee95 100644
--- a/src/torcontrol/ControlCommand.cpp
+++ b/src/torcontrol/ControlCommand.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/ControlCommand.h b/src/torcontrol/ControlCommand.h
index b3bb974..42aba88 100644
--- a/src/torcontrol/ControlCommand.h
+++ b/src/torcontrol/ControlCommand.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/ControlConnection.cpp b/src/torcontrol/ControlConnection.cpp
index 17d32b1..365da32 100644
--- a/src/torcontrol/ControlConnection.cpp
+++ b/src/torcontrol/ControlConnection.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/ControlConnection.h b/src/torcontrol/ControlConnection.h
index 2fa9fc9..5a56ced 100644
--- a/src/torcontrol/ControlConnection.h
+++ b/src/torcontrol/ControlConnection.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/ControlMethod.cpp b/src/torcontrol/ControlMethod.cpp
index c23dace..dbfd948 100644
--- a/src/torcontrol/ControlMethod.cpp
+++ b/src/torcontrol/ControlMethod.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/ControlMethod.h b/src/torcontrol/ControlMethod.h
index 8a593df..3a9fee4 100644
--- a/src/torcontrol/ControlMethod.h
+++ b/src/torcontrol/ControlMethod.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/ControlReply.cpp b/src/torcontrol/ControlReply.cpp
index 296a8a5..c0eaf1d 100644
--- a/src/torcontrol/ControlReply.cpp
+++ b/src/torcontrol/ControlReply.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/ControlReply.h b/src/torcontrol/ControlReply.h
index 421b128..c7400f3 100644
--- a/src/torcontrol/ControlReply.h
+++ b/src/torcontrol/ControlReply.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/ControlSocket.cpp b/src/torcontrol/ControlSocket.cpp
index 8ba8e86..6a4d729 100644
--- a/src/torcontrol/ControlSocket.cpp
+++ b/src/torcontrol/ControlSocket.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/ControlSocket.h b/src/torcontrol/ControlSocket.h
index 3dcc36b..995efeb 100644
--- a/src/torcontrol/ControlSocket.h
+++ b/src/torcontrol/ControlSocket.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/LogEvent.cpp b/src/torcontrol/LogEvent.cpp
index f735f5c..ad4dee4 100644
--- a/src/torcontrol/LogEvent.cpp
+++ b/src/torcontrol/LogEvent.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/LogEvent.h b/src/torcontrol/LogEvent.h
index 8a6c019..7f422e5 100644
--- a/src/torcontrol/LogEvent.h
+++ b/src/torcontrol/LogEvent.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/ProtocolInfo.cpp b/src/torcontrol/ProtocolInfo.cpp
index 45ebe4a..07acaeb 100644
--- a/src/torcontrol/ProtocolInfo.cpp
+++ b/src/torcontrol/ProtocolInfo.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/ProtocolInfo.h b/src/torcontrol/ProtocolInfo.h
index c523db4..1b69589 100644
--- a/src/torcontrol/ProtocolInfo.h
+++ b/src/torcontrol/ProtocolInfo.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/ReplyLine.cpp b/src/torcontrol/ReplyLine.cpp
index 093ab39..2973b9d 100644
--- a/src/torcontrol/ReplyLine.cpp
+++ b/src/torcontrol/ReplyLine.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/ReplyLine.h b/src/torcontrol/ReplyLine.h
index 4cc9438..c3fec8d 100644
--- a/src/torcontrol/ReplyLine.h
+++ b/src/torcontrol/ReplyLine.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/RouterDescriptor.cpp b/src/torcontrol/RouterDescriptor.cpp
index 8bae277..e63ca20 100644
--- a/src/torcontrol/RouterDescriptor.cpp
+++ b/src/torcontrol/RouterDescriptor.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/RouterDescriptor.h b/src/torcontrol/RouterDescriptor.h
index 6dbf33d..d4ff868 100644
--- a/src/torcontrol/RouterDescriptor.h
+++ b/src/torcontrol/RouterDescriptor.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/RouterStatus.cpp b/src/torcontrol/RouterStatus.cpp
index b2644ee..9ee795b 100644
--- a/src/torcontrol/RouterStatus.cpp
+++ b/src/torcontrol/RouterStatus.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/RouterStatus.h b/src/torcontrol/RouterStatus.h
index 4315978..c71e548 100644
--- a/src/torcontrol/RouterStatus.h
+++ b/src/torcontrol/RouterStatus.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/SendCommandEvent.cpp b/src/torcontrol/SendCommandEvent.cpp
index 2e88927..8472324 100644
--- a/src/torcontrol/SendCommandEvent.cpp
+++ b/src/torcontrol/SendCommandEvent.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/SendCommandEvent.h b/src/torcontrol/SendCommandEvent.h
index 356ab14..89499f4 100644
--- a/src/torcontrol/SendCommandEvent.h
+++ b/src/torcontrol/SendCommandEvent.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/Stream.cpp b/src/torcontrol/Stream.cpp
index 258638e..e8c2d18 100644
--- a/src/torcontrol/Stream.cpp
+++ b/src/torcontrol/Stream.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/Stream.h b/src/torcontrol/Stream.h
index 860a04b..3a8d9a6 100644
--- a/src/torcontrol/Stream.h
+++ b/src/torcontrol/Stream.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp
index ea09724..433e1a9 100644
--- a/src/torcontrol/TorControl.cpp
+++ b/src/torcontrol/TorControl.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -97,10 +97,6 @@ TorControl::TorControl(ControlMethod::Method method)
/** Default destructor */
TorControl::~TorControl()
{
- /* Disconnect the control socket */
- if (isConnected()) {
- disconnect();
- }
/* If we started our own Tor, stop it now */
if (isVidaliaRunningTor()) {
stop();
@@ -135,10 +131,18 @@ bool
TorControl::stop(QString *errmsg)
{
bool rc = false;
- if (_controlConn->isConnected())
- rc = signal(TorSignal::Halt, errmsg);
- if (!rc)
- rc = _torProcess->stop(errmsg);
+
+ if (!isVidaliaRunningTor()) {
+ *errmsg = tr("Vidalia has not started Tor. "
+ "You need to stop Tor through the interface you started it.");
+ return rc;
+ } else {
+ if (_controlConn->isConnected())
+ rc = signal(TorSignal::Halt, errmsg);
+ if (!rc)
+ rc = _torProcess->stop(errmsg);
+ }
+
return rc;
}
diff --git a/src/torcontrol/TorControl.h b/src/torcontrol/TorControl.h
index 61313ae..589fa23 100644
--- a/src/torcontrol/TorControl.h
+++ b/src/torcontrol/TorControl.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/TorEvents.cpp b/src/torcontrol/TorEvents.cpp
index 41f85b7..588a093 100644
--- a/src/torcontrol/TorEvents.cpp
+++ b/src/torcontrol/TorEvents.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/TorEvents.h b/src/torcontrol/TorEvents.h
index 2c5b7f1..58584ee 100644
--- a/src/torcontrol/TorEvents.h
+++ b/src/torcontrol/TorEvents.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/TorProcess.cpp b/src/torcontrol/TorProcess.cpp
index 00786bd..7275f7a 100644
--- a/src/torcontrol/TorProcess.cpp
+++ b/src/torcontrol/TorProcess.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/TorProcess.h b/src/torcontrol/TorProcess.h
index 884d039..8438173 100644
--- a/src/torcontrol/TorProcess.h
+++ b/src/torcontrol/TorProcess.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/TorService.cpp b/src/torcontrol/TorService.cpp
index bcf782f..7214183 100644
--- a/src/torcontrol/TorService.cpp
+++ b/src/torcontrol/TorService.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/TorService.h b/src/torcontrol/TorService.h
index b7b4bc0..8c4fad0 100644
--- a/src/torcontrol/TorService.h
+++ b/src/torcontrol/TorService.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/TorSignal.cpp b/src/torcontrol/TorSignal.cpp
index a9bac4b..bdf10ad 100644
--- a/src/torcontrol/TorSignal.cpp
+++ b/src/torcontrol/TorSignal.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/TorSignal.h b/src/torcontrol/TorSignal.h
index cd8bf26..af0769f 100644
--- a/src/torcontrol/TorSignal.h
+++ b/src/torcontrol/TorSignal.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/tcglobal.cpp b/src/torcontrol/tcglobal.cpp
index 6b2b54f..ffbbbfc 100644
--- a/src/torcontrol/tcglobal.cpp
+++ b/src/torcontrol/tcglobal.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/torcontrol/tcglobal.h b/src/torcontrol/tcglobal.h
index 949647d..6c12019 100644
--- a/src/torcontrol/tcglobal.h
+++ b/src/torcontrol/tcglobal.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt
index 15eac34..5811320 100644
--- a/src/vidalia/CMakeLists.txt
+++ b/src/vidalia/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
@@ -151,35 +151,65 @@ if (USE_MINIUPNPC)
)
endif(USE_MINIUPNPC)
-## Help browser sources
+## Main Vidalia sources
set(vidalia_SRCS ${vidalia_SRCS}
- help/browser/HelpBrowser.cpp
- help/browser/HelpTextBrowser.cpp
+ main.cpp
+ Vidalia.cpp
+ LanguageSupport.cpp
+ VTabWidget.cpp
+ MainWindow.cpp
+ VidaliaWindow.cpp
+ VMessageBox.cpp
+ ControlPasswordInputDialog.cpp
+ VidaliaTab.cpp
+ StatusTab.cpp
+ HelperProcess.cpp
)
qt4_wrap_cpp(vidalia_SRCS
- help/browser/HelpBrowser.h
- help/browser/HelpTextBrowser.h
+ Vidalia.h
+ VTabWidget.h
+ MainWindow.h
+ VidaliaWindow.h
+ VMessageBox.h
+ ControlPasswordInputDialog.h
+ VidaliaTab.h
+ StatusTab.h
+ HelperProcess.h
)
-## Message log sources
-set(vidalia_SRCS ${vidalia_SRCS}
- log/LogFile.cpp
- log/LogHeaderView.cpp
- log/LogMessageColumnDelegate.cpp
- log/LogTreeItem.cpp
- log/LogTreeWidget.cpp
- log/MessageLog.cpp
- log/StatusEventItem.cpp
- log/StatusEventItemDelegate.cpp
- log/StatusEventWidget.cpp
+if (USE_MINIUPNPC)
+ qt4_wrap_ui(vidalia_SRCS config/UPNPTestDialog.ui)
+endif(USE_MINIUPNPC)
+
+## Specify all the Qt Designer .ui files
+qt4_wrap_ui(vidalia_SRCS
+ ControlPasswordInputDialog.ui
+ StatusTab.ui
+ MainWindow.ui
+ about/AboutDialog.ui
+ about/LicenseDialog.ui
+ bwgraph/BandwidthGraph.ui
+ config/AdvancedPage.ui
+ config/AppearancePage.ui
+ config/BridgeDownloaderProgressDialog.ui
+ config/BridgeUsageDialog.ui
+ config/ConfigDialog.ui
+ config/GeneralPage.ui
+ config/NetworkPage.ui
+ config/ServerPage.ui
+ config/ServicePage.ui
+ config/TorrcDialog.ui
+ log/MessageLog.ui
+ help/browser/HelpBrowser.ui
+ network/NetViewer.ui
+ network/RouterInfoDialog.ui
)
-qt4_wrap_cpp(vidalia_SRCS
- log/LogFile.h
- log/LogHeaderView.h
- log/LogTreeWidget.h
- log/MessageLog.h
- log/StatusEventItemDelegate.h
- log/StatusEventWidget.h
+
+## Add the resource files (icons, etc.)
+qt4_add_resources(vidalia_SRCS
+ res/vidalia.qrc
+ help/content/content.qrc
+ ${CMAKE_CURRENT_BINARY_DIR}/i18n/vidalia_i18n.qrc
)
## Network map sources
@@ -235,112 +265,35 @@ if (USE_GEOIP)
)
endif(USE_GEOIP)
-## Main Vidalia sources
+## Help browser sources
set(vidalia_SRCS ${vidalia_SRCS}
- main.cpp
- Vidalia.cpp
- LanguageSupport.cpp
- MainWindow.cpp
- VClickLabel.cpp
- VidaliaWindow.cpp
- VMessageBox.cpp
- HelperProcess.cpp
- ControlPasswordInputDialog.cpp
+ help/browser/HelpBrowser.cpp
+ help/browser/HelpTextBrowser.cpp
)
qt4_wrap_cpp(vidalia_SRCS
- Vidalia.h
- MainWindow.h
- VClickLabel.h
- VidaliaWindow.h
- VMessageBox.h
- HelperProcess.h
- ControlPasswordInputDialog.h
-)
-if (USE_BREAKPAD)
- set(vidalia_SRCS ${vidalia_SRCS}
- CrashReporter.cpp
- )
-endif(USE_BREAKPAD)
-
-## Specify all the Qt Designer .ui files
-qt4_wrap_ui(vidalia_SRCS
- ControlPasswordInputDialog.ui
- MainWindow.ui
- about/AboutDialog.ui
- about/LicenseDialog.ui
- bwgraph/BandwidthGraph.ui
- config/AdvancedPage.ui
- config/AppearancePage.ui
- config/BridgeDownloaderProgressDialog.ui
- config/BridgeUsageDialog.ui
- config/ConfigDialog.ui
- config/GeneralPage.ui
- config/NetworkPage.ui
- config/ServerPage.ui
- config/ServicePage.ui
- config/TorrcDialog.ui
- help/browser/HelpBrowser.ui
- log/MessageLog.ui
- network/NetViewer.ui
- network/RouterInfoDialog.ui
+ help/browser/HelpBrowser.h
+ help/browser/HelpTextBrowser.h
)
-if (USE_MINIUPNPC)
- qt4_wrap_ui(vidalia_SRCS config/UPNPTestDialog.ui)
-endif(USE_MINIUPNPC)
-
-if (USE_AUTOUPDATE)
- set(vidalia_SRCS ${vidalia_SRCS}
- PackageInfo.cpp
- UpdateProcess.cpp
- UpdateProgressDialog.cpp
- UpdatesAvailableDialog.cpp
- )
- qt4_wrap_cpp(vidalia_SRCS
- UpdateProcess.h
- UpdateProgressDialog.h
- UpdatesAvailableDialog.h
- )
- qt4_wrap_ui(vidalia_SRCS
- UpdateProgressDialog.ui
- UpdatesAvailableDialog.ui
- )
-endif(USE_AUTOUPDATE)
-
-## Add the resource files (icons, etc.)
-qt4_add_resources(vidalia_SRCS
- res/vidalia.qrc
- help/content/content.qrc
- ${CMAKE_CURRENT_BINARY_DIR}/i18n/vidalia_i18n.qrc
+## Message log sources
+set(vidalia_SRCS ${vidalia_SRCS}
+ log/LogFile.cpp
+ log/LogHeaderView.cpp
+ log/LogMessageColumnDelegate.cpp
+ log/LogTreeItem.cpp
+ log/LogTreeWidget.cpp
+ log/MessageLog.cpp
+ log/StatusEventItem.cpp
+ log/StatusEventItemDelegate.cpp
+ log/StatusEventWidget.cpp
)
-
-## Specify the map data Marble will need
-set(marble_DATA
- landcolors.leg
- seacolors.leg
- maps/earth/bluemarble/bluemarble.dgml
- maps/earth/citylights/citylights.dgml
- maps/earth/srtm/srtm.dgml
- maps/earth/srtm/srtm.jpg
- mwdbii/DATELINE.PNT
- mwdbii/PAUST.PNT
- mwdbii/PBORDER.PNT
- mwdbii/PCANPROV.PNT
- mwdbii/PCOAST.PNT
- mwdbii/PDIFFBORDER.PNT
- mwdbii/PGLACIER.PNT
- mwdbii/PISLAND.PNT
- mwdbii/PLAKE.PNT
- mwdbii/PLAKEISLAND.PNT
- mwdbii/PMEXICO.PNT
- mwdbii/PUSA48.DIFF.PNT
- mwdbii/PUSA48.PNT
- mwdbii/RIVER.PNT
- placemarks/baseplacemarks.cache
- placemarks/boundaryplacemarks.cache
- placemarks/elevplacemarks.cache
- stars/stars.dat
- svg/worldmap.svg
+qt4_wrap_cpp(vidalia_SRCS
+ log/LogFile.h
+ log/LogHeaderView.h
+ log/LogTreeWidget.h
+ log/MessageLog.h
+ log/StatusEventItemDelegate.h
+ log/StatusEventWidget.h
)
## Set the appropriate executable target for the current platform
@@ -467,7 +420,7 @@ if (USE_MINIUPNPC)
target_link_libraries(${vidalia_BIN} miniupnpc)
endif(USE_MINIUPNPC)
if (USE_BREAKPAD)
- target_link_libraries(${vidalia_BIN} ${BREAKPAD_LIBRARIES})
+ target_link_libraries(${vidalia_BIN} ${BREAKPAD_LIBRARY})
endif(USE_BREAKPAD)
if (USE_MARBLE)
target_link_libraries(${vidalia_BIN}
diff --git a/src/vidalia/ControlPasswordInputDialog.cpp b/src/vidalia/ControlPasswordInputDialog.cpp
index 5cc4dec..9fe3eee 100644
--- a/src/vidalia/ControlPasswordInputDialog.cpp
+++ b/src/vidalia/ControlPasswordInputDialog.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -27,17 +27,11 @@ ControlPasswordInputDialog::ControlPasswordInputDialog(QWidget *parent)
setAttribute(Qt::WA_DeleteOnClose, false);
ui.buttonBox->setStandardButtons(QDialogButtonBox::Ok
- | QDialogButtonBox::Cancel
| QDialogButtonBox::Reset
| QDialogButtonBox::Help);
connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton*)),
this, SLOT(clicked(QAbstractButton*)));
- connect(ui.linePassword, SIGNAL(textEdited(QString)),
- this, SLOT(passwordEdited(QString)));
-
- /* The dialog starts with an empty password field */
- passwordEdited(QString());
}
void
@@ -46,32 +40,16 @@ ControlPasswordInputDialog::setResetEnabled(bool enabled)
if (enabled) {
ui.buttonBox->setStandardButtons(ui.buttonBox->standardButtons()
| QDialogButtonBox::Reset);
+ ui.lblOptionOne->setVisible(false);
+ ui.lblOptionTwo->setVisible(true);
} else {
ui.buttonBox->setStandardButtons(ui.buttonBox->standardButtons()
& ~QDialogButtonBox::Reset);
+ ui.lblOptionOne->setVisible(true);
+ ui.lblOptionTwo->setVisible(false);
}
}
-QString
-ControlPasswordInputDialog::password() const
-{
- return ui.linePassword->text();
-}
-
-bool
-ControlPasswordInputDialog::isSavePasswordChecked() const
-{
- return ui.chkSavePassword->isChecked();
-}
-
-void
-ControlPasswordInputDialog::passwordEdited(const QString &text)
-{
- QPushButton *okButton = ui.buttonBox->button(QDialogButtonBox::Ok);
- if (okButton)
- okButton->setEnabled(! text.isEmpty());
-}
-
void
ControlPasswordInputDialog::clicked(QAbstractButton *button)
{
@@ -96,7 +74,7 @@ void
ControlPasswordInputDialog::setVisible(bool visible)
{
if (visible)
- resize(minimumSizeHint());
+ adjustSize();
QDialog::setVisible(visible);
}
diff --git a/src/vidalia/ControlPasswordInputDialog.h b/src/vidalia/ControlPasswordInputDialog.h
index 9722062..b7fa313 100644
--- a/src/vidalia/ControlPasswordInputDialog.h
+++ b/src/vidalia/ControlPasswordInputDialog.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -32,16 +32,6 @@ public:
*/
ControlPasswordInputDialog(QWidget *parent = 0);
- /** Returns the password entered in the dialog. If the dialog was dismissed
- * with the "Cancel" button, then the returned QString will be empty.
- */
- QString password() const;
-
- /** Returns true if the "Remember my password" checkbox was checked at the
- * time the dialog was dismissed.
- */
- bool isSavePasswordChecked() const;
-
/** If <b>enabled</b> is true, then the "Reset" button will be visible on
* the password input dialog. Otherwise, the "Reset" button will be hidden.
*/
@@ -60,11 +50,6 @@ protected slots:
*/
void clicked(QAbstractButton *button);
- /** Called when the user changes the password QLineEdit. If the password is
- * empty, then the "Ok" button will be disabled. Otherwise, it is enabled.
- */
- void passwordEdited(const QString &text);
-
protected:
/** Adjusts the size of the input dialog when it is displayed. */
virtual void setVisible(bool visible);
diff --git a/src/vidalia/ControlPasswordInputDialog.ui b/src/vidalia/ControlPasswordInputDialog.ui
index 00b5002..07b761c 100644
--- a/src/vidalia/ControlPasswordInputDialog.ui
+++ b/src/vidalia/ControlPasswordInputDialog.ui
@@ -1,119 +1,133 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>ControlPasswordInputDialog</class>
- <widget class="QDialog" name="ControlPasswordInputDialog" >
- <property name="windowModality" >
+ <widget class="QDialog" name="ControlPasswordInputDialog">
+ <property name="windowModality">
<enum>Qt::WindowModal</enum>
</property>
- <property name="geometry" >
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>350</width>
- <height>192</height>
+ <width>470</width>
+ <height>189</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>1</horstretch>
+ <verstretch>1</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
</size>
</property>
- <property name="windowTitle" >
- <string>Password Required</string>
+ <property name="windowTitle">
+ <string>Problem connecting to Tor</string>
</property>
- <property name="windowIcon" >
+ <property name="windowIcon">
<iconset>
<normaloff>:/images/32x32/dialog-password.png</normaloff>:/images/32x32/dialog-password.png</iconset>
</property>
- <property name="sizeGripEnabled" >
+ <property name="sizeGripEnabled">
<bool>false</bool>
</property>
- <property name="modal" >
+ <property name="modal">
<bool>true</bool>
</property>
- <layout class="QGridLayout" name="gridLayout_2" >
- <item row="0" column="0" >
- <layout class="QGridLayout" name="gridLayout" >
- <property name="sizeConstraint" >
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
- <item row="0" column="0" >
- <widget class="QLabel" name="lblIcon" >
- <property name="minimumSize" >
- <size>
- <width>48</width>
- <height>48</height>
- </size>
- </property>
- <property name="text" >
- <string/>
- </property>
- <property name="pixmap" >
- <pixmap resource="res/vidalia.qrc" >:/images/48x48/dialog-password.png</pixmap>
- </property>
- <property name="alignment" >
- <set>Qt::AlignHCenter|Qt::AlignTop</set>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QLabel" name="lblPrompt" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <item row="0" column="1">
+ <widget class="QLabel" name="lblPrompt">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>1</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="text" >
- <string>Vidalia has connected to a running Tor process that requires a password. Please enter your control password: </string>
+ <property name="text">
+ <string>Tor is already running, but Vidalia can't connect to it.
+
+This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor.</string>
</property>
- <property name="textFormat" >
+ <property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
- <property name="scaledContents" >
+ <property name="scaledContents">
<bool>true</bool>
</property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QCheckBox" name="chkSavePassword" >
- <property name="text" >
- <string>Remember my password</string>
+ <item row="6" column="0" colspan="2">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
</property>
</widget>
</item>
- <item row="3" column="0" colspan="2" >
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
+ <item row="1" column="1">
+ <widget class="QLabel" name="lblOptionOne">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>1</horstretch>
+ <verstretch>1</verstretch>
+ </sizepolicy>
</property>
- <property name="standardButtons" >
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+ <property name="lineWidth">
+ <number>1</number>
+ </property>
+ <property name="text">
+ <string>You will need to shut down the Tor process before Vidalia can launch a new one. </string>
+ </property>
+ <property name="textFormat">
+ <enum>Qt::AutoText</enum>
+ </property>
+ <property name="scaledContents">
+ <bool>false</bool>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <property name="openExternalLinks">
+ <bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="linePassword" >
- <property name="echoMode" >
- <enum>QLineEdit::Password</enum>
+ <item row="2" column="1">
+ <widget class="QLabel" name="lblOptionTwo">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>1</horstretch>
+ <verstretch>1</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Vidalia can try to restart Tor for you. Doing so will close all currently active connections through your Tor process.</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
</property>
</widget>
</item>
@@ -122,7 +136,7 @@
</layout>
</widget>
<resources>
- <include location="res/vidalia.qrc" />
+ <include location="res/vidalia.qrc"/>
</resources>
<connections/>
</ui>
diff --git a/src/vidalia/CrashReporter.cpp b/src/vidalia/CrashReporter.cpp
index b3a06fe..d085dda 100644
--- a/src/vidalia/CrashReporter.cpp
+++ b/src/vidalia/CrashReporter.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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
@@ -50,8 +50,12 @@
#include <client/windows/handler/exception_handler.h>
#elif defined(Q_OS_MAC)
#include <client/mac/handler/exception_handler.h>
+#include <sys/wait.h>
+#include <fcntl.h>
#elif defined(Q_OS_LINUX)
#include <client/linux/handler/exception_handler.h>
+#include <sys/wait.h>
+#include <fcntl.h>
#elif defined(Q_OS_SOLARIS)
#include <client/solaris/handler/exception_handler.h>
#endif
@@ -225,7 +229,10 @@ write_extra_dump_info(const _char_t *path, const _char_t *id, time_t crashTime)
if (hFile == INVALID_HANDLE_VALUE)
return false;
#else
- /* TODO: Implement for non-Windowses */
+ _file_handle_t hFile = creat(extraInfoPath, S_IRUSR | S_IWUSR);
+ if(hFile == -1) {
+ return false;
+ }
#endif
char crashTimeString[24], startupTimeString[24];
@@ -241,8 +248,7 @@ write_extra_dump_info(const _char_t *path, const _char_t *id, time_t crashTime)
#if defined(Q_OS_WIN32)
CloseHandle(hFile);
#else
- /* TODO: Implement for non-Windowses */
- /* close(hFile); */
+ close(hFile);
#endif
return true;
}
@@ -270,6 +276,7 @@ minidump_callback(const _char_t *path, // Path to the minidump file
* restart, and any necessary restart arguments. */
write_extra_dump_info(path, id, time(NULL));
+#if defined(Q_OS_WIN32)
/* Format the command line used to launch the crash reporter */
_char_t commandLine[MAX_CMD_LEN] = TEXT("");
append_string(commandLine, TEXT("\""), MAX_CMD_LEN);
@@ -283,7 +290,6 @@ minidump_callback(const _char_t *path, // Path to the minidump file
return false;
/* Launch the crash reporter with the name and location of the minidump */
-#if defined(Q_OS_WIN32)
PROCESS_INFORMATION pi;
STARTUPINFOW si;
@@ -302,8 +308,29 @@ minidump_callback(const _char_t *path, // Path to the minidump file
TerminateProcess(GetCurrentProcess(), 1);
return true;
#else
- /* TODO: Implement for non-Windowses */
- return false;
+ /* Format the command line used to launch the crash reporter */
+ _char_t args[MAX_CMD_LEN] = TEXT("");
+ size_t len;
+
+ append_string(args, path, MAX_CMD_LEN);
+ append_string(args, PATH_SEPARATOR, MAX_CMD_LEN);
+ append_string(args, id, MAX_CMD_LEN);
+ len = append_string(args, TEXT(".dmp"), MAX_CMD_LEN);
+ if (len >= MAX_CMD_LEN)
+ return false;
+
+ char *nargs[] = {crashReporterExecutable, args, NULL};
+
+ pid_t p = fork(), ret;
+ int status;
+ if(p == 0) {
+ execv(crashReporterExecutable, nargs);
+ } else {
+ ret = wait(&status);
+ if(ret == -1)
+ return false;
+ }
+ return true;
#endif
}
diff --git a/src/vidalia/CrashReporter.h b/src/vidalia/CrashReporter.h
index 3ad3ffb..fbbea94 100644
--- a/src/vidalia/CrashReporter.h
+++ b/src/vidalia/CrashReporter.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/HelperProcess.cpp b/src/vidalia/HelperProcess.cpp
index 07fa733..0abc848 100644
--- a/src/vidalia/HelperProcess.cpp
+++ b/src/vidalia/HelperProcess.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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
diff --git a/src/vidalia/HelperProcess.h b/src/vidalia/HelperProcess.h
index 795d077..cf2b234 100644
--- a/src/vidalia/HelperProcess.h
+++ b/src/vidalia/HelperProcess.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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
diff --git a/src/vidalia/LanguageSupport.cpp b/src/vidalia/LanguageSupport.cpp
index b9959ae..7433514 100644
--- a/src/vidalia/LanguageSupport.cpp
+++ b/src/vidalia/LanguageSupport.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/LanguageSupport.h b/src/vidalia/LanguageSupport.h
index 4abc6dc..7953314 100644
--- a/src/vidalia/LanguageSupport.h
+++ b/src/vidalia/LanguageSupport.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp
index 1a3c215..c373d01 100644
--- a/src/vidalia/MainWindow.cpp
+++ b/src/vidalia/MainWindow.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -19,10 +19,12 @@
#include "MainWindow.h"
#include "Vidalia.h"
-#include "VMessageBox.h"
#include "ControlPasswordInputDialog.h"
+#include "VMessageBox.h"
#include "TorSettings.h"
#include "ServerSettings.h"
+#include "AboutDialog.h"
+#include "HelpBrowser.h"
#ifdef USE_AUTOUPDATE
#include "UpdatesAvailableDialog.h"
#endif
@@ -35,9 +37,7 @@
#include "stringutil.h"
#include "procutil.h"
-#include <QMenuBar>
-#include <QTimer>
-#include <QTextStream>
+#include <QtGui>
#define IMG_BWGRAPH ":/images/16x16/utilities-system-monitor.png"
#define IMG_CONTROL_PANEL ":/images/16x16/system-run.png"
@@ -97,41 +97,241 @@ void qt_mac_set_dock_menu(QMenu *menu);
MainWindow::MainWindow()
: VidaliaWindow("MainWindow")
{
- VidaliaSettings settings;
+ /* Create a new TorControl object, used to communicate with Tor */
+ _torControl = Vidalia::torControl();
- ui.setupUi(this);
+ createGUI();
+ createConnections();
+}
- /* Pressing 'Esc' or 'Ctrl+W' will close the window */
- Vidalia::createShortcut("Ctrl+W", this, ui.btnHide, SLOT(click()));
- Vidalia::createShortcut("Esc", this, ui.btnHide, SLOT(click()));
-
- /* Create all the dialogs of which we only want one instance */
- _messageLog = new MessageLog();
- _bandwidthGraph = new BandwidthGraph();
- _netViewer = new NetViewer();
- _configDialog = new ConfigDialog();
- _menuBar = 0;
- connect(_messageLog, SIGNAL(helpRequested(QString)),
- this, SLOT(showHelpDialog(QString)));
- connect(_netViewer, SIGNAL(helpRequested(QString)),
- this, SLOT(showHelpDialog(QString)));
- connect(_configDialog, SIGNAL(helpRequested(QString)),
- this, SLOT(showHelpDialog(QString)));
- connect(_configDialog, SIGNAL(restartTor()),
- this, SLOT(restart()));
+/** Destructor */
+MainWindow::~MainWindow() {}
- /* Create the actions that will go in the tray menu */
+/** Calls the different methods that will handle the GUI "creation".
+ * It's called once at the MainWindow creation. */
+void
+MainWindow::createGUI()
+{
+ ui.setupUi(this);
createActions();
- /* Creates a tray icon with a context menu and adds it to the system's
- * notification area. */
+ createMenuBar();
+ createToolBar();
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();
+ // We need to create this tab at the beggining
+ // and we must specify the statusBar
+ _messageLog = new MessageLog(this->statusBar());
+ _graph = new BandwidthGraph(this->statusBar());
+
+ addTab(&_statusTab);
+ ui.tabWidget->pinTab(0);
+}
+
+/** Creates the actions used in toolbars and menu */
+void
+MainWindow::createActions()
+{
+ _actionShowControlPanel = new QAction(QIcon(IMG_CONTROL_PANEL), tr("Control Panel"), this);
+ _actionStartTor = new QAction(QIcon(IMG_START_TOR_16), tr("Start"), this);
+ _actionStopTor = new QAction(QIcon(IMG_STOP_TOR_16), tr("Stop"), this);
+ _actionRestartTor = new QAction(tr("Restart"), this);
+ _actionReloadConfig = new QAction(tr("Reload Tor's config"), this);
+ _actionNewIdentity = new QAction(QIcon(IMG_IDENTITY), tr("New Identity"), this);
+ _actionStatus = new QAction(QIcon(IMG_CONTROL_PANEL), tr("Status"), this);
+ _actionNetworkMap = new QAction(QIcon(IMG_NETWORK), tr("Network Map"), this);
+ _actionMessageLog= new QAction(QIcon(IMG_MESSAGELOG), tr("Message Log"), this);
+ _actionBandwidthGraph = new QAction(QIcon(IMG_BWGRAPH), tr("Bandwidth Graph"), this);
+ _actionConfigure = new QAction(QIcon(IMG_CONFIG), tr("Settings"), this);
+ _actionVidaliaHelp = new QAction(QIcon(IMG_HELP), tr("Help"), this);
+ _actionAbout = new QAction(QIcon(IMG_ABOUT), tr("About"), this);
+ _actionStartStopTor = new QAction(QIcon(IMG_START_TOR_16), tr("Start Tor"), this);
+ _actionExit = new QAction(QIcon(IMG_EXIT), tr("Exit"), this);
+}
+
+/** Creates the menu bar */
+void
+MainWindow::createMenuBar()
+{
+ QMenuBar *menu = menuBar();
+ menu->clear();
+
+ QMenu *torMenu = menu->addMenu(tr("Tor"));
+ torMenu->addAction(_actionStartTor);
+ torMenu->addAction(_actionStopTor);
+ torMenu->addAction(_actionRestartTor);
+#if !defined(Q_WS_WIN)
+ torMenu->addAction(_actionReloadConfig);
+#endif
+
+ QMenu *actionsMenu = menu->addMenu(tr("Actions"));
+ actionsMenu->addAction(_actionNewIdentity);
+
+ QMenu *viewMenu = menu->addMenu(tr("View"));
+ viewMenu->addAction(_actionStatus);
+ viewMenu->addAction(_actionNetworkMap);
+ viewMenu->addAction(_actionMessageLog);
+ viewMenu->addAction(_actionBandwidthGraph);
+ viewMenu->addSeparator();
+ viewMenu->addAction(_actionConfigure);
+
+// QMenu *pluginsMenu = menu->addMenu(tr("Plugins"));
+
+ QMenu *helpMenu = menu->addMenu(tr("Help"));
+ helpMenu->addAction(_actionVidaliaHelp);
+ helpMenu->addSeparator();
+ helpMenu->addAction(_actionAbout);
+}
+
+/** Creates the main toolbar */
+void
+MainWindow::createToolBar()
+{
+ QToolBar *tool = ui.toolBar;
+
+ tool->addAction(_actionStartStopTor);
+ tool->addAction(_actionNewIdentity);
+ tool->addAction(_actionConfigure);
+
+ tool->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+}
+
+/** Creates a QMenu object that contains QActions which compose the system
+ * tray menu. */
+QMenu*
+MainWindow::createTrayMenu()
+{
+ QMenu *menu = new QMenu(this);
+ menu->addAction(_actionStartStopTor);
+ menu->addSeparator();
+ menu->addAction(_actionBandwidthGraph);
+ menu->addAction(_actionMessageLog);
+ menu->addAction(_actionNetworkMap);
+ menu->addAction(_actionNewIdentity);
+ menu->addSeparator();
+ menu->addAction(_actionShowControlPanel);
+
+#if !defined(Q_WS_MAC)
+ /* These aren't added to the dock menu on Mac, since they are in the
+ * standard Mac locations in the menu bar. */
+ menu->addAction(_actionConfigure);
+ menu->addAction(_actionVidaliaHelp);
+ menu->addAction(_actionAbout);
+ menu->addSeparator();
+ menu->addAction(_actionExit);
+#endif
+ return menu;
+}
+
+/** Creates a tray icon with a context menu and adds it to the system
+ * notification area. On Mac, we also set up an application menubar. */
+void
+MainWindow::createTrayIcon()
+{
+ QMenu *menu = createTrayMenu();
+
+ /* Add the menu it to the tray icon */
+ _trayIcon.setContextMenu(menu);
+
+ connect(&_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
+ this, SLOT(trayIconActivated(QSystemTrayIcon::ActivationReason)));
+
+#if defined(Q_WS_MAC)
+ qt_mac_set_dock_menu(menu);
+#endif
+
+ VidaliaSettings settings;
+
+ _statusTab.checkShowOnStartup(settings.showMainWindowAtStart());
+ if (_statusTab.isCheckedShowOnStartup())
+ show();
+ _trayIcon.show();
+}
+
+void
+MainWindow::setVisible(bool visible)
+{
+ if (visible) {
+ /* In Gnome, will hide buttons if Vidalia is run on startup. */
+ if (!QSystemTrayIcon::isSystemTrayAvailable()) {
+ /* Don't let people hide the main window, since that's all they have. */
+ _statusTab.hideCheckShowOnStartup();
+ /* Causes window to not appear in Enlightenment. */
+ //setMinimumHeight(height()-ui.btnHide->height());
+ //setMaximumHeight(height()-ui.btnHide->height());
+ }
+ }
+ VidaliaWindow::setVisible(visible);
+}
+
+/** Respond to a double-click on the tray icon by opening the Control Panel
+ * window. */
+void
+MainWindow::trayIconActivated(QSystemTrayIcon::ActivationReason reason)
+{
+ if (reason == QSystemTrayIcon::DoubleClick)
+ setVisible(true);
+}
+
+void
+MainWindow::retranslateUi()
+{
+ updateTorStatus(_status);
+
+ _actionShowControlPanel->setText(tr("Control Panel"));
+ _actionStartTor->setText(tr("Start"));
+ _actionStopTor->setText(tr("Stop"));
+ _actionRestartTor->setText(tr("Restart"));
+ _actionReloadConfig->setText(tr("Reload Tor's config"));
+ _actionConfigure->setText(tr("Settings"));
+
+ if (_status == Stopped) {
+ _actionStartStopTor->setText(tr("Start Tor"));
+ } else if (_status == Starting) {
+ _actionStartStopTor->setText(tr("Starting Tor"));
+ } else {
+ _actionStartStopTor->setText(tr("Stop Tor"));
+ }
+
+ _actionBandwidthGraph->setText(tr("Bandwidth Graph"));
+ _actionMessageLog->setText(tr("Message Log"));
+ _actionNetworkMap->setText(tr("Network Map"));
+ _actionStatus->setText(tr("Status"));
+ _actionVidaliaHelp->setText(tr("Help"));
+ _actionNewIdentity->setText(tr("New Identity"));
+
+#if !defined(Q_WS_MAC)
+ _actionAbout->setText(tr("About"));
+ _actionConfigure->setText(tr("Settings"));
+ _actionExit->setText(tr("Exit"));
+#endif
+
+ createMenuBar();
+ ui.retranslateUi(this);
+}
+
+void
+MainWindow::createConnections()
+{
+ connect(_actionExit, SIGNAL(triggered()), this, SLOT(close()));
+ connect(_actionStartTor, SIGNAL(triggered()), this, SLOT(start()));
+ connect(_actionRestartTor, SIGNAL(triggered()), this, SLOT(restart()));
+ connect(_actionReloadConfig, SIGNAL(triggered()), this, SLOT(sighup()));
+ connect(_actionStopTor, SIGNAL(triggered()), this, SLOT(stop()));
+ connect(_actionShowControlPanel, SIGNAL(triggered()), this, SLOT(show()));
+ connect(_actionNewIdentity, SIGNAL(triggered()), this, SLOT(newIdentity()));
+
+ connect(_actionMessageLog, SIGNAL(triggered()), this, SLOT(showMessageLogTab()));
+ connect(_actionConfigure, SIGNAL(triggered()), this, SLOT(showConfigDialog()));
+ connect(_actionBandwidthGraph, SIGNAL(triggered()), this, SLOT(showBandwithTab()));
+ connect(_actionAbout, SIGNAL(triggered()), this, SLOT(showAboutDialog()));
+ connect(_actionVidaliaHelp, SIGNAL(triggered()), this, SLOT(showHelpDialog()));
+ connect(_actionStatus, SIGNAL(triggered()), this, SLOT(showStatusTab()));
+ connect(_actionNetworkMap, SIGNAL(triggered()), this, SLOT(showNetViewerTab()));
+
+ /* Catch signals when the application is running or shutting down */
+ connect(vApp, SIGNAL(running()), this, SLOT(running()));
+ connect(vApp, SIGNAL(aboutToQuit()), this, SLOT(aboutToQuit()));
+
connect(_torControl, SIGNAL(started()), this, SLOT(started()));
connect(_torControl, SIGNAL(startFailed(QString)),
this, SLOT(startFailed(QString)));
@@ -159,28 +359,8 @@ MainWindow::MainWindow()
connect(_torControl, SIGNAL(dangerousPort(quint16, bool)),
this, SLOT(warnDangerousPort(quint16, bool)));
- /* Create a new HelperProcess object, used to start the web browser */
- _browserProcess = new HelperProcess(this);
- connect(_browserProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
- this, SLOT(onSubprocessFinished(int, QProcess::ExitStatus)));
- connect(_browserProcess, SIGNAL(startFailed(QString)),
- this, SLOT(onBrowserFailed(QString)));
-
- /* Create a new HelperProcess object, used to start the IM client */
- _imProcess = new HelperProcess(this);
- connect(_imProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
- this, SLOT(onSubprocessFinished(int, QProcess::ExitStatus)));
- connect(_imProcess, SIGNAL(startFailed(QString)),
- this, SLOT(onIMFailed(QString)));
-
- /* Create a new HelperProcess object, used to start the proxy server */
- _proxyProcess = new HelperProcess(this);
- connect(_proxyProcess, SIGNAL(startFailed(QString)),
- this, SLOT(onProxyFailed(QString)));
-
- /* Catch signals when the application is running or shutting down */
- connect(vApp, SIGNAL(running()), this, SLOT(running()));
- connect(vApp, SIGNAL(aboutToQuit()), this, SLOT(aboutToQuit()));
+ connect(ui.tabWidget, SIGNAL(tabCloseRequested(int)),
+ this, SLOT(handleCloseTab(int)));
#if defined(USE_AUTOUPDATE)
/* Create a timer used to remind us to check for software updates */
@@ -207,74 +387,47 @@ MainWindow::MainWindow()
#if defined(USE_MINIUPNPC)
/* Catch UPnP-related signals */
connect(UPNPControl::instance(), SIGNAL(error(UPNPControl::UPNPError)),
- this, SLOT(upnpError(UPNPControl::UPNPError)));
+ this, SLOT(upnpError(UPNPControl::UPNPError)));
#endif
+ /* Create a new HelperProcess object, used to start the web browser */
+ _browserProcess = new HelperProcess(this);
+ connect(_browserProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
+ this, SLOT(onSubprocessFinished(int, QProcess::ExitStatus)));
+ connect(_browserProcess, SIGNAL(startFailed(QString)),
+ this, SLOT(onBrowserFailed(QString)));
- ui.chkShowOnStartup->setChecked(settings.showMainWindowAtStart());
- if (ui.chkShowOnStartup->isChecked())
- show();
- /* Optimistically hope that the tray icon gets added. */
- _trayIcon.show();
-}
+ /* Create a new HelperProcess object, used to start the 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)));
-/** Destructor. */
-MainWindow::~MainWindow()
-{
- _trayIcon.hide();
- delete _messageLog;
- delete _bandwidthGraph;
- delete _netViewer;
- delete _configDialog;
+ /* Create a new HelperProcess object, used to start the proxy server */
+ _proxyProcess = new HelperProcess(this);
+ connect(_proxyProcess, SIGNAL(startFailed(QString)),
+ this, SLOT(onProxyFailed(QString)));
}
+/** Called when the application is closing, by selecting "Exit" from the tray
+ * menu. If we're running a Tor server, then ask if we want to kill Tor now,
+ * or do a delayed shutdown. */
void
-MainWindow::setVisible(bool visible)
+MainWindow::close()
{
- if (visible) {
- /* In Gnome, will hide buttons if Vidalia is run on startup. */
- if (!QSystemTrayIcon::isSystemTrayAvailable()) {
- /* Don't let people hide the main window, since that's all they have. */
- ui.chkShowOnStartup->hide();
- ui.btnHide->hide();
- /* Causes window to not appear in Enlightenment. */
- //setMinimumHeight(height()-ui.btnHide->height());
- //setMaximumHeight(height()-ui.btnHide->height());
+ if (_torControl->isVidaliaRunningTor()) {
+ /* If we're running a server currently, ask if we want to do a delayed
+ * shutdown. If we do, then close Vidalia only when Tor stops. Otherwise,
+ * kill Tor and bail now. */
+ ServerSettings settings(_torControl);
+ if (_torControl->isConnected() && settings.isServerEnabled()) {
+ connect(_torControl, SIGNAL(stopped()), vApp, SLOT(quit()));
+ if (!stop())
+ QObject::disconnect(_torControl, SIGNAL(stopped()), vApp, SLOT(quit()));
+ return;
}
}
- VidaliaWindow::setVisible(visible);
-}
-
-void
-MainWindow::retranslateUi()
-{
- ui.retranslateUi(this);
-
- updateTorStatus(_status);
- if (_status == Stopped) {
- _actionStartStopTor->setText(tr("Start Tor"));
- ui.lblStartStopTor->setText(tr("Start Tor"));
- } else if (_status == Starting) {
- _actionStartStopTor->setText(tr("Starting Tor"));
- ui.lblStartStopTor->setText(tr("Starting Tor"));
- } else {
- _actionStartStopTor->setText(tr("Stop Tor"));
- ui.lblStartStopTor->setText(tr("Stop Tor"));
- }
-
- _actionShowBandwidth->setText(tr("Bandwidth Graph"));
- _actionShowMessageLog->setText(tr("Message Log"));
- _actionShowNetworkMap->setText(tr("Network Map"));
- _actionShowControlPanel->setText(tr("Control Panel"));
- _actionShowHelp->setText(tr("Help"));
- _actionNewIdentity->setText(tr("New Identity"));
-
-#if !defined(Q_WS_MAC)
- _actionShowAbout->setText(tr("About"));
- _actionShowConfig->setText(tr("Settings"));
- _actionExit->setText(tr("Exit"));
-#else
- createMenuBar();
-#endif
+ vApp->quit();
}
/** Called when the application has started and the main event loop is
@@ -382,397 +535,424 @@ MainWindow::aboutToQuit()
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()
+
+/** Attempts to start Tor. If Tor fails to start, then startFailed() will be
+ * called with an error message containing the reason. */
+void
+MainWindow::start()
{
- 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()));
+ TorSettings settings;
+ QStringList args;
+
+ updateTorStatus(Starting);
+
+ /* Check if Tor is already running separately */
+ if(settings.getControlMethod() == ControlMethod::Port) {
+ if (net_test_connect(settings.getControlAddress(),
+ settings.getControlPort())) {
+ started();
+ return;
+ }
+ } else {
+ if (socket_test_connect(settings.getSocketPath())) {
+ started();
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()));
+ QString torrc = settings.getTorrc();
- _actionExit = new QAction(tr("Exit"), this);
- connect(_actionExit, SIGNAL(triggered()), this, SLOT(close()));
+ if(settings.bootstrap()) {
+ QString boottorrc = settings.bootstrapFrom();
+ vNotice(tr("Bootstrapping torrc from %1 to %2")
+ .arg(boottorrc).arg(torrc));
+ if(QFileInfo(boottorrc).exists()) {
+ if(QFile::copy(boottorrc, torrc)) {
+ settings.setBootstrap(false);
+ }
+ }
+ }
- _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()));
+ /* Make sure the torrc we want to use really exists. */
+ if (!torrc.isEmpty()) {
+ if (!QFileInfo(torrc).exists())
+ touch_file(torrc, true);
+ args << "-f" << torrc;
+ }
- _actionShowConfig = new QAction(tr("Settings"), this);
- connect(_actionShowConfig, SIGNAL(triggered()), this, SLOT(showConfigDialog()));
+ /* Specify Tor's data directory, if different from the default */
+ QString dataDirectory = settings.getDataDirectory();
+ if (!dataDirectory.isEmpty())
+ args << "DataDirectory" << expand_filename(dataDirectory);
- _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(settings.getControlMethod() == ControlMethod::Port) {
+ /* Add the intended control port value */
+ quint16 controlPort = settings.getControlPort();
+ if (controlPort)
+ args << "ControlPort" << QString::number(controlPort);
+ } else {
+ QString path = settings.getSocketPath();
+ args << "ControlSocket" << path;
+ }
+
+ /* Add the control port authentication arguments */
+ switch (settings.getAuthenticationMethod()) {
+ case TorSettings::PasswordAuth:
+ if (! vApp->readPasswordFromStdin()) {
+ if (settings.useRandomPassword()) {
+ _controlPassword = TorSettings::randomPassword();
+ _useSavedPassword = false;
+ } else {
+ _controlPassword = settings.getControlPassword();
+ _useSavedPassword = true;
+ }
+ }
+ args << "HashedControlPassword"
+ << TorSettings::hashPassword(_controlPassword);
+ break;
+ case TorSettings::CookieAuth:
+ args << "CookieAuthentication" << "1";
+ break;
+ default:
+ args << "CookieAuthentication" << "0";
+ }
-#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
+ /* 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);
}
-/** 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()
+/** Slot: Called when the Tor process is started. It will connect the control
+ * socket and set the icons and tooltips accordingly. */
+void
+MainWindow::started()
{
- QMenu *menu = createTrayMenu();
-
- /* Add the menu it to the tray icon */
- _trayIcon.setContextMenu(menu);
+ TorSettings settings;
- connect(&_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
- this, SLOT(trayIconActivated(QSystemTrayIcon::ActivationReason)));
+ updateTorStatus(Started);
-#if defined(Q_WS_MAC)
- createMenuBar();
- qt_mac_set_dock_menu(menu);
-#endif
+ /* Now that Tor is running, we want to know if it dies when we didn't want
+ * it to. */
+ _isIntentionalExit = false;
+ /* We haven't started a delayed shutdown yet. */
+ _delayedShutdownStarted = false;
+ /* Remember whether we started Tor or not */
+ _isVidaliaRunningTor = _torControl->isVidaliaRunningTor();
+ /* Try to connect to Tor's control port */
+ if(settings.getControlMethod() == ControlMethod::Port)
+ _torControl->connect(settings.getControlAddress(),
+ settings.getControlPort());
+ else
+ _torControl->connect(settings.getSocketPath());
+ setStartupProgress(STARTUP_PROGRESS_CONNECTING, tr("Connecting to Tor"));
}
-/** Creates a QMenu object that contains QActions which compose the system
- * tray menu. */
-QMenu*
-MainWindow::createTrayMenu()
+/** Disconnects the control socket and stops the Tor process. */
+bool
+MainWindow::stop()
{
- 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;
-}
+ ServerSettings server(_torControl);
+ QString errmsg;
+ TorStatus prevStatus;
+ bool rc;
-/** 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);
+ /* 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;
+ }
- QMenu *helpMenu = _menuBar->addMenu(tr("Help"));
- _actionShowHelp->setText(tr("Vidalia Help"));
- helpMenu->addAction(_actionShowHelp);
- helpMenu->addAction(_actionShowAbout);
-#endif
+ 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;
}
-/** Sets the current tray or dock icon image to <b>iconFile</b>. */
-void
-MainWindow::setTrayIcon(const QString &iconFile)
+/** 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)
{
-#if defined(Q_WS_MAC)
- QApplication::setWindowIcon(QPixmap(iconFile));
-#endif
- _trayIcon.setIcon(QIcon(iconFile));
-}
+ updateTorStatus(Stopped);
-/** 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);
+ /* If we didn't intentionally close Tor, then check to see if it crashed or
+ * if it closed itself and returned an error code. */
+ if (!_isIntentionalExit) {
+ /* A quick overview of Tor's code tells me that if it catches a SIGTERM or
+ * SIGINT, Tor will exit(0). We might need to change this warning message
+ * if this turns out to not be the case. */
+ if (exitStatus == QProcess::CrashExit || exitCode != 0) {
+ int ret = VMessageBox::warning(this, tr("Unexpected Error"),
+ tr("Vidalia detected that the Tor software exited "
+ "unexpectedly.\n\n"
+ "Please check the message log for recent "
+ "warning or error messages."),
+ VMessageBox::Ok|VMessageBox::Escape,
+ VMessageBox::ShowLog|VMessageBox::Default,
+ VMessageBox::Help);
+ if (ret == VMessageBox::ShowLog)
+ showMessageLogTab();
+ else if (ret == VMessageBox::Help)
+ showHelpDialog("troubleshooting.torexited");
+ }
+ }
}
-/** Start a web browser when given the directory containing the executable and profile */
+/** 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::launchBrowserFromDirectory()
+MainWindow::startFailed(QString errmsg)
{
- VidaliaSettings settings;
+ /* 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);
- QString browserDirectory = settings.getBrowserDirectory();
- QString browserDirectoryFilename = settings.getBrowserExecutable();
+ /* 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);
- /* 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");
+ 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");
}
-
- /* 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 */
+/** Called when the control socket has successfully connected to Tor. */
void
-MainWindow::startSubprocesses()
+MainWindow::connected()
{
- VidaliaSettings settings;
- QString subprocess;
+ authenticate();
+}
- /* 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());
- }
+/** 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);
- /* Launch the IM client */
- subprocess = settings.getIMExecutable();
- if (!subprocess.isEmpty())
- _imProcess->start(subprocess, QStringList());
+ 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();
+ }
}
-/** Called when browser or IM client have exited */
+/** Called when Vidalia has successfully authenticated to Tor. */
void
-MainWindow::onSubprocessFinished(int exitCode, QProcess::ExitStatus exitStatus)
+MainWindow::authenticated()
{
- Q_UNUSED(exitCode)
- Q_UNUSED(exitStatus)
+ ServerSettings serverSettings(_torControl);
+ QString errmsg;
- /* Get path to browser and IM client */
- VidaliaSettings settings;
- QString browserExecutable = settings.getBrowserExecutable();
- QString browserDirectory = settings.getBrowserDirectory();
- QString imExecutable = settings.getIMExecutable();
+ 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);
- /* 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();
+ /* 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();
+ }
- /* 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);
- }
+ /* 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 periodically to check if the browser is running. If it is not,
- * exit Vidalia cleanly */
+/** Called when Vidalia fails to authenticate to Tor. The failure reason is
+ * specified in <b>errmsg</b>. */
void
-MainWindow::onCheckForBrowser()
+MainWindow::authenticationFailed(QString errmsg)
{
-/* This only works on Windows for now */
-#if defined(Q_OS_WIN)
+ bool retry = false;
+
+ vWarn("Authentication failed: %1").arg(errmsg);
- VidaliaSettings settings;
- QString browserDirectoryFilename = settings.getBrowserExecutable();
+ /* Parsing log messages is evil, but we're left with little option */
+ if (errmsg.contains("Password did not match")) {
+ ControlPasswordInputDialog dlg;
+ connect(&dlg, SIGNAL(helpRequested(QString)),
+ this, SLOT(showHelpDialog(QString)));
- /* Get list of running processes */
- QHash<qint64, QString> procList = win32_process_list();
+ qint64 torPid = 0;
- /* On old versions of Windows win32_process_list() will return
- an empty list. In this case, just keep Vidalia open */
- if (procList.isEmpty()) {
- return;
- }
+ TorSettings settings;
+ QHash<qint64, QString> procs = process_list(settings.getControlPort());
+ foreach (qint64 pid, procs.keys()) {
+ if (! procs.value(pid).compare("tor", Qt::CaseInsensitive)) {
+ torPid = pid;
+ break;
+ }
+ }
+
+ dlg.setResetEnabled(torPid > 0);
- /* 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;
+ int ret = dlg.exec();
+ if (ret == QDialogButtonBox::Reset) {
+ if (! process_kill(torPid)) {
+ VMessageBox::warning(this,
+ tr("Password Reset Failed"),
+ p(tr("Vidalia tried to restart Tor, but was not "
+ "able to. Please check your Task Manager to "
+ "ensure there are no other Tor processes running.")),
+ VMessageBox::Ok|VMessageBox::Default);
+ } else {
+ retry = true;
+ }
}
}
-
- /* The browser isn't running, exit Vidalia */
- vApp->quit();
-#endif
+
+ if (_torControl->isRunning())
+ if (_isVidaliaRunningTor)
+ stop();
+ else
+ disconnect();
+ if (retry)
+ start();
}
-/** 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. */
+/** Called when Tor thinks its version is old or unrecommended, and displays
+ * a message notifying the user. */
void
-MainWindow::onBrowserFailed(QString errmsg)
+MainWindow::dangerousTorVersion(tc::TorVersionStatus reason,
+ const QString ¤t,
+ const QStringList &recommended)
{
- 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);
-}
+ Q_UNUSED(current);
+ Q_UNUSED(recommended);
-/** 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);
+ if (reason == tc::ObsoleteTorVersion
+ || reason == tc::UnrecommendedTorVersion)
+ displayTorVersionWarning();
}
-/** Starts the proxy server, if appropriately configured */
+/** Called when Tor thinks its version is old or unrecommended, and displays a
+ * message notifying the user. */
void
-MainWindow::startProxy()
+MainWindow::displayTorVersionWarning()
{
- VidaliaSettings settings;
- QString executable = settings.getProxyExecutable();
- _proxyProcess->start(executable, settings.getProxyExecutableArguments());
-}
+ static bool alreadyWarned = false;
-/** 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);
+ if (!alreadyWarned) {
+#if !defined(USE_AUTOUPDATE)
+ QString website = "https://www.torproject.org/";
+# if QT_VERSION >= 0x040200
+ website = QString("<a href=\"%1\">%1</a>").arg(website);
+# endif
+
+ VMessageBox::information(this, tr("Tor Update Available"),
+ p(tr("The currently installed version of Tor is out of date or no longer "
+ "recommended. Please visit the Tor website to download the latest "
+ "version.")) + p(tr("Tor website: %1").arg(website)),
+ VMessageBox::Ok);
+#else
+ int ret = VMessageBox::information(this,
+ tr("Tor Update Available"),
+ p(tr("The currently installed version of Tor is out of date "
+ "or no longer recommended."))
+ + p(tr("Would you like to check if a newer package is "
+ "available for installation?")),
+ VMessageBox::Yes|VMessageBox::Default,
+ VMessageBox::No|VMessageBox::Escape);
+
+ if (ret == VMessageBox::Yes)
+ checkForUpdatesWithUi();
+#endif
+ alreadyWarned = true;
+ }
}
/** Called when Tor's bootstrapping status changes. <b>bse</b> represents
@@ -858,423 +1038,116 @@ MainWindow::bootstrapStatusChanged(const BootstrapStatus &bs)
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>. */
+/** Called when Tor has successfully established a circuit. */
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()
+MainWindow::circuitEstablished()
{
- TorSettings settings;
- QStringList args;
-
- updateTorStatus(Starting);
+ updateTorStatus(CircuitEstablished);
+ // TODO: fix hardcoded total length
+ setStartupProgress(130,
+ tr("Connected to the Tor network!"));
+ startSubprocesses();
- /* Check if Tor is already running separately */
- if(settings.getControlMethod() == ControlMethod::Port) {
- if (net_test_connect(settings.getControlAddress(),
- settings.getControlPort())) {
- started();
- return;
- }
- } else {
- if (socket_test_connect(settings.getSocketPath())) {
- started();
- return;
+#if defined(USE_AUTOUPDATE)
+ VidaliaSettings settings;
+ if (settings.isAutoUpdateEnabled()) {
+ QDateTime lastCheckedAt = settings.lastCheckedForUpdates();
+ if (UpdateProcess::shouldCheckForUpdates(lastCheckedAt)) {
+ /* Initiate a background check for updates now */
+ _updateTimer.stop();
+ checkForUpdates();
}
}
-
- /* 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);
-
- if(settings.getControlMethod() == ControlMethod::Port) {
- /* Add the intended control port value */
- quint16 controlPort = settings.getControlPort();
- if (controlPort)
- args << "ControlPort" << QString::number(controlPort);
- } else {
- QString path = settings.getSocketPath();
- args << "ControlSocket" << path;
- }
-
- /* Add the control port authentication arguments */
- switch (settings.getAuthenticationMethod()) {
- case TorSettings::PasswordAuth:
- if (! vApp->readPasswordFromStdin()) {
- if (settings.useRandomPassword()) {
- _controlPassword = TorSettings::randomPassword();
- _useSavedPassword = false;
- } else {
- _controlPassword = settings.getControlPassword();
- _useSavedPassword = true;
- }
- }
- args << "HashedControlPassword"
- << TorSettings::hashPassword(_controlPassword);
- break;
- case TorSettings::CookieAuth:
- args << "CookieAuthentication" << "1";
- break;
- default:
- args << "CookieAuthentication" << "0";
- }
-
- /* 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 user changes a setting that needs Tor restarting */
-void
-MainWindow::restart()
-{
- if(_torControl->stop()) {
- start();
- }
-}
-
-/** Called when the Tor process fails to start, for example, because the path
- * specified to the Tor executable didn't lead to an executable. */
-void
-MainWindow::startFailed(QString errmsg)
-{
- /* We don't display the error message for now, because the error message
- * that Qt gives us in this instance is almost always "Unknown Error". That
- * will make users sad. */
- Q_UNUSED(errmsg);
-
- updateTorStatus(Stopped);
-
- /* Display an error message and see if the user wants some help */
- int response = VMessageBox::warning(this, tr("Error Starting Tor"),
- tr("Vidalia was unable to start Tor. Check your settings "
- "to ensure the correct name and location of your Tor "
- "executable is specified."),
- VMessageBox::ShowSettings|VMessageBox::Default,
- VMessageBox::Cancel|VMessageBox::Escape,
- VMessageBox::Help);
-
- if (response == VMessageBox::ShowSettings) {
- /* Show the settings dialog so the user can make sure they're pointing to
- * the correct Tor. */
- showConfigDialog();
- } else if (response == VMessageBox::Help) {
- /* Show troubleshooting information about starting Tor */
- showHelpDialog("troubleshooting.start");
- }
-}
-
-/** Slot: Called when the Tor process is started. It will connect the control
- * socket and set the icons and tooltips accordingly. */
-void
-MainWindow::started()
-{
- TorSettings settings;
-
- updateTorStatus(Started);
-
- /* Now that Tor is running, we want to know if it dies when we didn't want
- * it to. */
- _isIntentionalExit = false;
- /* We haven't started a delayed shutdown yet. */
- _delayedShutdownStarted = false;
- /* Remember whether we started Tor or not */
- _isVidaliaRunningTor = _torControl->isVidaliaRunningTor();
- /* Try to connect to Tor's control port */
- if(settings.getControlMethod() == ControlMethod::Port)
- _torControl->connect(settings.getControlAddress(),
- settings.getControlPort());
- else
- _torControl->connect(settings.getSocketPath());
- setStartupProgress(STARTUP_PROGRESS_CONNECTING, tr("Connecting to Tor"));
+#endif
}
-/** Called when the connection to the control socket fails. The reason will be
- * given in the errmsg parameter. */
+/** 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::connectFailed(QString errmsg)
+MainWindow::warnDangerousPort(quint16 port, bool rejected)
{
- /* 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);
+ static QMessageBox *dlg = 0;
+ /* Don't display another message box until the first one is dismissed */
+ if (dlg)
+ return;
- 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();
- }
-}
+ QString application;
+ switch (port) {
+ case 23:
+ application = tr("(probably Telnet)");
+ break;
-/** Disconnects the control socket and stops the Tor process. */
-bool
-MainWindow::stop()
-{
- ServerSettings server(_torControl);
- QString errmsg;
- TorStatus prevStatus;
- bool rc;
+ case 109:
+ case 110:
+ case 143:
+ application = tr("(probably an email client)");
+ break;
- /* 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);
+ default:
+ application = "";
}
- 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");
- }
+ QString text = tr("One of your applications %1 appears to be making a "
+ "potentially unencrypted and unsafe connection to port %2.")
+ .arg(application).arg(port);
+
+ QString extraText = p(tr("Anything sent over this connection could be "
+ "monitored. Please check your application's "
+ "configuration and use only encrypted protocols, "
+ "such as SSL, if possible."));
+ if (rejected) {
+ extraText.append(p(tr("Tor has automatically closed your connection in "
+ "order to protect your anonymity.")));
}
-}
-/** Called when the control socket has successfully connected to Tor. */
-void
-MainWindow::connected()
-{
- authenticate();
-}
+ dlg = new QMessageBox(QMessageBox::Warning,
+ tr("Potentially Unsafe Connection"), text,
+ QMessageBox::Ok | QMessageBox::Ignore);
+ dlg->setInformativeText(extraText);
+ dlg->setDefaultButton(QMessageBox::Ok);
+ dlg->setEscapeButton(QMessageBox::Ok);
-/** Called when Vidalia wants to disconnect from a Tor it did not start. */
-void
-MainWindow::disconnect()
-{
- _torControl->disconnect();
-}
+ int ret = dlg->exec();
+ if (ret == QMessageBox::Ignore) {
+ TorControl *tc = Vidalia::torControl();
+ TorSettings settings;
+ QStringList portList;
+ QList<quint16> ports;
+ int idx;
-/** 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);
+ 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(","));
+ }
}
-
- /*XXX We should warn here if we get disconnected when we didn't intend to */
- _actionNewIdentity->setEnabled(false);
- ui.lblNewIdentity->setEnabled(false);
- _isVidaliaRunningTor = false;
+ delete dlg;
+ dlg = 0;
}
/** Attempts to authenticate to Tor's control port, depending on the
@@ -1353,132 +1226,19 @@ cancel:
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>. */
+/** Checks the status of the current version of Tor to see if it's old,
+ * unrecommended, or obsolete. */
void
-MainWindow::authenticationFailed(QString errmsg)
+MainWindow::checkTorVersion()
{
- 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;
- }
+ QString status;
+ if (_torControl->getInfo("status/version/current", status)) {
+ if (!status.compare("old", Qt::CaseInsensitive)
+ || !status.compare("unrecommended", Qt::CaseInsensitive)
+ || !status.compare("obsolete", Qt::CaseInsensitive)) {
+ displayTorVersionWarning();
}
- } else {
- /* Something else went wrong */
- int ret = VMessageBox::warning(this,
- tr("Authentication Error"),
- p(tr("Vidalia was unable to authenticate to the Tor software. "
- "(%1)").arg(errmsg)) +
- p(tr("Please check your control port authentication "
- "settings.")),
- VMessageBox::ShowSettings|VMessageBox::Default,
- VMessageBox::Cancel|VMessageBox::Escape);
-
- if (ret == VMessageBox::ShowSettings)
- showConfigDialog(ConfigDialog::Advanced);
}
-
- if (_torControl->isRunning())
- if (_isVidaliaRunningTor)
- stop();
- else
- disconnect();
- if (retry)
- start();
}
/** Searches for and attempts to load the control authentication cookie. This
@@ -1529,286 +1289,337 @@ MainWindow::loadControlCookie(QString cookiePath)
return QByteArray();
}
-/** Called when Tor has successfully established a circuit. */
-void
-MainWindow::circuitEstablished()
+/** Updates the UI to reflect Tor's current <b>status</b>. Returns the
+ * previously set TorStatus value.*/
+MainWindow::TorStatus
+MainWindow::updateTorStatus(TorStatus status)
+{
+ 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->setIcon(QIcon(IMG_START_TOR_16));
+ _actionStartStopTor->setText(actionText);
+ _actionStartTor->setEnabled(true);
+
+ /* XXX: This might need to be smarter if we ever start connecting other
+ * slots to these triggered() and clicked() signals. */
+ QObject::disconnect(_actionStartStopTor, SIGNAL(triggered()), this, 0);
+ connect(_actionStartStopTor, SIGNAL(triggered()), this, SLOT(start()));
+ setStartupProgressVisible(false);
+ } else if (status == Stopping) {
+ _actionStopTor->setEnabled(false);
+ _actionRestartTor->setEnabled(false);
+ if (_delayedShutdownStarted) {
+ statusText = tr("Your relay is shutting down.\n"
+ "Click 'Stop' again to stop your relay now.");
+ } else {
+ statusText = tr("Tor is shutting down");
+ }
+ trayIconFile = IMG_TOR_STOPPING;
+ statusIconFile = IMG_TOR_STOPPING_48;
+
+// ui.btnStartStopTor->setStatusTip(tr("Stop Tor Now"));
+ } else if (status == Started) {
+ actionText = tr("Stop Tor");
+ _actionStartStopTor->setEnabled(true);
+ _actionStartStopTor->setIcon(QIcon(IMG_STOP_TOR_16));
+ _actionStartStopTor->setText(actionText);
+
+ /* XXX: This might need to be smarter if we ever start connecting other
+ * slots to these triggered() and clicked() signals. */
+ QObject::disconnect(_actionStartStopTor, SIGNAL(triggered()), this, 0);
+ connect(_actionStartStopTor, SIGNAL(triggered()), this, SLOT(stop()));
+ } else if (status == Starting) {
+ statusText = tr("Starting the Tor software");
+ trayIconFile = IMG_TOR_STARTING;
+ statusIconFile = IMG_TOR_STARTING_48;
+ _actionStartStopTor->setEnabled(false);
+ _actionStartTor->setEnabled(false);
+ setStartupProgressVisible(true);
+ setStartupProgress(STARTUP_PROGRESS_STARTING, statusText);
+ } else if (status == CircuitEstablished) {
+ statusText = tr("Connected to the Tor network!");
+ trayIconFile = IMG_TOR_RUNNING;
+ statusIconFile = IMG_TOR_RUNNING_48;
+ setStartupProgressVisible(false);
+ }
+
+ /* Update the tray icon */
+ if (!trayIconFile.isEmpty()) {
+ setTrayIcon(trayIconFile);
+ }
+ /* Update the status banner on the control panel */
+ if (!statusIconFile.isEmpty())
+ _statusTab.setTorStatus(QPixmap(statusIconFile));
+ if (!statusText.isEmpty()) {
+ _trayIcon.setToolTip(statusText);
+ _statusTab.setTorStatus(statusText);
+ }
+ return prevStatus;
+}
+
+/** Sets the current tray or dock icon image to <b>iconFile</b>. */
+void
+MainWindow::setTrayIcon(const QString &iconFile)
+{
+#if defined(Q_WS_MAC)
+ QApplication::setWindowIcon(QPixmap(iconFile));
+#endif
+ _trayIcon.setIcon(QIcon(iconFile));
+}
+
+/** Converts a TorStatus enum value to a string for debug logging purposes. */
+QString
+MainWindow::toString(TorStatus status)
{
- 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();
- }
+ 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;
}
-#endif
+ return "Unknown";
}
-/** Checks the status of the current version of Tor to see if it's old,
- * unrecommended, or obsolete. */
+/** Called when the user changes a setting that needs Tor restarting */
void
-MainWindow::checkTorVersion()
+MainWindow::restart()
{
- 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();
- }
+ if(_torControl->stop()) {
+ start();
}
}
-/** Called when Tor thinks its version is old or unrecommended, and displays
- * a message notifying the user. */
+/** Sends a sighup signal to Tor on platforms other than Windows */
void
-MainWindow::dangerousTorVersion(tc::TorVersionStatus reason,
- const QString ¤t,
- const QStringList &recommended)
+MainWindow::sighup()
{
- Q_UNUSED(current);
- Q_UNUSED(recommended);
+ bool rc;
+ QString errmsg;
+ rc = _torControl->signal(TorSignal::Reload, &errmsg);
- if (reason == tc::ObsoleteTorVersion
- || reason == tc::UnrecommendedTorVersion)
- displayTorVersionWarning();
+ if (!rc) {
+ int response = VMessageBox::warning(this, tr("Error reloading configuration"),
+ p(tr("Vidalia was unable to reload Tor's configuration."))
+ + p(errmsg),
+ VMessageBox::Ok);
+ }
}
-/** Called when Tor thinks its version is old or unrecommended, and displays a
- * message notifying the user. */
+/** Sets the visibility of the startup status description and progress bar to
+ * <b>visible</b>. */
void
-MainWindow::displayTorVersionWarning()
+MainWindow::setStartupProgressVisible(bool visible)
{
- static bool alreadyWarned = false;
+ _statusTab.setTorStatusVisible(!visible);
+ _statusTab.setProgressVisible(visible);
+}
- 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
+/** Sets the progress bar completion value to <b>progressValue</b> and sets
+ * the status text to <b>description</b>. */
+void
+MainWindow::setStartupProgress(int progressValue,
+ const QString &description)
+{
+ _statusTab.setProgress(progressValue, description);
+ _trayIcon.setToolTip(description);
+}
- 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);
+/** Called when Vidalia wants to disconnect from a Tor it did not start. */
+void
+MainWindow::disconnect()
+{
+ _torControl->disconnect();
+}
- if (ret == VMessageBox::Yes)
- checkForUpdatesWithUi();
-#endif
- alreadyWarned = true;
+/** Called when the control socket has been disconnected. */
+void
+MainWindow::disconnected()
+{
+ if (!_isVidaliaRunningTor) {
+ /* If we didn't start our own Tor process, interpret losing the control
+ * connection as "Tor is stopped". */
+ updateTorStatus(Stopped);
}
+
+ /*XXX We should warn here if we get disconnected when we didn't intend to */
+ _actionNewIdentity->setEnabled(false);
+ _isVidaliaRunningTor = false;
}
-/** Called when Tor thinks the user has tried to connect to a port that
- * typically is used for unencrypted applications. Warns the user and allows
- * them to ignore future warnings on <b>port</b>. It is possible that Tor
- * will produce multiple asynchronous status events warning of dangerous ports
- * while the message box is displayed (for example, while the user is away
- * from the keyboard), so subsequent messages will be discarded until the
- * first message box is dismissed. */
void
-MainWindow::warnDangerousPort(quint16 port, bool rejected)
+MainWindow::showConfigDialog(ConfigDialog::Page page)
{
- static QMessageBox *dlg = 0;
+ ConfigDialog *configDialog = new ConfigDialog();
+ connect(configDialog, SIGNAL(helpRequested(QString)),
+ this, SLOT(showHelpDialog(QString)));
+ configDialog->showWindow(page);
+}
- /* Don't display another message box until the first one is dismissed */
- if (dlg)
- return;
+/** Called when the user selects the "New Identity" action from the menu. */
+void
+MainWindow::newIdentity()
+{
+ QString errmsg;
- QString application;
- switch (port) {
- case 23:
- application = tr(", probably Telnet, ");
- break;
+ /* 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.");
- case 109:
- case 110:
- case 143:
- application = tr(", probably an email client, ");
- break;
+ /* Disable the New Identity button for MIN_NEWIDENTITY_INTERVAL */
+ _actionNewIdentity->setEnabled(false);
+// ui.lblNewIdentity->setEnabled(false);
+ QTimer::singleShot(MIN_NEWIDENTITY_INTERVAL,
+ this, SLOT(enableNewIdentity()));
- default:
- application = " ";
+ 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);
}
+}
- 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.")));
+/** 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);
}
+}
- 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();
- }
+void
+MainWindow::handleCloseTab(int index)
+{
+ /* If the tab that's going to be closed is the status one
+ * don't do it */
+ if(index == 0)
+ return;
- ports = settings.getRejectPlaintextPorts();
- idx = ports.indexOf(port);
- if (idx >= 0) {
- ports.removeAt(idx);
- settings.setRejectPlaintextPorts(ports);
+ delTab(index);
+}
- foreach (quint16 port, ports) {
- portList << QString::number(port);
- }
- tc->setConf("RejectPlaintextPorts", portList.join(","));
- }
+void
+MainWindow::addTab(VidaliaTab *tab)
+{
+ /** If the tab's already open, display it and delete the
+ * instanse passed */
+ if(_tabMap.contains(tab->getTitle())) {
+ ui.tabWidget->setCurrentIndex(_tabMap.indexOf(tab->getTitle()));
+ /** Exception for tabs that need to be always created */
+ if (tab != _messageLog &&
+ tab != &_statusTab &&
+ tab != &_netViewer &&
+ tab != _graph)
+ tab->deleteLater();
+ return;
}
- delete dlg;
- dlg = 0;
+
+ ui.tabWidget->addTab(tab, tab->getTitle());
+ ui.tabWidget->setCurrentIndex(ui.tabWidget->count() - 1);
+ /** The new tab is added to the last position */
+ _tabMap << tab->getTitle();
+ connect(tab, SIGNAL(helpRequested(QString)),
+ this, SLOT(showHelpDialog(QString)));
}
-/** Creates and displays Vidalia's About dialog. */
void
-MainWindow::showAboutDialog()
+MainWindow::delTab(int index)
{
- AboutDialog dlg(this);
- dlg.exec();
+ if(index == -1)
+ index = ui.tabWidget->currentIndex();
+
+ VidaliaTab *tab = qobject_cast<VidaliaTab*>(ui.tabWidget->widget(index));
+ // if it isn't one of the tabs that's supposed to be open at every moment
+ if (tab != _messageLog &&
+ tab != &_statusTab &&
+ tab != &_netViewer &&
+ tab != _graph) {
+ QObject::disconnect(ui.tabWidget->widget(index), 0, 0, 0);
+ tab->deleteLater();
+ }
+ ui.tabWidget->removeTab(index);
+ QString key = _tabMap.at(index);
+ _tabMap.removeAll(key);
}
-/** Displays the help browser and displays the most recently viewed help
- * topic. */
void
-MainWindow::showHelpDialog()
+MainWindow::showStatusTab()
{
- showHelpDialog(QString());
+ addTab(&_statusTab);
}
-/**< Shows the help browser and displays the given help <b>topic</b>. */
-void
-MainWindow::showHelpDialog(const QString &topic)
+void
+MainWindow::showMessageLogTab()
{
- static HelpBrowser *helpBrowser = 0;
- if (!helpBrowser)
- helpBrowser = new HelpBrowser(this);
- helpBrowser->showWindow(topic);
+ addTab(_messageLog);
}
-/** Creates and displays the Configuration dialog with the current page set to
- * <b>page</b>. */
-void
-MainWindow::showConfigDialog(ConfigDialog::Page page)
+void
+MainWindow::showBandwithTab()
{
- _configDialog->showWindow(page);
+ addTab(_graph);
}
-/** Displays the Configuration dialog, set to the Server page. */
+/** Creates and displays Vidalia's About dialog. */
void
-MainWindow::showServerConfigDialog()
+MainWindow::showAboutDialog()
{
- showConfigDialog(ConfigDialog::Server);
+ AboutDialog dlg(this);
+ dlg.exec();
}
-/** Called when the user selects the "New Identity" action from the menu. */
+/** Displays the help browser and displays the most recently viewed help
+ * topic. */
void
-MainWindow::newIdentity()
+MainWindow::showHelpDialog()
{
- 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);
- }
+ showHelpDialog(QString());
}
-/** Re-enables the 'New Identity' button after a delay from the previous time
- * 'New Identity' was used. */
+/**< Shows the help browser and displays the given help <b>topic</b>. */
void
-MainWindow::enableNewIdentity()
+MainWindow::showHelpDialog(const QString &topic)
{
- if (_torControl->isConnected()) {
- _actionNewIdentity->setEnabled(true);
- ui.lblNewIdentity->setEnabled(true);
- }
+ static HelpBrowser *helpBrowser = 0;
+ if (!helpBrowser)
+ helpBrowser = new HelpBrowser(this);
+ helpBrowser->showWindow(topic);
}
-/** Converts a TorStatus enum value to a string for debug logging purposes. */
-QString
-MainWindow::toString(TorStatus status)
+void
+MainWindow::showNetViewerTab()
{
- 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";
+ addTab(&_netViewer);
}
#if defined(USE_MINIUPNPC)
@@ -1971,3 +1782,192 @@ MainWindow::installUpdatesFailed(const QString &errmsg)
#endif
+/** Called when browser or IM client have exited */
+void
+MainWindow::onSubprocessFinished(int exitCode, QProcess::ExitStatus exitStatus)
+{
+ Q_UNUSED(exitCode)
+ Q_UNUSED(exitStatus)
+
+ /* Get path to browser and IM client */
+ VidaliaSettings settings;
+ QString browserExecutable = settings.getBrowserExecutable();
+ QString browserDirectory = settings.getBrowserDirectory();
+ QString imExecutable = settings.getIMExecutable();
+
+ /* A subprocess is finished if it successfully exited or was never asked to start */
+ bool browserDone = (browserExecutable.isEmpty()
+ && browserDirectory.isEmpty())
+ || _browserProcess->isDone();
+ bool imDone = imExecutable.isEmpty() || _imProcess->isDone();
+
+ /* Exit if both subprocesses are finished */
+ if (browserDone && imDone) {
+ if (browserDirectory.isEmpty()) {
+ /* We are using the standard launcher, exit immediately */
+ vApp->quit();
+ } else {
+ /* We are using the alternate launcher, wait until the browser has really died */
+ QTimer *browserWatcher = new QTimer(this);
+ connect(browserWatcher, SIGNAL(timeout()), this, SLOT(onCheckForBrowser()));
+ browserWatcher->start(2000);
+ }
+ }
+}
+
+/** Called periodically to check if the browser is running. If it is not,
+ * exit Vidalia cleanly */
+void
+MainWindow::onCheckForBrowser()
+{
+/* This only works on Windows for now */
+#if defined(Q_OS_WIN)
+
+ VidaliaSettings settings;
+ QString browserDirectoryFilename = settings.getBrowserExecutable();
+
+ /* Get list of running processes */
+ QHash<qint64, QString> procList = win32_process_list();
+
+ /* On old versions of Windows win32_process_list() will return
+ an empty list. In this case, just keep Vidalia open */
+ if (procList.isEmpty()) {
+ return;
+ }
+
+ /* Loop over all processes or until we find <browserDirectoryFilename> */
+ QHashIterator<qint64, QString> i(procList);
+ while (i.hasNext()) {
+ i.next();
+ if (i.value().toLower() == browserDirectoryFilename) {
+ /* The browser is still running, so Vidalia should keep running too */
+ return;
+ }
+ }
+
+ /* The browser isn't running, exit Vidalia */
+ vApp->quit();
+#endif
+}
+
+/** Called when the web browser failed to start, for example, because the path
+ * specified to the web browser executable didn't lead to an executable. */
+void
+MainWindow::onBrowserFailed(QString errmsg)
+{
+ Q_UNUSED(errmsg);
+
+ /* Display an error message and see if the user wants some help */
+ VMessageBox::warning(this, tr("Error starting web browser"),
+ tr("Vidalia was unable to start the configured web browser"),
+ VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape);
+}
+
+/** Called when the IM client failed to start, for example, because the path
+ * specified to the IM client executable didn't lead to an executable. */
+void
+MainWindow::onIMFailed(QString errmsg)
+{
+ Q_UNUSED(errmsg);
+
+ /* Display an error message and see if the user wants some help */
+ VMessageBox::warning(this, tr("Error starting IM client"),
+ tr("Vidalia was unable to start the configured IM client"),
+ VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape);
+}
+
+/** Starts the proxy server, if appropriately configured */
+void
+MainWindow::startProxy()
+{
+ VidaliaSettings settings;
+ QString executable = settings.getProxyExecutable();
+ _proxyProcess->start(executable, settings.getProxyExecutableArguments());
+}
+
+/** Called when the proxy server fails to start, for example, because
+ * the path specified didn't lead to an executable. */
+void
+MainWindow::onProxyFailed(QString errmsg)
+{
+ Q_UNUSED(errmsg);
+
+ /* Display an error message and see if the user wants some help */
+ VMessageBox::warning(this, tr("Error starting proxy server"),
+ tr("Vidalia was unable to start the configured proxy server"),
+ VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape);
+}
+
+/** Start a web browser when given the directory containing the executable and profile */
+void
+MainWindow::launchBrowserFromDirectory()
+{
+ VidaliaSettings settings;
+
+ QString browserDirectory = settings.getBrowserDirectory();
+ QString browserDirectoryFilename = settings.getBrowserExecutable();
+
+ /* Set TZ=UTC (to stop leaking timezone information) and
+ * MOZ_NO_REMOTE=1 (to allow multiple instances of Firefox */
+ QStringList 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());
+}
+
diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h
index 1d913d0..a01f167 100644
--- a/src/vidalia/MainWindow.h
+++ b/src/vidalia/MainWindow.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -20,16 +20,12 @@
#include "ui_MainWindow.h"
#include "VidaliaWindow.h"
-#include "HelperProcess.h"
-#include "AboutDialog.h"
-#include "MessageLog.h"
-#include "BandwidthGraph.h"
+#include "StatusTab.h"
#include "ConfigDialog.h"
-#include "HelpBrowser.h"
+#include "MessageLog.h"
#include "NetViewer.h"
-
-#include "TorControl.h"
-
+#include "BandwidthGraph.h"
+#include "HelperProcess.h"
#if defined(USE_AUTOUPDATE)
#include "UpdateProcess.h"
#include "UpdateProgressDialog.h"
@@ -38,6 +34,8 @@
#include "UPNPControl.h"
#endif
+#include "TorControl.h"
+
#include <QMainWindow>
#include <QTimer>
#include <QSystemTrayIcon>
@@ -64,15 +62,12 @@ private slots:
/** Respond to a double-click on the tray icon by opening the Control Panel
* window. */
void trayIconActivated(QSystemTrayIcon::ActivationReason reason);
- /** Displays the help browser and displays the most recently viewed help
- * topic. */
- void showHelpDialog();
- /** Called when a child window requests the given help <b>topic</b>. */
- void showHelpDialog(const QString &topic);
/** Called when the user selects "Start" from the menu. */
void start();
/** Called when the user changes a setting that needs Tor restarting */
void restart();
+ /** Called when the user wants to reload Tor's config */
+ void sighup();
/** Called when the Tor process fails to start. */
void startFailed(QString errmsg);
/** Called when the Tor process has successfully started. */
@@ -107,26 +102,6 @@ private slots:
/** Terminate the Tor process if it is being run under Vidalia, disconnect
* all TorControl signals, and exit Vidalia. */
void aboutToQuit();
- /** Creates and displays Vidalia's About dialog. */
- void showAboutDialog();
- /** Creates and displays the Configuration dialog with the current page set
- * to <b>page</b>. */
- void showConfigDialog(ConfigDialog::Page page = ConfigDialog::General);
- /** Displays the Configuration dialog, set to the Server page. */
- void showServerConfigDialog();
- /** Called when the "show on startup" checkbox is toggled. */
- void toggleShowOnStartup(bool checked);
- /** Called when the web browser or IM client have stopped */
- void onSubprocessFinished(int exitCode, QProcess::ExitStatus exitStatus);
- /** Called periodically to check if the browser is running. If it is not,
- * exit Vidalia cleanly */
- void onCheckForBrowser();
- /** Called web the web browser failed to start */
- void onBrowserFailed(QString errmsg);
- /** Called web the IM client failed to start */
- void onIMFailed(QString errmsg);
- /** Called when the proxy server fails to start */
- void onProxyFailed(QString errmsg);
/** Called when Tor has successfully established a circuit. */
void circuitEstablished();
@@ -142,6 +117,42 @@ private slots:
void dangerousTorVersion(tc::TorVersionStatus reason,
const QString &version,
const QStringList &recommended);
+ void handleCloseTab(int index);
+ /** Creates and displays the Configuration dialog with the current page set
+ * to <b>page</b>. */
+ void showConfigDialog(ConfigDialog::Page page = ConfigDialog::General);
+ /** Displays the Message Log tab */
+ void showMessageLogTab();
+ /** Displays the General Tor Status tab */
+ void showStatusTab();
+ /** Displays the Bandwidth graph tab */
+ void showBandwithTab();
+ /** Displays the Network map tab */
+ void showNetViewerTab();
+ /** Creates and displays Vidalia's About dialog. */
+ void showAboutDialog();
+ /** Displays the help browser and displays the most recently viewed help
+ * topic. */
+ void showHelpDialog();
+ /** Called when a child window requests the given help <b>topic</b>. */
+ void showHelpDialog(const QString &topic);
+
+ /** Adds a new tab to the MainWindow */
+ void addTab(VidaliaTab *tab);
+ /** Deletes the tab at index if it exists and it isn't the Status tab */
+ void delTab(int index = -1);
+
+ /** Called when the web browser or IM client have stopped */
+ void onSubprocessFinished(int exitCode, QProcess::ExitStatus exitStatus);
+ /** Called periodically to check if the browser is running. If it is not,
+ * exit Vidalia cleanly */
+ void onCheckForBrowser();
+ /** Called web the web browser failed to start */
+ void onBrowserFailed(QString errmsg);
+ /** Called web the IM client failed to start */
+ void onIMFailed(QString errmsg);
+ /** Called when the proxy server fails to start */
+ void onProxyFailed(QString errmsg);
#if defined(USE_AUTOUPDATE)
/** Called when the user clicks the 'Check Now' button in the General
@@ -166,6 +177,7 @@ private slots:
void installUpdatesFailed(const QString &errmsg);
#endif
+
#if defined(USE_MINIUPNPC)
/** Called when a UPnP error occurs. */
void upnpError(UPNPControl::UPNPError error);
@@ -182,6 +194,9 @@ private:
Authenticated, /**< Vidalia has authenticated to Tor. */
CircuitEstablished /**< Tor has built a circuit. */
};
+
+ void createGUI();
+ void createConnections();
/** Create the actions on the tray menu or menubar */
void createActions();
/** Creates a tray icon with a context menu and adds it to the system
@@ -189,19 +204,15 @@ private:
void createTrayIcon();
/** Create the tray popup menu and it's submenus */
QMenu* createTrayMenu();
- /** Creates a default menubar on Mac */
+ /** Creates a menubar */
void createMenuBar();
+ /** Creates a toolbar */
+ void createToolBar();
/** Sets the current tray or dock icon image to <b>iconFile</b>. */
void setTrayIcon(const QString &iconFile);
/** Updates the UI to reflect Tor's current <b>status</b>. Returns the
* previously set TorStatus value. */
TorStatus updateTorStatus(TorStatus status);
- /** Start a web browser when given the directory containing the executable and profile */
- void launchBrowserFromDirectory();
- /** Starts the web browser, if appropriately configured */
- void startSubprocesses();
- /** Starts the proxy server, if appropriately configured */
- void startProxy();
/** Converts a TorStatus enum value to a string for debug logging purposes. */
QString toString(TorStatus status);
/** Authenticates Vidalia to Tor's control port. */
@@ -234,22 +245,8 @@ private:
bool _delayedShutdownStarted;
/** Set to true if Vidalia started its own Tor process. */
bool _isVidaliaRunningTor;
- /** A MessageLog object which handles logging Tor messages */
- MessageLog* _messageLog;
- /** A BandwidthGraph object which handles monitoring Tor bandwidth usage */
- BandwidthGraph* _bandwidthGraph;
- /** A NetViewer object which displays the Tor network graphically */
- NetViewer* _netViewer;
- /** A ConfigDialog object which lets the user configure Tor and Vidalia */
- ConfigDialog* _configDialog;
/** A TorControl object that handles communication with Tor */
TorControl* _torControl;
- /** A HelperProcess object that manages the web browser */
- HelperProcess* _browserProcess;
- /** A HelperProcess object that manages the IM client */
- HelperProcess* _imProcess;
- /** A HelperProcess object that manages the proxy server */
- HelperProcess* _proxyProcess;
/** Remembers the control password between when we start Tor with a hash of
* the password and when we need to provide the password itself. */
QString _controlPassword;
@@ -259,6 +256,20 @@ private:
/** The Vidalia icon that sits in the tray. */
QSystemTrayIcon _trayIcon;
+ /** Start a web browser when given the directory containing the executable and profile */
+ void launchBrowserFromDirectory();
+ /** Starts the web browser, if appropriately configured */
+ void startSubprocesses();
+ /** Starts the proxy server, if appropriately configured */
+ void startProxy();
+
+ /** A HelperProcess object that manages the web browser */
+ HelperProcess* _browserProcess;
+ /** A HelperProcess object that manages the IM client */
+ HelperProcess* _imProcess;
+ /** A HelperProcess object that manages the proxy server */
+ HelperProcess* _proxyProcess;
+
#if defined(USE_AUTOUPDATE)
/** Timer used to remind us to check for software updates. */
QTimer _updateTimer;
@@ -270,24 +281,32 @@ private:
/** Set to true if Vidalia should restart Tor after a software upgrade. */
bool _restartTorAfterUpgrade;
#endif
- /** The menubar (Mac OS X only). */
- QMenuBar *_menuBar;
/** Defines the actions for the tray menu */
- QAction* _actionShowControlPanel;
- QAction* _actionStartStopTor;
- QAction* _actionShowConfig;
- QAction* _actionShowAbout;
- QAction* _actionExit;
- QAction* _actionShowBandwidth;
- QAction* _actionShowMessageLog;
- QAction* _actionShowHelp;
- QAction* _actionShowNetworkMap;
- QAction* _actionNewIdentity;
+ QAction *_actionShowControlPanel;
+ QAction *_actionStartStopTor;
+ QAction *_actionStartTor;
+ QAction *_actionStopTor;
+ QAction *_actionRestartTor;
+ QAction *_actionReloadConfig;
+ QAction *_actionNewIdentity;
+ QAction *_actionStatus;
+ QAction *_actionNetworkMap;
+ QAction *_actionMessageLog;
+ QAction *_actionBandwidthGraph;
+ QAction *_actionConfigure;
+ QAction *_actionVidaliaHelp;
+ QAction *_actionAbout;
+ QAction *_actionExit;
Ui::MainWindow ui; /**< Qt Designer generated object. */
+
+ StatusTab _statusTab; /**< Status tab that displays the load progress and a short log */
+ MessageLog *_messageLog; /**< Message log that displays a more detailed log from Tor */
+ NetViewer _netViewer; /**< Network map that draws circuits */
+ QStringList _tabMap; /**< Map to handle opened tabs */
+ BandwidthGraph *_graph; /**< Graph that draws bandwidth usage */
};
#endif
-
diff --git a/src/vidalia/MainWindow.ui b/src/vidalia/MainWindow.ui
index 5668cdc..d8bb5ce 100644
--- a/src/vidalia/MainWindow.ui
+++ b/src/vidalia/MainWindow.ui
@@ -1,603 +1,73 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <widget class="QMainWindow" name="MainWindow">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>800</width>
+ <height>600</height>
+ </rect>
</property>
- <property name="maximumSize" >
- <size>
- <width>16777215</width>
- <height>1</height>
- </size>
- </property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Vidalia Control Panel</string>
</property>
- <property name="windowIcon" >
- <iconset resource="res/vidalia.qrc" >:/images/32x32/tor-logo.png</iconset>
+ <property name="windowIcon">
+ <iconset resource="res/vidalia.qrc">
+ <normaloff>:/images/128x128/tor-logo.png</normaloff>:/images/128x128/tor-logo.png</iconset>
</property>
- <widget class="QWidget" name="centralwidget" >
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>20</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QGroupBox" name="grpStatus" >
- <property name="geometry" >
- <rect>
- <x>20</x>
- <y>10</y>
- <width>400</width>
- <height>72</height>
- </rect>
- </property>
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="title" >
- <string>Status</string>
- </property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>4</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QLabel" name="lblStartupProgress" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>3</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize" >
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text" >
- <string>Starting Tor</string>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- <property name="visible" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QProgressBar" name="progressBar" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>3</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize" >
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="visible" >
- <bool>false</bool>
- </property>
- <property name="minimum" >
- <number>0</number>
- </property>
- <property name="maximum" >
- <number>130</number>
- </property>
- <property name="textVisible" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>4</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>4</hsizetype>
- <vsizetype>4</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QLabel" name="lblTorStatusImg" >
- <property name="pixmap" >
- <pixmap>:/images/48x48/tor-off.png</pixmap>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="lblTorStatus" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>3</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize" >
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text" >
- <string>Tor is not running</string>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>1</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="grpShortcuts" >
- <property name="geometry" >
- <rect>
- <x>20</x>
- <y>10</y>
- <width>400</width>
- <height>225</height>
- </rect>
- </property>
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="title" >
- <string>Vidalia Shortcuts</string>
- </property>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="0" column="0" colspan="2" >
- <widget class="VClickLabel" native="1" name="lblStartStopTor" >
- <property name="text" >
- <string>Start Tor</string>
- </property>
- <property name="statusTip" >
- <string>Start Tor</string>
- </property>
- <property name="pixmap" >
- <pixmap>:/images/48x48/start-tor.png</pixmap>
- </property>
- </widget>
- </item>
- <item row="0" column="2" colspan="2" >
- <widget class="VClickLabel" native="1" name="lblSetupRelaying" >
- <property name="text" >
- <string>Setup Relaying</string>
- </property>
- <property name="statusTip" >
- <string>Set up a relay and help the network grow</string>
- </property>
- <property name="pixmap" >
- <pixmap>:/images/48x48/preferences-system-network-sharing.png</pixmap>
- </property>
- </widget>
- </item>
- <item row="1" column="0" colspan="2" >
- <widget class="VClickLabel" native="1" name="lblViewNetwork" >
- <property name="text" >
- <string>View the Network</string>
- </property>
- <property name="statusTip" >
- <string>View a map of the Tor network</string>
- </property>
- <property name="pixmap" >
- <pixmap>:/images/48x48/applications-internet.png</pixmap>
- </property>
- </widget>
- </item>
- <item row="1" column="2" colspan="2" >
- <widget class="VClickLabel" native="1" name="lblNewIdentity" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="text" >
- <string>Use a New Identity</string>
- </property>
- <property name="statusTip" >
- <string>Make subsequent connections appear new</string>
- </property>
- <property name="pixmap" >
- <pixmap>:/images/48x48/view-media-artist.png</pixmap>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="4" >
- <widget class="Line" name="line" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item row="3" column="0" colspan="4" >
- <widget class="QWidget" name="lowerLayout" >
- <layout class="QHBoxLayout">
- <item>
- <widget class="QWidget" name="leftVerticalLayout" >
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="VClickLabel" name="lblBandwidthGraph" >
- <property name="text" >
- <string>Bandwidth Graph</string>
- </property>
- <property name="statusTip" >
- <string>View recent bandwidth usage</string>
- </property>
- <property name="pixmap" >
- <pixmap>:/images/22x22/utilities-system-monitor.png</pixmap>
- </property>
- </widget>
- </item>
- <item>
- <widget class="VClickLabel" name="lblMessageLog" >
- <property name="text" >
- <string>Message Log</string>
- </property>
- <property name="statusTip" >
- <string>View log message history</string>
- </property>
- <property name="pixmap" >
- <pixmap>:/images/22x22/format-justify-fill.png</pixmap>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>18</width>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QWidget" name="midVerticalLayout" >
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="VClickLabel" name="lblHelpBrowser" >
- <property name="text" >
- <string>Help</string>
- </property>
- <property name="statusTip" >
- <string>View help documentation</string>
- </property>
- <property name="pixmap" >
- <pixmap>:/images/22x22/system-help.png</pixmap>
- </property>
- </widget>
- </item>
- <item>
- <widget class="VClickLabel" name="lblSettings" >
- <property name="text" >
- <string>Settings</string>
- </property>
- <property name="statusTip" >
- <string>Configure Vidalia</string>
- </property>
- <property name="pixmap" >
- <pixmap>:/images/22x22/preferences-system.png</pixmap>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>18</width>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QWidget" name="rightVerticalLayout" >
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="VClickLabel" name="lblAboutVidalia" >
- <property name="text" >
- <string>About</string>
- </property>
- <property name="statusTip" >
- <string>View version and license information</string>
- </property>
- <property name="pixmap" >
- <pixmap>:/images/22x22/help-about.png</pixmap>
- </property>
- </widget>
- </item>
- <item>
- <widget class="VClickLabel" name="lblExit" >
- <property name="text" >
- <string>Exit</string>
- </property>
- <property name="statusTip" >
- <string>Exit Vidalia</string>
- </property>
- <property name="pixmap" >
- <pixmap>:/images/22x22/application-exit.png</pixmap>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>18</width>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QCheckBox" name="chkShowOnStartup" >
- <property name="text" >
- <string>Show this window on startup</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>18</width>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="btnHide" >
- <property name="text" >
- <string>Hide</string>
+ <widget class="QWidget" name="centralwidget">
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="VTabWidget" name="tabWidget">
+ <property name="currentIndex">
+ <number>-1</number>
</property>
- <property name="statusTip" >
- <string>Hide this window</string>
+ <property name="tabsClosable">
+ <bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
- <widget class="QStatusBar" name="statusbar" />
+ <widget class="QMenuBar" name="menubar">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>800</width>
+ <height>21</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QStatusBar" name="statusbar"/>
+ <widget class="QToolBar" name="toolBar">
+ <property name="windowTitle">
+ <string>toolBar</string>
+ </property>
+ <attribute name="toolBarArea">
+ <enum>TopToolBarArea</enum>
+ </attribute>
+ <attribute name="toolBarBreak">
+ <bool>false</bool>
+ </attribute>
+ </widget>
</widget>
<customwidgets>
<customwidget>
- <class>VClickLabel</class>
- <extends>QWidget</extends>
- <header>VClickLabel.h</header>
+ <class>VTabWidget</class>
+ <extends>QTabWidget</extends>
+ <header>VTabWidget.h</header>
+ <container>1</container>
</customwidget>
</customwidgets>
<resources>
- <include location="res/vidalia.qrc" />
+ <include location="res/vidalia.qrc"/>
</resources>
- <connections>
- <connection>
- <sender>lblStartStopTor</sender>
- <signal>clicked()</signal>
- <receiver>MainWindow</receiver>
- <slot>start()</slot>
- </connection>
- <connection>
- <sender>lblNewIdentity</sender>
- <signal>clicked()</signal>
- <receiver>MainWindow</receiver>
- <slot>newIdentity()</slot>
- </connection>
- <connection>
- <sender>lblSetupRelaying</sender>
- <signal>clicked()</signal>
- <receiver>MainWindow</receiver>
- <slot>showServerConfigDialog()</slot>
- </connection>
- <connection>
- <sender>lblSettings</sender>
- <signal>clicked()</signal>
- <receiver>MainWindow</receiver>
- <slot>showConfigDialog()</slot>
- </connection>
- <connection>
- <sender>lblAboutVidalia</sender>
- <signal>clicked()</signal>
- <receiver>MainWindow</receiver>
- <slot>showAboutDialog()</slot>
- </connection>
- <connection>
- <sender>lblExit</sender>
- <signal>clicked()</signal>
- <receiver>MainWindow</receiver>
- <slot>close()</slot>
- </connection>
- <connection>
- <sender>chkShowOnStartup</sender>
- <signal>toggled(bool)</signal>
- <receiver>MainWindow</receiver>
- <slot>toggleShowOnStartup(bool)</slot>
- </connection>
- <connection>
- <sender>btnHide</sender>
- <signal>clicked()</signal>
- <receiver>MainWindow</receiver>
- <slot>hide()</slot>
- </connection>
- </connections>
+ <connections/>
</ui>
diff --git a/src/vidalia/PackageInfo.cpp b/src/vidalia/PackageInfo.cpp
index 59ef18f..d99d701 100644
--- a/src/vidalia/PackageInfo.cpp
+++ b/src/vidalia/PackageInfo.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/PackageInfo.h b/src/vidalia/PackageInfo.h
index e1dc692..41a98d3 100644
--- a/src/vidalia/PackageInfo.h
+++ b/src/vidalia/PackageInfo.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/StatusTab.cpp b/src/vidalia/StatusTab.cpp
new file mode 100644
index 0000000..f32924b
--- /dev/null
+++ b/src/vidalia/StatusTab.cpp
@@ -0,0 +1,93 @@
+#include "StatusTab.h"
+#include "VidaliaSettings.h"
+
+#define DEFAULT_MAX_MSG_COUNT 50
+#define SETTING_MAX_MSG_COUNT "MaxMsgCount"
+
+StatusTab::StatusTab(QWidget *parent)
+ : VidaliaTab(tr("Status"), "MessageLog", parent)
+{
+ ui.setupUi(this);
+ ui.listNotifications->sortItems(0, Qt::AscendingOrder);
+ uint maxMsgCount = getSetting(SETTING_MAX_MSG_COUNT,
+ DEFAULT_MAX_MSG_COUNT).toUInt();
+ ui.listNotifications->setMaximumItemCount(maxMsgCount);
+}
+
+StatusTab::~StatusTab()
+{
+
+}
+
+void
+StatusTab::setTorStatus(const QString &text)
+{
+ ui.lblTorStatus->setText(text);
+}
+
+void
+StatusTab::setTorStatus(const QPixmap &icon)
+{
+ ui.lblTorStatusImg->setPixmap(icon);
+}
+
+void
+StatusTab::setTorStatus(const QPixmap &icon, const QString &text)
+{
+ ui.lblTorStatusImg->setPixmap(icon);
+ ui.lblTorStatus->setText(text);
+}
+
+void
+StatusTab::setTorStatusVisible(bool visible)
+{
+ ui.lblTorStatusImg->setVisible(visible);
+ ui.lblTorStatus->setVisible(visible);
+}
+
+void
+StatusTab::setProgress(int progress, const QString &description)
+{
+ ui.progressBar->setValue(progress);
+ ui.lblStartupProgress->setText(description);
+}
+
+void
+StatusTab::setProgressVisible(bool visible)
+{
+ ui.progressBar->setVisible(visible);
+ ui.lblStartupProgress->setVisible(visible);
+}
+
+bool
+StatusTab::isCheckedShowOnStartup()
+{
+ return ui.chkShowOnStartup->isChecked();
+}
+
+void
+StatusTab::checkShowOnStartup(bool check)
+{
+ ui.chkShowOnStartup->setChecked(check);
+}
+
+void
+StatusTab::hideCheckShowOnStartup()
+{
+ ui.chkShowOnStartup->hide();
+}
+
+/** Called when the "show on startup" checkbox is toggled. */
+void
+StatusTab::toggleShowOnStartup(bool checked)
+{
+ VidaliaSettings settings;
+ settings.setShowMainWindowAtStart(checked);
+}
+
+void
+StatusTab::retranslateUi()
+{
+ ui.retranslateUi(this);
+ setTitle(tr("Status"));
+}
diff --git a/src/vidalia/StatusTab.h b/src/vidalia/StatusTab.h
new file mode 100644
index 0000000..440c2b7
--- /dev/null
+++ b/src/vidalia/StatusTab.h
@@ -0,0 +1,65 @@
+/*
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If you
+** did not receive the LICENSE file with this file, you may obtain it from the
+** Vidalia source package distributed by the Vidalia Project at
+** http://www.vidalia-project.net/. No part of Vidalia, including this file,
+** may be copied, modified, propagated, or distributed except according to the
+** terms described in the LICENSE file.
+*/
+
+/*
+** \file StatusTab.h
+** \brief Main tab that shows the current Tor status
+*/
+
+#ifndef _STATUSTAB_H
+#define _STATUSTAB_H
+
+#include "ui_StatusTab.h"
+#include "VidaliaTab.h"
+
+class StatusTab : public VidaliaTab
+{
+ Q_OBJECT
+
+public:
+ /** Default constructor */
+ StatusTab(QWidget *parent = 0);
+ /** Destructor. */
+ ~StatusTab();
+
+ /** Sets the icon to the general Tor status display */
+ void setTorStatus(const QPixmap &icon);
+ /** Sets the text to the general Tor status display */
+ void setTorStatus(const QString &text);
+ /** Wrapper for the first two methods for ease of use */
+ void setTorStatus(const QPixmap &icon, const QString &text);
+ /** Sets the Tor status display to visible or hidden */
+ void setTorStatusVisible(bool visible);
+
+ /** Sets the progress bar and its description */
+ void setProgress(int progress, const QString &description);
+ /** Sets the visibility of the progress bar */
+ void setProgressVisible(bool visible);
+
+ /** Returns true if the "Show on start up" checkbox is checked */
+ bool isCheckedShowOnStartup();
+ /** Sets "Show on start up" checkbox checked if check is true */
+ void checkShowOnStartup(bool check);
+ /** Hides the "Show on start up" checkbox */
+ void hideCheckShowOnStartup();
+
+private slots:
+ /** Called when the "show on startup" checkbox is toggled. */
+ void toggleShowOnStartup(bool checked);
+
+protected:
+ /** Called when the user changes the UI translation. */
+ void retranslateUi();
+
+private:
+ Ui::StatusTab ui;
+};
+
+#endif
diff --git a/src/vidalia/StatusTab.ui b/src/vidalia/StatusTab.ui
new file mode 100644
index 0000000..a89f303
--- /dev/null
+++ b/src/vidalia/StatusTab.ui
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>StatusTab</class>
+ <widget class="QWidget" name="StatusTab">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>513</width>
+ <height>421</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string notr="true"/>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="grpStatus">
+ <property name="title">
+ <string>Status</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0">
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="lblTorStatusImg">
+ <property name="text">
+ <string notr="true"/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLabel" name="lblTorStatus">
+ <property name="text">
+ <string notr="true">Tor is not running</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="1" column="0">
+ <widget class="QLabel" name="lblStartupProgress">
+ <property name="text">
+ <string notr="true">Starting Tor</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QProgressBar" name="progressBar">
+ <property name="maximum">
+ <number>130</number>
+ </property>
+ <property name="value">
+ <number>24</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QGroupBox" name="grpLog">
+ <property name="title">
+ <string>Message Log</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="StatusEventWidget" name="listNotifications">
+ <property name="contextMenuPolicy">
+ <enum>Qt::CustomContextMenu</enum>
+ </property>
+ <property name="horizontalScrollBarPolicy">
+ <enum>Qt::ScrollBarAsNeeded</enum>
+ </property>
+ <property name="showDropIndicator" stdset="0">
+ <bool>false</bool>
+ </property>
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
+ <property name="selectionBehavior">
+ <enum>QAbstractItemView::SelectRows</enum>
+ </property>
+ <property name="indentation">
+ <number>0</number>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <property name="itemsExpandable">
+ <bool>false</bool>
+ </property>
+ <property name="sortingEnabled">
+ <bool>true</bool>
+ </property>
+ <attribute name="headerShowSortIndicator" stdset="0">
+ <bool>true</bool>
+ </attribute>
+ <column>
+ <property name="text">
+ <string>Tor Status</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QCheckBox" name="chkShowOnStartup">
+ <property name="text">
+ <string>Show on startup</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>StatusEventWidget</class>
+ <extends>QTreeWidget</extends>
+ <header>StatusEventWidget.h</header>
+ </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>chkShowOnStartup</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>StatusTab</receiver>
+ <slot>toggleShowOnStartup(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>256</x>
+ <y>368</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>256</x>
+ <y>210</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+ <slots>
+ <slot>toggleShowOnStartup(bool)</slot>
+ </slots>
+</ui>
diff --git a/src/vidalia/UpdateProcess.cpp b/src/vidalia/UpdateProcess.cpp
index cc4be98..e930ac4 100644
--- a/src/vidalia/UpdateProcess.cpp
+++ b/src/vidalia/UpdateProcess.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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"
diff --git a/src/vidalia/UpdateProcess.h b/src/vidalia/UpdateProcess.h
index b92b17e..0224d55 100644
--- a/src/vidalia/UpdateProcess.h
+++ b/src/vidalia/UpdateProcess.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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
diff --git a/src/vidalia/UpdateProgressDialog.cpp b/src/vidalia/UpdateProgressDialog.cpp
index 420cbdd..e7b1753 100644
--- a/src/vidalia/UpdateProgressDialog.cpp
+++ b/src/vidalia/UpdateProgressDialog.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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"
diff --git a/src/vidalia/UpdateProgressDialog.h b/src/vidalia/UpdateProgressDialog.h
index 542bb7d..67a169a 100644
--- a/src/vidalia/UpdateProgressDialog.h
+++ b/src/vidalia/UpdateProgressDialog.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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
diff --git a/src/vidalia/UpdatesAvailableDialog.cpp b/src/vidalia/UpdatesAvailableDialog.cpp
index 65249ce..90456d3 100644
--- a/src/vidalia/UpdatesAvailableDialog.cpp
+++ b/src/vidalia/UpdatesAvailableDialog.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/UpdatesAvailableDialog.h b/src/vidalia/UpdatesAvailableDialog.h
index e90a3de..6bf049f 100644
--- a/src/vidalia/UpdatesAvailableDialog.h
+++ b/src/vidalia/UpdatesAvailableDialog.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/VClickLabel.cpp b/src/vidalia/VClickLabel.cpp
deleted file mode 100644
index 61e11fe..0000000
--- a/src/vidalia/VClickLabel.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-** This file is part of Vidalia, and is subject to the license terms in the
-** LICENSE file, found in the top level directory of this distribution. If you
-** did not receive the LICENSE file with this file, you may obtain it from the
-** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
-*/
-
-/*
-** \file VClickLabel.cpp
-** \brief Custom widget to create a clickable label with both an image and text.
-*/
-
-#include "VClickLabel.h"
-#include "Vidalia.h"
-
-#include <QPainter>
-
-
-/** Default constructor. */
-VClickLabel::VClickLabel(QWidget *parent)
- : QWidget(parent)
-{
- setCursor(Qt::PointingHandCursor);
-}
-
-/** Returns the current size hint for this widget's current contents. */
-QSize
-VClickLabel::sizeHint() const
-{
- int height = qMax(_pixmap.height(), fontMetrics().height())+2;
- int width = _pixmap.width() + fontMetrics().width(_text)+2;
- return QSize(width, height);
-}
-
-/** Returns the minimum size hint for this widget's current contents. */
-QSize
-VClickLabel::minimumSizeHint() const
-{
- return sizeHint();
-}
-
-/** Overloaded paint event to draw a pixmap and a text label. */
-void
-VClickLabel::paintEvent(QPaintEvent *e)
-{
- QPainter p(this);
- QRect rect = this->rect();
-
- if (vApp->isLeftToRight()) {
- if (!_pixmap.isNull())
- p.drawPixmap(0, qMax((rect.height()-_pixmap.height())/2, 0), _pixmap);
- if (!_text.isEmpty())
- p.drawText(_pixmap.width()+2, (rect.height()+fontInfo().pixelSize())/2, _text);
- } else {
- if (!_pixmap.isNull())
- p.drawPixmap(qMax(rect.right()-_pixmap.width(), 0),
- qMax((rect.height()-_pixmap.height())/2, 0), _pixmap);
- if (!_text.isEmpty()) {
- int textWidth = fontMetrics().width(_text);
- p.drawText(qMax(rect.right()-_pixmap.width()-textWidth-2, 0),
- (rect.height()+fontInfo().pixelSize())/2, _text);
- }
- }
- e->accept();
-}
-
-/** Overloaded mouse event to catch left mouse button clicks. */
-void
-VClickLabel::mouseReleaseEvent(QMouseEvent *e)
-{
- if (e->button() == Qt::LeftButton) {
- emit clicked();
- }
- e->accept();
-}
-
-/** Sets the label text to <b>text</b>. */
-void
-VClickLabel::setText(const QString &text)
-{
- _text = text;
- update();
-}
-
-/** Sets the widget's image to <b>img</b>. */
-void
-VClickLabel::setPixmap(const QPixmap &pixmap)
-{
- _pixmap = pixmap;
- update();
-}
-
diff --git a/src/vidalia/VClickLabel.h b/src/vidalia/VClickLabel.h
deleted file mode 100644
index ae4ec5a..0000000
--- a/src/vidalia/VClickLabel.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-** This file is part of Vidalia, and is subject to the license terms in the
-** LICENSE file, found in the top level directory of this distribution. If you
-** did not receive the LICENSE file with this file, you may obtain it from the
-** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
-*/
-
-/*
-** \file VClickLabel.h
-** \brief Custom widget to create a clickable label with both an image and text.
-*/
-
-#ifndef _VCLICKLABEL_H
-#define _VCLICKLABEL_H
-
-#include <QWidget>
-#include <QPixmap>
-#include <QMouseEvent>
-#include <QSize>
-
-
-class VClickLabel : public QWidget
-{
- Q_OBJECT
-
-public:
- /** Default constructor. */
- VClickLabel(QWidget *parent = 0);
-
- /** Returns the current size hint for this widget's current contents. */
- virtual QSize sizeHint() const;
- /** Returns the minimum size hint for this widget's current contents. */
- virtual QSize minimumSizeHint() const;
-
- /** Sets the label text to <b>text</b>. */
- void setText(const QString &text);
- /** Sets the widget's image to <b>img</b>. */
- void setPixmap(const QPixmap &img);
-
-signals:
- /** Emitted when the widget is left-clicked. */
- void clicked();
-
-protected:
- /** Overloaded paint event to draw a pixmap and a text label. */
- virtual void paintEvent(QPaintEvent *e);
- /** Overloaded mouse event to catch left mouse button clicks. */
- virtual void mouseReleaseEvent(QMouseEvent *e);
-
-private:
- QString _text; /**< Text label to display in the widget. */
- QPixmap _pixmap; /**< Image to display in the widget. */
-};
-
-#endif
-
diff --git a/src/vidalia/VMessageBox.cpp b/src/vidalia/VMessageBox.cpp
index 99d8a74..0dbf927 100644
--- a/src/vidalia/VMessageBox.cpp
+++ b/src/vidalia/VMessageBox.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/VMessageBox.h b/src/vidalia/VMessageBox.h
index a4b7f3b..fc96405 100644
--- a/src/vidalia/VMessageBox.h
+++ b/src/vidalia/VMessageBox.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/VTabWidget.cpp b/src/vidalia/VTabWidget.cpp
new file mode 100644
index 0000000..421f069
--- /dev/null
+++ b/src/vidalia/VTabWidget.cpp
@@ -0,0 +1,52 @@
+#include <QTabBar>
+
+#include "VTabWidget.h"
+#include "VidaliaTab.h"
+
+VTabWidget::VTabWidget(QWidget *parent) : QTabWidget(parent)
+{
+ connect(this, SIGNAL(currentChanged(int)), this, SLOT(updateTop(int)));
+}
+
+VTabWidget::~VTabWidget()
+{
+
+}
+
+void
+VTabWidget::pinTab(int position)
+{
+ tabBar()->setTabButton(position, QTabBar::RightSide, 0);
+}
+
+void
+VTabWidget::updateTop(int index)
+{
+ for(int i=0; i<count(); i++)
+ if(widget(i))
+ qobject_cast<VidaliaTab *>(widget(i))->setOnTop(false);
+ if(widget(index))
+ qobject_cast<VidaliaTab *>(widget(index))->setOnTop(true);
+}
+
+void
+VTabWidget::changeEvent(QEvent *e)
+{
+ if (e->type() == QEvent::LanguageChange) {
+ retranslateUi();
+ e->accept();
+ return;
+ }
+ QTabWidget::changeEvent(e);
+}
+
+void
+VTabWidget::retranslateUi()
+{
+ for(int i=0; i<count(); i++) {
+ // We have to translate twice the tabs because otherwise the titles won't
+ // get updated
+ QApplication::sendEvent(qobject_cast<VidaliaTab *>(widget(i)), new QEvent(QEvent::LanguageChange));
+ setTabText(i, qobject_cast<VidaliaTab *>(widget(i))->getTitle());
+ }
+}
diff --git a/src/vidalia/about/AboutDialog.h b/src/vidalia/VTabWidget.h
similarity index 56%
copy from src/vidalia/about/AboutDialog.h
copy to src/vidalia/VTabWidget.h
index 1d654e4..c3eb8ce 100644
--- a/src/vidalia/about/AboutDialog.h
+++ b/src/vidalia/VTabWidget.h
@@ -9,27 +9,34 @@
*/
/*
-** \file AboutDialog.h
-** \brief Displays information about Vidalia, Tor, and Qt
+** \file VTabWidget.h
+** \brief Implements a tab bar for more flexible handle of tabs
*/
-#ifndef _ABOUTDIALOG_H
-#define _ABOUTDIALOG_H
+#ifndef _VTABWIDGET_H
+#define _VTABWIDGET_H
-#include "ui_AboutDialog.h"
-#include "LicenseDialog.h"
+#include <QTabWidget>
-
-class AboutDialog : public QDialog
+class VTabWidget : public QTabWidget
{
Q_OBJECT
public:
/** Default constructor */
- AboutDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
+ VTabWidget(QWidget *parent = 0);
+ /** Destructor */
+ ~VTabWidget();
+
+ /** Makes the tab at position unclosable */
+ void pinTab(int position);
+
+protected:
+ void changeEvent(QEvent *e);
+ void retranslateUi();
-private:
- Ui::AboutDialog ui; /**< Qt Designer generated QObject **/
+private slots:
+ void updateTop(int index);
};
#endif
diff --git a/src/vidalia/Vidalia.cpp b/src/vidalia/Vidalia.cpp
index f88c94f..c763fac 100644
--- a/src/vidalia/Vidalia.cpp
+++ b/src/vidalia/Vidalia.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -509,5 +509,14 @@ Vidalia::loadDefaultCaCertificates() const
if (! QSslSocket::addDefaultCaCertificates(":/pki/EquifaxSecureCA.crt"))
vWarn("Failed to add the Equifax Secure CA certificate to the default CA "
"certificate database.");
+ if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertCA.crt"))
+ vWarn("Failed to add the DigiCert Global CA certificate to the default CA "
+ "certificate database.");
+ if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertAssuredCA.crt"))
+ vWarn("Failed to add the DigiCert Assured CA certificate to the default CA "
+ "certificate database.");
+ if (! QSslSocket::addDefaultCaCertificates(":/pki/DigiCertHighAssuranceCA.crt"))
+ vWarn("Failed to add the DigiCert High Assurance CA certificate to the default CA "
+ "certificate database.");
}
diff --git a/src/vidalia/Vidalia.h b/src/vidalia/Vidalia.h
index bc5d124..421ae68 100644
--- a/src/vidalia/Vidalia.h
+++ b/src/vidalia/Vidalia.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/VidaliaTab.cpp b/src/vidalia/VidaliaTab.cpp
new file mode 100644
index 0000000..ec5f1bf
--- /dev/null
+++ b/src/vidalia/VidaliaTab.cpp
@@ -0,0 +1,66 @@
+#include "VidaliaTab.h"
+#include "Vidalia.h"
+
+VidaliaTab::VidaliaTab(const QString &title, const QString &name, QWidget *parent)
+ : QWidget(parent), _title(title)
+{
+ _settings = NULL;
+ if(!name.isEmpty())
+ _settings = new VSettings(name);
+}
+
+VidaliaTab::~VidaliaTab()
+{
+ if(_settings)
+ delete _settings;
+}
+
+/** Gets the saved value of a property associated with this window object.
+ * If no value was saved, the default value is returned. */
+QVariant
+VidaliaTab::getSetting(QString setting, QVariant defaultValue)
+{
+ return _settings->value(setting, defaultValue);
+}
+
+/** Saves a value associated with a property name for this window object. */
+void
+VidaliaTab::saveSetting(QString prop, QVariant value)
+{
+ _settings->setValue(prop, value);
+}
+
+/** Associates a shortcut key sequence with a slot. */
+void
+VidaliaTab::setShortcut(const QString &shortcut, const char *slot)
+{
+ vApp->createShortcut(QKeySequence(shortcut), this, this, slot);
+}
+
+/** Reimplement the windows' changeEvent() method to check if the event
+ * is a QEvent::LanguageChange event. If so, call retranslateUi(), which
+ * subclasses of VidaliaWindow can reimplement to update their UI. */
+void
+VidaliaTab::changeEvent(QEvent *e)
+{
+ if (e->type() == QEvent::LanguageChange) {
+ retranslateUi();
+ e->accept();
+ return;
+ }
+ QWidget::changeEvent(e);
+}
+
+/** Called when the user wants to change the currently visible language.
+ * Subclasses can reimplement this to update their UI. */
+void
+VidaliaTab::retranslateUi()
+{
+ /* The default retranslateUi() implementation does nothing */
+}
+
+void
+VidaliaTab::setOnTop(bool top)
+{
+ _onTop = top;
+}
diff --git a/src/vidalia/VidaliaWindow.h b/src/vidalia/VidaliaTab.h
similarity index 65%
copy from src/vidalia/VidaliaWindow.h
copy to src/vidalia/VidaliaTab.h
index 30b44da..ac6edb1 100644
--- a/src/vidalia/VidaliaWindow.h
+++ b/src/vidalia/VidaliaTab.h
@@ -9,44 +9,47 @@
*/
/*
-** \file VidaliaWindow.h
-** \brief Common superclass for all Vidalia windows
+** \file VidaliaTab.h
+** \brief Main tab that shows the current Tor status
*/
-#ifndef _VIDALIAWINDOW_H
-#define _VIDALIAWINDOW_H
+#ifndef _VIDALIATAB_H
+#define _VIDALIATAB_H
#include "VSettings.h"
-#include <QString>
-#include <QWidget>
-#include <QVariant>
-#include <QMainWindow>
+#include <QtGui>
-
-class VidaliaWindow : public QMainWindow
+class VidaliaTab : public QWidget
{
Q_OBJECT
public:
/** Default constructor. */
- VidaliaWindow(const QString &name, QWidget *parent = 0,
- Qt::WFlags flags = 0);
+ VidaliaTab(const QString &title, const QString &name = "", QWidget *parent = 0);
/** Destructor. */
- ~VidaliaWindow();
-
+ ~VidaliaTab();
+
+ /** Returns the tab's title */
+ QString getTitle() const { return _title; }
+ /** Sets the tab's title to title */
+ void setTitle(const QString &title) { _title = title; }
+
/** Associates a shortcut key sequence with a slot. */
void setShortcut(const QString &shortcut, const char *slot);
- /** Saves the size and location of the window. */
- void saveWindowState();
- /** Restores the last size and location of the window. */
- void restoreWindowState();
/** Gets the saved value of a property associated with this window object.
* If no value was saved, the default value is returned. */
QVariant getSetting(QString name, QVariant defaultValue);
/** Saves a value associated with a setting name for this window object. */
void saveSetting(QString name, QVariant value);
+ /** Sets the onTop property of the tab to top */
+ void setOnTop(bool top);
+
+signals:
+ /** Emitted when a VidaliaWindow requests help information on the specified
+ * <b>topic</b>. */
+ void helpRequested(const QString &topic);
protected:
/** Reimplement the windows' changeEvent() method to check if the event
@@ -56,20 +59,10 @@ protected:
/** Called when the user wants to change the currently visible language. */
virtual void retranslateUi();
-public slots:
- /** Shows or hides this window. */
- virtual void setVisible(bool visible);
- /** Show this window. This method really just exists for subclasses to
- * override, since QMainWindow::show() is non-virtual. */
- virtual void showWindow() { QMainWindow::show(); }
-
-signals:
- /** Emitted when a VidaliaWindow requests help information on the specified
- * <b>topic</b>. */
- void helpRequested(const QString &topic);
+ bool _onTop; /**< True if the current tab is the one being displayed */
private:
- QString _name; /**< Name associated with this window. */
+ QString _title; /**< Title displayed in the tab */
VSettings* _settings; /**< Object used to store window properties */
};
diff --git a/src/vidalia/VidaliaWindow.cpp b/src/vidalia/VidaliaWindow.cpp
index 4bec2bd..446802c 100644
--- a/src/vidalia/VidaliaWindow.cpp
+++ b/src/vidalia/VidaliaWindow.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/VidaliaWindow.h b/src/vidalia/VidaliaWindow.h
index 30b44da..b844afc 100644
--- a/src/vidalia/VidaliaWindow.h
+++ b/src/vidalia/VidaliaWindow.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/about/AboutDialog.cpp b/src/vidalia/about/AboutDialog.cpp
index 56723ef..8188ec1 100644
--- a/src/vidalia/about/AboutDialog.cpp
+++ b/src/vidalia/about/AboutDialog.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/about/AboutDialog.h b/src/vidalia/about/AboutDialog.h
index 1d654e4..d3e3f4e 100644
--- a/src/vidalia/about/AboutDialog.h
+++ b/src/vidalia/about/AboutDialog.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/about/LicenseDialog.cpp b/src/vidalia/about/LicenseDialog.cpp
index ce8b98d..01653cf 100644
--- a/src/vidalia/about/LicenseDialog.cpp
+++ b/src/vidalia/about/LicenseDialog.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/about/LicenseDialog.h b/src/vidalia/about/LicenseDialog.h
index d462c40..c090ba1 100644
--- a/src/vidalia/about/LicenseDialog.h
+++ b/src/vidalia/about/LicenseDialog.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/bwgraph/BandwidthGraph.cpp b/src/vidalia/bwgraph/BandwidthGraph.cpp
index 938f54e..7ea82de 100644
--- a/src/vidalia/bwgraph/BandwidthGraph.cpp
+++ b/src/vidalia/bwgraph/BandwidthGraph.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -38,8 +38,9 @@
/** Default constructor */
-BandwidthGraph::BandwidthGraph(QWidget *parent, Qt::WFlags flags)
- : VidaliaWindow("BandwidthGraph", parent, flags)
+BandwidthGraph::BandwidthGraph(QStatusBar *st, QWidget *parent)
+ : VidaliaTab(tr("Bandwidth Graph"), "BandwidthGraph", parent),
+ _statusBar(st)
{
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
@@ -50,8 +51,8 @@ BandwidthGraph::BandwidthGraph(QWidget *parent, Qt::WFlags flags)
this, SLOT(updateGraph(quint64,quint64)));
/* Pressing 'Esc' or 'Ctrl+W' will close the window */
- setShortcut("Esc", SLOT(close()));
- setShortcut("Ctrl+W", SLOT(close()));
+// setShortcut("Esc", SLOT(close()));
+// setShortcut("Ctrl+W", SLOT(close()));
/* Bind events to actions */
createActions();
@@ -81,6 +82,7 @@ void
BandwidthGraph::retranslateUi()
{
ui.retranslateUi(this);
+ setTitle(tr("Bandwidth Graph"));
}
/** Binds events to actions. */
@@ -151,9 +153,10 @@ void
BandwidthGraph::reset()
{
/* Set to current time */
- ui.statusbar->showMessage(tr("Since:") + " " +
- QDateTime::currentDateTime()
- .toString(DATETIME_FMT));
+ if(_statusBar && _onTop)
+ _statusBar->showMessage(tr("Since:") + " " +
+ QDateTime::currentDateTime()
+ .toString(DATETIME_FMT));
/* Reset the graph */
ui.frmGraph->resetGraph();
}
@@ -255,13 +258,3 @@ BandwidthGraph::setOpacity(int value)
#endif
}
-/** Overloads the default show() slot so we can set opacity. */
-void
-BandwidthGraph::showWindow()
-{
- /* Load saved settings */
- loadSettings();
- /* Show the window */
- VidaliaWindow::showWindow();
-}
-
diff --git a/src/vidalia/bwgraph/BandwidthGraph.h b/src/vidalia/bwgraph/BandwidthGraph.h
index 4de9d22..a1beda2 100644
--- a/src/vidalia/bwgraph/BandwidthGraph.h
+++ b/src/vidalia/bwgraph/BandwidthGraph.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -17,7 +17,7 @@
#define _BWGRAPH_H
#include "ui_BandwidthGraph.h"
-#include "VidaliaWindow.h"
+#include "VidaliaTab.h"
#include "VidaliaSettings.h"
#include "TorControl.h"
@@ -28,17 +28,13 @@
#define REFRESH_RATE 1000
-class BandwidthGraph : public VidaliaWindow
+class BandwidthGraph : public VidaliaTab
{
Q_OBJECT
public:
/** Default constructor */
- BandwidthGraph(QWidget *parent = 0, Qt::WFlags flags = 0);
-
-public slots:
- /** Overloaded QWidget.show */
- void showWindow();
+ BandwidthGraph(QStatusBar *st = 0, QWidget *parent = 0);
protected:
/** Called when the user changes the UI translation. */
@@ -68,6 +64,8 @@ private:
TorControl* _torControl;
/** A VidaliaSettings object that handles getting/saving settings */
VidaliaSettings* _settings;
+
+ QStatusBar *_statusBar;
/** Qt Designer generated object */
Ui::BandwidthGraph ui;
diff --git a/src/vidalia/bwgraph/BandwidthGraph.ui b/src/vidalia/bwgraph/BandwidthGraph.ui
index 173168c..76a5a31 100644
--- a/src/vidalia/bwgraph/BandwidthGraph.ui
+++ b/src/vidalia/bwgraph/BandwidthGraph.ui
@@ -1,323 +1,234 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>BandwidthGraph</class>
- <widget class="QMainWindow" name="BandwidthGraph" >
- <property name="geometry" >
+ <widget class="QWidget" name="BandwidthGraph">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>283</width>
- <height>138</height>
+ <width>588</width>
+ <height>437</height>
</rect>
</property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
+ <property name="windowTitle">
+ <string notr="true"/>
</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>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="GraphFrame" name="frmGraph">
+ <property name="minimumSize">
+ <size>
+ <width>120</width>
+ <height>80</height>
+ </size>
</property>
- <property name="spacing" >
- <number>6</number>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
</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 name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="btnToggleSettings">
+ <property name="text">
+ <string>Show Settings</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>21</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnReset">
+ <property name="text">
+ <string>Reset</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QFrame" name="frmSettings">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>355</width>
+ <height>85</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>82</height>
+ </size>
+ </property>
+ <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" name="_2">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>9</number>
+ </property>
+ <item>
+ <layout class="QVBoxLayout" name="_3">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>3</number>
+ </property>
+ <item>
+ <widget class="QCheckBox" name="chkReceiveRate">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
</property>
- <property name="spacing" >
- <number>3</number>
+ <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" stdset="0">
+ <size>
+ <width>20</width>
+ <height>21</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="_4">
+ <property name="spacing">
+ <number>1</number>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <layout class="QHBoxLayout" name="_5">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>0</number>
</property>
- <item>
- <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 name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
@@ -326,160 +237,264 @@
</spacer>
</item>
<item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
+ <widget class="QLabel" name="lblGraphStyle">
+ <property name="text">
+ <string>Style</string>
</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>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="cmbGraphStyle">
<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>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/graph-line.png</normaloff>:/images/16x16/graph-line.png</iconset>
+ </property>
</item>
<item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>21</width>
- </size>
- </property>
- </spacer>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/graph-area.png</normaloff>:/images/16x16/graph-area.png</iconset>
+ </property>
</item>
- </layout>
+ </widget>
</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" />
+ </item>
+ <item>
+ <widget class="QFrame" name="frmOpacity">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <layout class="QVBoxLayout" name="_6">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QSlider" name="sldrOpacity">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Changes the transparency of the Bandwidth Graph</string>
+ </property>
+ <property name="minimum">
+ <number>30</number>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="value">
+ <number>100</number>
+ </property>
+ <property name="sliderPosition">
+ <number>100</number>
+ </property>
+ <property name="tracking">
+ <bool>false</bool>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="invertedAppearance">
+ <bool>false</bool>
+ </property>
+ <property name="tickPosition">
+ <enum>QSlider::NoTicks</enum>
+ </property>
+ <property name="tickInterval">
+ <number>10</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="_7">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>21</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="lblPercentOpacity">
+ <property name="minimumSize">
+ <size>
+ <width>25</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="text">
+ <string>100</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text">
+ <string>% Opaque</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>21</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <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" stdset="0">
+ <size>
+ <width>21</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="_8">
+ <property name="spacing">
+ <number>1</number>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="btnSaveSettings">
+ <property name="text">
+ <string>Save</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnCancelSettings">
+ <property name="text">
+ <string>Cancel</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
<customwidgets>
<customwidget>
<class>GraphFrame</class>
<extends>QFrame</extends>
<header>bwgraph/GraphFrame.h</header>
+ <container>1</container>
</customwidget>
</customwidgets>
<resources>
- <include location="../res/vidalia_common.qrc" />
+ <include location="../res/vidalia.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/src/vidalia/bwgraph/GraphFrame.cpp b/src/vidalia/bwgraph/GraphFrame.cpp
index 1f182c1..c9537a0 100644
--- a/src/vidalia/bwgraph/GraphFrame.cpp
+++ b/src/vidalia/bwgraph/GraphFrame.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/bwgraph/GraphFrame.h b/src/vidalia/bwgraph/GraphFrame.h
index 17367ba..4819396 100644
--- a/src/vidalia/bwgraph/GraphFrame.h
+++ b/src/vidalia/bwgraph/GraphFrame.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/AbstractTorSettings.cpp b/src/vidalia/config/AbstractTorSettings.cpp
index 462eef7..5f1b8aa 100644
--- a/src/vidalia/config/AbstractTorSettings.cpp
+++ b/src/vidalia/config/AbstractTorSettings.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/AbstractTorSettings.h b/src/vidalia/config/AbstractTorSettings.h
index 15770ef..4c5d1b7 100644
--- a/src/vidalia/config/AbstractTorSettings.h
+++ b/src/vidalia/config/AbstractTorSettings.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/AdvancedPage.cpp b/src/vidalia/config/AdvancedPage.cpp
index 94c0308..1fda8ad 100644
--- a/src/vidalia/config/AdvancedPage.cpp
+++ b/src/vidalia/config/AdvancedPage.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -165,7 +165,8 @@ AdvancedPage::save(QString &errmsg)
/* Only remember the torrc and datadir values if Vidalia started Tor, or
* if the user changed the displayed values. */
- if (Vidalia::torControl()->isVidaliaRunningTor()) {
+ if (Vidalia::torControl()->isVidaliaRunningTor() or
+ not Vidalia::torControl()->isRunning()) {
QString torrc = ui.lineTorConfig->text();
if (torrc != _settings->getTorrc()) {
_settings->setTorrc(torrc);
diff --git a/src/vidalia/config/AdvancedPage.h b/src/vidalia/config/AdvancedPage.h
index de64cbe..4ba26cc 100644
--- a/src/vidalia/config/AdvancedPage.h
+++ b/src/vidalia/config/AdvancedPage.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/AppearancePage.cpp b/src/vidalia/config/AppearancePage.cpp
index b4a3099..11939c3 100644
--- a/src/vidalia/config/AppearancePage.cpp
+++ b/src/vidalia/config/AppearancePage.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/AppearancePage.h b/src/vidalia/config/AppearancePage.h
index b7262a3..9dd94af 100644
--- a/src/vidalia/config/AppearancePage.h
+++ b/src/vidalia/config/AppearancePage.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/BridgeDownloader.cpp b/src/vidalia/config/BridgeDownloader.cpp
index d70034d..49c08a3 100644
--- a/src/vidalia/config/BridgeDownloader.cpp
+++ b/src/vidalia/config/BridgeDownloader.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -16,34 +16,25 @@
#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)
+ : QObject(parent)
{
- _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>)));
+ _https = new QNetworkAccessManager();
+
+ connect(_https, SIGNAL(finished(QNetworkReply *)),
+ this, SLOT(httpsRequestFinished(QNetworkReply *)));
+ connect(_https, SIGNAL(sslErrors(QNetworkReply *, QList<QSslError>)),
+ this, SLOT(sslErrors(QNetworkReply *, QList<QSslError>)));
}
void
BridgeDownloader::setProxy(const QString &host, int port,
const QString &username, const QString &password)
{
- _https->setProxy(host, port, username, password);
+ _https->setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, host, port, username, password));
}
bool
@@ -82,16 +73,18 @@ 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);
+ _reply = _https->get(QNetworkRequest(QUrl("https://bridges.torproject.org/?format=plain")));
+ connect(_reply, SIGNAL(downloadProgress(qint64, qint64)),
+ this, SIGNAL(downloadProgress(qint64, qint64)));
+ vInfo("Sending an HTTPS bridge request to %1:%2.").arg(BRIDGEDB_HOST)
+ .arg(BRIDGEDB_PORT);
}
void
BridgeDownloader::cancelBridgeRequest()
{
- _https->abort();
+ _reply->close();
+ disconnect(_reply, 0, 0, 0);
}
void
@@ -117,20 +110,16 @@ BridgeDownloader::httpsStateChanged(int state)
}
void
-BridgeDownloader::httpsRequestFinished(int id, bool error)
+BridgeDownloader::httpsRequestFinished(QNetworkReply *reply)
{
- if (id != _requestId)
- return;
-
- if (error) {
- QString errorString = _https->errorString();
- vWarn("Bridge request failed (id %1): %2").arg(id).arg(errorString);
+ if (reply->error() != QNetworkReply::NoError) {
+ QString errorString = reply->errorString();
+ vWarn("Bridge request failed: %2").arg(errorString);
emit bridgeRequestFailed(errorString);
} else {
- QByteArray response = _https->readAll();
- vInfo("Bridge request complete (id %1): received %2 bytes.").arg(id)
- .arg(response.size());
+ QByteArray response = reply->readAll();
+ vInfo("Bridge request complete: received %2 bytes.").arg(response.size());
QStringList bridges, lines = QString(response).split("\n");
foreach (QString line, lines) {
@@ -140,22 +129,21 @@ BridgeDownloader::httpsRequestFinished(int id, bool error)
}
emit bridgeRequestFinished(bridges);
}
- _https->close();
+ _reply->close();
+ disconnect(_reply,0,0,0);
}
void
-BridgeDownloader::sslErrors(const QList<QSslError> &sslErrors)
+BridgeDownloader::sslErrors(QNetworkReply *reply, const QList<QSslError> &sslErrors)
{
QString errorString;
QStringList errorStrings;
- vWarn("%1 SSL error(s) when requesting bridge information (id %2):")
- .arg(sslErrors.size())
- .arg(_requestId);
+ vWarn("%1 SSL error(s) when requesting bridge information:")
+ .arg(sslErrors.size());
foreach (QSslError sslError, sslErrors) {
errorString = sslError.errorString();
errorStrings << errorString;
vWarn(" SSL Error: %1").arg(errorString);
}
}
-
diff --git a/src/vidalia/config/BridgeDownloader.h b/src/vidalia/config/BridgeDownloader.h
index 0cb87f4..ef2d0ec 100644
--- a/src/vidalia/config/BridgeDownloader.h
+++ b/src/vidalia/config/BridgeDownloader.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -16,10 +16,7 @@
#ifndef _BRIDGEDOWNLOADER_H
#define _BRIDGEDOWNLOADER_H
-#include <QHttp>
-#include <QSslError>
-#include <QStringList>
-
+#include <QtNetwork>
class BridgeDownloader : public QObject
{
@@ -65,7 +62,7 @@ signals:
* 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);
+ void downloadProgress(qint64 done, qint64 total);
/** Emitted when the status of the bridge request changes. <b>status</b>
* describes the new current state of the request.
@@ -98,14 +95,14 @@ private slots:
* signal is ignored since it is the result of a close() or abort()
* request.
*/
- void httpsRequestFinished(int id, bool error);
+ void httpsRequestFinished(QNetworkReply *reply);
/** 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);
+ void sslErrors(QNetworkReply *, const QList<QSslError> &sslErrors);
private:
/** Initiates an HTTPS connection to bridges.torproject.org to start
@@ -115,10 +112,10 @@ private:
/** Used to connect to the bridge database, send an HTTPS request for
* new bridge addresses and then read the response. */
- QHttp* _https;
+ QNetworkAccessManager* _https;
- /** Unique numeric identifier of the current bridge request. */
- int _requestId;
+ /** Identifier of the current bridge request */
+ QNetworkReply *_reply;
};
#endif
diff --git a/src/vidalia/config/BridgeDownloaderProgressDialog.cpp b/src/vidalia/config/BridgeDownloaderProgressDialog.cpp
index b4d8e28..8e2fb13 100644
--- a/src/vidalia/config/BridgeDownloaderProgressDialog.cpp
+++ b/src/vidalia/config/BridgeDownloaderProgressDialog.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -46,7 +46,7 @@ BridgeDownloaderProgressDialog::setStatus(const QString &status)
}
void
-BridgeDownloaderProgressDialog::setDownloadProgress(int done, int total)
+BridgeDownloaderProgressDialog::setDownloadProgress(qint64 done, qint64 total)
{
ui.progressBar->setRange(0, total);
ui.progressBar->setValue(done);
diff --git a/src/vidalia/config/BridgeDownloaderProgressDialog.h b/src/vidalia/config/BridgeDownloaderProgressDialog.h
index 86fb0d3..280d8c1 100644
--- a/src/vidalia/config/BridgeDownloaderProgressDialog.h
+++ b/src/vidalia/config/BridgeDownloaderProgressDialog.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -39,7 +39,7 @@ public slots:
* <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);
+ void setDownloadProgress(qint64 value, qint64 maximum);
/** Called when the bridge download completes successfully and discards
* the progress dialog with an Accept result code. <b>bridges</b>
diff --git a/src/vidalia/config/BridgeUsageDialog.cpp b/src/vidalia/config/BridgeUsageDialog.cpp
index a120fe1..ce29d3f 100644
--- a/src/vidalia/config/BridgeUsageDialog.cpp
+++ b/src/vidalia/config/BridgeUsageDialog.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/BridgeUsageDialog.h b/src/vidalia/config/BridgeUsageDialog.h
index 5177254..0f82de5 100644
--- a/src/vidalia/config/BridgeUsageDialog.h
+++ b/src/vidalia/config/BridgeUsageDialog.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/BridgeUsageDialog.ui b/src/vidalia/config/BridgeUsageDialog.ui
index 66ef1df..e3c0056 100644
--- a/src/vidalia/config/BridgeUsageDialog.ui
+++ b/src/vidalia/config/BridgeUsageDialog.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>BridgeUsageDialog</class>
- <widget class="QDialog" name="BridgeUsageDialog" >
- <property name="geometry" >
+ <widget class="QDialog" name="BridgeUsageDialog">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,49 +10,53 @@
<height>408</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Bridge Usage Summary</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2" >
+ <property name="windowIcon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/128x128/tor-logo.png</normaloff>:/images/128x128/tor-logo.png</iconset>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <widget class="QGroupBox" name="groupBox" >
- <property name="title" >
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
<string>Client Summary</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout" >
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QLabel" name="lblClientSummary" >
- <property name="text" >
- <string></string>
+ <widget class="QLabel" name="lblClientSummary">
+ <property name="text">
+ <string/>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="QTreeWidget" name="treeClientSummary" >
- <property name="alternatingRowColors" >
+ <widget class="QTreeWidget" name="treeClientSummary">
+ <property name="alternatingRowColors">
<bool>false</bool>
</property>
- <property name="sortingEnabled" >
+ <property name="sortingEnabled">
<bool>true</bool>
</property>
<column>
- <property name="text" >
- <string></string>
+ <property name="text">
+ <string/>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>Country</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string># Clients</string>
</property>
</column>
@@ -61,18 +66,20 @@
</widget>
</item>
<item>
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="standardButtons" >
+ <property name="standardButtons">
<set>QDialogButtonBox::Close</set>
</property>
</widget>
</item>
</layout>
</widget>
- <resources/>
+ <resources>
+ <include location="../res/vidalia.qrc"/>
+ </resources>
<connections>
<connection>
<sender>buttonBox</sender>
@@ -80,11 +87,11 @@
<receiver>BridgeUsageDialog</receiver>
<slot>accept()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
@@ -96,11 +103,11 @@
<receiver>BridgeUsageDialog</receiver>
<slot>reject()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
diff --git a/src/vidalia/config/ConfigDialog.cpp b/src/vidalia/config/ConfigDialog.cpp
index d147ab8..bb711dc 100644
--- a/src/vidalia/config/ConfigDialog.cpp
+++ b/src/vidalia/config/ConfigDialog.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/ConfigDialog.h b/src/vidalia/config/ConfigDialog.h
index 1362038..fe63954 100644
--- a/src/vidalia/config/ConfigDialog.h
+++ b/src/vidalia/config/ConfigDialog.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -33,9 +33,9 @@ public:
General = 0, /** General configuration page. */
Network, /** Network configuration page. */
Server, /** Server configuration page. */
+ Service, /** Service Configuration page */
Appearance, /** Appearance configuration page. */
- Advanced, /** Advanced configuration page. */
- Service /** Service Configuration page */
+ Advanced /** Advanced configuration page. */
};
/** Default Constructor */
diff --git a/src/vidalia/config/ConfigPage.h b/src/vidalia/config/ConfigPage.h
index 1e8eea8..2a237c1 100644
--- a/src/vidalia/config/ConfigPage.h
+++ b/src/vidalia/config/ConfigPage.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/ConfigPageStack.cpp b/src/vidalia/config/ConfigPageStack.cpp
index c8302c5..d7bd5c6 100644
--- a/src/vidalia/config/ConfigPageStack.cpp
+++ b/src/vidalia/config/ConfigPageStack.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/ConfigPageStack.h b/src/vidalia/config/ConfigPageStack.h
index 00af77b..377bfd2 100644
--- a/src/vidalia/config/ConfigPageStack.h
+++ b/src/vidalia/config/ConfigPageStack.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/DomainValidator.cpp b/src/vidalia/config/DomainValidator.cpp
index 2ee67cb..ff16e0d 100644
--- a/src/vidalia/config/DomainValidator.cpp
+++ b/src/vidalia/config/DomainValidator.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/DomainValidator.h b/src/vidalia/config/DomainValidator.h
index 996f7f4..8b06880 100644
--- a/src/vidalia/config/DomainValidator.h
+++ b/src/vidalia/config/DomainValidator.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/ExitPolicy.cpp b/src/vidalia/config/ExitPolicy.cpp
index 831b4d8..467ed27 100644
--- a/src/vidalia/config/ExitPolicy.cpp
+++ b/src/vidalia/config/ExitPolicy.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/ExitPolicy.h b/src/vidalia/config/ExitPolicy.h
index 80f8e88..420cccb 100644
--- a/src/vidalia/config/ExitPolicy.h
+++ b/src/vidalia/config/ExitPolicy.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/GeneralPage.cpp b/src/vidalia/config/GeneralPage.cpp
index eef0d90..0faca19 100644
--- a/src/vidalia/config/GeneralPage.cpp
+++ b/src/vidalia/config/GeneralPage.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/GeneralPage.h b/src/vidalia/config/GeneralPage.h
index ac43f71..44077e1 100644
--- a/src/vidalia/config/GeneralPage.h
+++ b/src/vidalia/config/GeneralPage.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/GeneralPage.ui b/src/vidalia/config/GeneralPage.ui
index 80cc819..8aa494b 100644
--- a/src/vidalia/config/GeneralPage.ui
+++ b/src/vidalia/config/GeneralPage.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>GeneralPage</class>
- <widget class="QWidget" name="GeneralPage" >
- <property name="geometry" >
+ <widget class="QWidget" name="GeneralPage">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,63 +10,63 @@
<height>402</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="contextMenuPolicy" >
+ <property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
- <layout class="QVBoxLayout" >
- <property name="spacing" >
+ <layout class="QVBoxLayout">
+ <property name="spacing">
<number>6</number>
</property>
<item>
- <widget class="QCheckBox" name="chkRunVidaliaAtSystemStartup" >
- <property name="text" >
+ <widget class="QCheckBox" name="chkRunVidaliaAtSystemStartup">
+ <property name="text">
<string>Start Vidalia when my system starts</string>
</property>
</widget>
</item>
<item>
- <widget class="Line" name="lineHorizontalSeparator" >
- <property name="orientation" >
+ <widget class="Line" name="lineHorizontalSeparator">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
- <widget class="QGroupBox" name="grpTorLocation" >
- <property name="minimumSize" >
+ <widget class="QGroupBox" name="grpTorLocation">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="contextMenuPolicy" >
+ <property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
- <property name="title" >
+ <property name="title">
<string>Tor</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout" >
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QCheckBox" name="chkRunTorAtVidaliaStartup" >
- <property name="text" >
- <string>Start the Tor software when Vidalia starts</string>
+ <widget class="QCheckBox" name="chkRunTorAtVidaliaStartup">
+ <property name="text">
+ <string>Connect to Tor automatically</string>
</property>
</widget>
</item>
<item>
- <layout class="QHBoxLayout" >
+ <layout class="QHBoxLayout">
<item>
- <widget class="QLineEdit" name="lineTorExecutable" />
+ <widget class="QLineEdit" name="lineTorExecutable"/>
</item>
<item>
- <widget class="QPushButton" name="btnBrowseTorExecutable" >
- <property name="text" >
+ <widget class="QPushButton" name="btnBrowseTorExecutable">
+ <property name="text">
<string>Browse</string>
</property>
</widget>
@@ -76,48 +77,48 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="grpProxyExecutable" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <widget class="QGroupBox" name="grpProxyExecutable">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="title" >
+ <property name="title">
<string>Proxy Application (optional)</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2" >
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <widget class="QCheckBox" name="chkRunProxyAtTorStartup" >
- <property name="text" >
+ <widget class="QCheckBox" name="chkRunProxyAtTorStartup">
+ <property name="text">
<string>Start a proxy application when Tor starts</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <layout class="QHBoxLayout" >
+ <layout class="QHBoxLayout">
<item>
- <widget class="QLineEdit" name="lineProxyExecutable" >
- <property name="enabled" >
+ <widget class="QLineEdit" name="lineProxyExecutable">
+ <property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="btnBrowseProxyExecutable" >
- <property name="enabled" >
+ <widget class="QPushButton" name="btnBrowseProxyExecutable">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="text" >
+ <property name="text">
<string>Browse</string>
</property>
</widget>
@@ -125,13 +126,13 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" >
+ <layout class="QHBoxLayout">
<item>
- <widget class="QLabel" name="lblProxyExecutableArguments" >
- <property name="enabled" >
+ <widget class="QLabel" name="lblProxyExecutableArguments">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="text" >
+ <property name="text">
<string>Proxy Application Arguments:</string>
</property>
</widget>
@@ -139,8 +140,8 @@
</layout>
</item>
<item>
- <widget class="QLineEdit" name="lineProxyExecutableArguments" >
- <property name="enabled" >
+ <widget class="QLineEdit" name="lineProxyExecutableArguments">
+ <property name="enabled">
<bool>true</bool>
</property>
</widget>
@@ -149,21 +150,21 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="grpSoftwareUpdates" >
- <property name="title" >
+ <widget class="QGroupBox" name="grpSoftwareUpdates">
+ <property name="title">
<string>Software Updates</string>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout" >
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QCheckBox" name="chkAutoUpdates" >
- <property name="text" >
+ <widget class="QCheckBox" name="chkAutoUpdates">
+ <property name="text">
<string>Check for new software updates automatically</string>
</property>
</widget>
</item>
<item>
- <spacer name="horizontalSpacer_2" >
- <property name="orientation" >
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
@@ -188,8 +189,8 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="btnUpdateNow" >
- <property name="text" >
+ <widget class="QPushButton" name="btnUpdateNow">
+ <property name="text">
<string>Check Now</string>
</property>
</widget>
diff --git a/src/vidalia/config/IpValidator.cpp b/src/vidalia/config/IpValidator.cpp
index 87594f9..839caa8 100644
--- a/src/vidalia/config/IpValidator.cpp
+++ b/src/vidalia/config/IpValidator.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/IpValidator.h b/src/vidalia/config/IpValidator.h
index d757eb9..b52c134 100644
--- a/src/vidalia/config/IpValidator.h
+++ b/src/vidalia/config/IpValidator.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/Local8BitStringValidator.cpp b/src/vidalia/config/Local8BitStringValidator.cpp
index 7d1e0dc..ac960e2 100644
--- a/src/vidalia/config/Local8BitStringValidator.cpp
+++ b/src/vidalia/config/Local8BitStringValidator.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/Local8BitStringValidator.h b/src/vidalia/config/Local8BitStringValidator.h
index ee796aa..ee07703 100644
--- a/src/vidalia/config/Local8BitStringValidator.h
+++ b/src/vidalia/config/Local8BitStringValidator.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp
index f5bbc72..0fa33ca 100644
--- a/src/vidalia/config/NetworkPage.cpp
+++ b/src/vidalia/config/NetworkPage.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -389,8 +389,8 @@ NetworkPage::findBridges()
connect(_bridgeDownloader, SIGNAL(statusChanged(QString)),
dlg, SLOT(setStatus(QString)));
- connect(_bridgeDownloader, SIGNAL(downloadProgress(int, int)),
- dlg, SLOT(setDownloadProgress(int, int)));
+ connect(_bridgeDownloader, SIGNAL(downloadProgress(qint64, qint64)),
+ dlg, SLOT(setDownloadProgress(qint64, qint64)));
connect(_bridgeDownloader, SIGNAL(bridgeRequestFailed(QString)),
dlg, SLOT(bridgeRequestFailed(QString)));
connect(_bridgeDownloader, SIGNAL(bridgeRequestFinished(QStringList)),
diff --git a/src/vidalia/config/NetworkPage.h b/src/vidalia/config/NetworkPage.h
index 04b06ab..c198573 100644
--- a/src/vidalia/config/NetworkPage.h
+++ b/src/vidalia/config/NetworkPage.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/NetworkSettings.cpp b/src/vidalia/config/NetworkSettings.cpp
index ff2e7d3..de818f4 100644
--- a/src/vidalia/config/NetworkSettings.cpp
+++ b/src/vidalia/config/NetworkSettings.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/NetworkSettings.h b/src/vidalia/config/NetworkSettings.h
index e610224..fe555e3 100644
--- a/src/vidalia/config/NetworkSettings.h
+++ b/src/vidalia/config/NetworkSettings.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/NicknameValidator.cpp b/src/vidalia/config/NicknameValidator.cpp
index e960481..76a9aed 100644
--- a/src/vidalia/config/NicknameValidator.cpp
+++ b/src/vidalia/config/NicknameValidator.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/NicknameValidator.h b/src/vidalia/config/NicknameValidator.h
index c8192e5..ca6c562 100644
--- a/src/vidalia/config/NicknameValidator.h
+++ b/src/vidalia/config/NicknameValidator.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/Policy.cpp b/src/vidalia/config/Policy.cpp
index 0c73e04..94579fd 100644
--- a/src/vidalia/config/Policy.cpp
+++ b/src/vidalia/config/Policy.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/Policy.h b/src/vidalia/config/Policy.h
index 28f5871..2d73533 100644
--- a/src/vidalia/config/Policy.h
+++ b/src/vidalia/config/Policy.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/PortValidator.cpp b/src/vidalia/config/PortValidator.cpp
index c328963..b5f4e2b 100644
--- a/src/vidalia/config/PortValidator.cpp
+++ b/src/vidalia/config/PortValidator.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/PortValidator.h b/src/vidalia/config/PortValidator.h
index 062ed7b..1e4aa4d 100644
--- a/src/vidalia/config/PortValidator.h
+++ b/src/vidalia/config/PortValidator.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/ServerPage.cpp b/src/vidalia/config/ServerPage.cpp
index d42fb70..f15268f 100644
--- a/src/vidalia/config/ServerPage.cpp
+++ b/src/vidalia/config/ServerPage.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -89,6 +89,8 @@ ServerPage::ServerPage(QWidget *parent)
this, SLOT(customRateChanged()));
connect(ui.rdoClientMode, SIGNAL(toggled(bool)),
this, SLOT(serverModeChanged(bool)));
+ connect(ui.rdoNonExitMode, SIGNAL(toggled(bool)),
+ this, SLOT(serverModeChanged(bool)));
connect(ui.rdoServerMode, SIGNAL(toggled(bool)),
this, SLOT(serverModeChanged(bool)));
connect(ui.rdoBridgeMode, SIGNAL(toggled(bool)),
@@ -217,13 +219,12 @@ ServerPage::serverModeChanged(bool enabled)
{
Q_UNUSED(enabled);
bool bridgeEnabled = ui.rdoBridgeMode->isChecked();
+ bool relayEnabled = ui.rdoServerMode->isChecked() ||
+ ui.rdoNonExitMode->isChecked();
/* Show the tab menu only if the user is running a normal relay or a bridge
* relay. */
- ui.tabsMenu->setVisible(ui.rdoServerMode->isChecked() || bridgeEnabled);
-
- /* Disable the Exit Policies tab when bridge relay mode is selected */
- ui.tabsMenu->setTabEnabled(2, !bridgeEnabled);
+ ui.tabsMenu->setVisible(relayEnabled || bridgeEnabled);
/* Display the widgets that show the user their bridge identity if bridge
* relay mode is selected. */
@@ -236,6 +237,10 @@ ServerPage::serverModeChanged(bool enabled)
ui.lineDirPort->setEnabled(!bridgeEnabled);
ui.chkMirrorDirectory->setEnabled(!bridgeEnabled);
+
+ /* Disable the Exit Policies tab when bridge or non-exit relay mode is
+ * selected */
+ ui.tabsMenu->setTabEnabled(2, !bridgeEnabled and !ui.rdoNonExitMode->isChecked());
}
/** Returns true if the user has changed their server settings since the
@@ -270,7 +275,9 @@ ServerPage::save(QString &errmsg)
/* Force the bandwidth rate limits to validate */
customRateChanged();
- if (ui.rdoServerMode->isChecked() || ui.rdoBridgeMode->isChecked()) {
+ if (ui.rdoServerMode->isChecked() ||
+ ui.rdoNonExitMode->isChecked() ||
+ ui.rdoBridgeMode->isChecked()) {
/* A server must have an ORPort and a nickname */
if (ui.lineServerPort->text().isEmpty() ||
ui.lineServerNickname->text().isEmpty()) {
@@ -289,7 +296,9 @@ ServerPage::save(QString &errmsg)
/* "Server" is enabled whether we're a bridge or normal relay. "Bridge" is
* only enabled if we're a bridge (obviously). */
_settings->setServerEnabled(ui.rdoServerMode->isChecked()
+ || ui.rdoNonExitMode->isChecked()
|| ui.rdoBridgeMode->isChecked());
+ _settings->setNonExitEnabled(ui.rdoNonExitMode->isChecked());
_settings->setBridgeEnabled(ui.rdoBridgeMode->isChecked());
if (ui.rdoBridgeMode->isChecked())
_settings->setPublishServerDescriptor(ui.chkPublishBridgeAddress->isChecked());
@@ -320,6 +329,8 @@ ServerPage::load()
{
if (_settings->isBridgeEnabled())
ui.rdoBridgeMode->setChecked(true);
+ else if (_settings->isNonExitEnabled())
+ ui.rdoNonExitMode->setChecked(true);
else if (_settings->isServerEnabled())
ui.rdoServerMode->setChecked(true);
else
@@ -460,41 +471,46 @@ ServerPage::loadExitPolicies()
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));
+ ExitPolicy *exitPolicy;
+ if(ui.rdoNonExitMode->isChecked()) {
+ exitPolicy = new ExitPolicy(ExitPolicy::Middleman);
+ } else {
+ exitPolicy = new ExitPolicy();
+ bool rejectUnchecked = ui.chkMisc->isChecked();
+
+ /* If misc is checked, then reject unchecked items and leave the default exit
+ * policy alone. Else, accept only checked items and end with reject *:*,
+ * replacing the default exit policy. */
+ if (ui.chkWebsites->isChecked() && !rejectUnchecked) {
+ exitPolicy->addAcceptedPorts(PORTS_HTTP);
+ } else if (!ui.chkWebsites->isChecked() && rejectUnchecked) {
+ exitPolicy->addRejectedPorts(PORTS_HTTP);
+ }
+ if (ui.chkSecWebsites->isChecked() && !rejectUnchecked) {
+ exitPolicy->addAcceptedPorts(PORTS_HTTPS);
+ } else if (!ui.chkSecWebsites->isChecked() && rejectUnchecked) {
+ exitPolicy->addRejectedPorts(PORTS_HTTPS);
+ }
+ if (ui.chkMail->isChecked() && !rejectUnchecked) {
+ exitPolicy->addAcceptedPorts(PORTS_MAIL);
+ } else if (!ui.chkMail->isChecked() && rejectUnchecked) {
+ exitPolicy->addRejectedPorts(PORTS_MAIL);
+ }
+ if (ui.chkIRC->isChecked() && !rejectUnchecked) {
+ exitPolicy->addAcceptedPorts(PORTS_IRC);
+ } else if (!ui.chkIRC->isChecked() && rejectUnchecked) {
+ exitPolicy->addRejectedPorts(PORTS_IRC);
+ }
+ if (ui.chkIM->isChecked() && !rejectUnchecked) {
+ exitPolicy->addAcceptedPorts(PORTS_IM);
+ } else if (!ui.chkIM->isChecked() && rejectUnchecked) {
+ exitPolicy->addRejectedPorts(PORTS_IM);
+ }
+ if (!ui.chkMisc->isChecked()) {
+ exitPolicy->addPolicy(Policy(Policy::RejectAll));
+ }
}
- _settings->setExitPolicy(exitPolicy);
+ _settings->setExitPolicy(*exitPolicy);
}
/** Called when the user selects a new value from the rate combo box. */
diff --git a/src/vidalia/config/ServerPage.h b/src/vidalia/config/ServerPage.h
index d40e605..03e4938 100644
--- a/src/vidalia/config/ServerPage.h
+++ b/src/vidalia/config/ServerPage.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/ServerPage.ui b/src/vidalia/config/ServerPage.ui
index 6584058..c922710 100644
--- a/src/vidalia/config/ServerPage.ui
+++ b/src/vidalia/config/ServerPage.ui
@@ -22,9 +22,16 @@
</widget>
</item>
<item>
+ <widget class="QRadioButton" name="rdoNonExitMode">
+ <property name="text">
+ <string>Relay traffic inside the Tor network (non-exit relay)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QRadioButton" name="rdoServerMode">
<property name="text">
- <string>Relay traffic for the Tor network</string>
+ <string>Relay traffic for the Tor network (exit relay)</string>
</property>
</widget>
</item>
diff --git a/src/vidalia/config/ServerSettings.cpp b/src/vidalia/config/ServerSettings.cpp
index 22de6d6..76e3361 100644
--- a/src/vidalia/config/ServerSettings.cpp
+++ b/src/vidalia/config/ServerSettings.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -43,6 +43,7 @@
#define SETTING_BANDWIDTH_RATE "BandwidthRate"
#define SETTING_BANDWIDTH_BURST "BandwidthBurst"
#define SETTING_BRIDGE_RELAY "BridgeRelay"
+#define SETTING_NONEXIT_RELAY "NonExitRelay"
#define SETTING_ENABLE_UPNP "EnableUPnP"
#define SETTING_RELAY_BANDWIDTH_RATE "RelayBandwidthRate"
#define SETTING_RELAY_BANDWIDTH_BURST "RelayBandwidthBurst"
@@ -71,7 +72,7 @@ ServerSettings::ServerSettings(TorControl *torControl)
setDefault(SETTING_BANDWIDTH_BURST, 10485760);
setDefault(SETTING_RELAY_BANDWIDTH_BURST, 10485760);
setDefault(SETTING_EXITPOLICY,
- ExitPolicy(ExitPolicy::Default).toString());
+ ExitPolicy(ExitPolicy::Middleman).toString());
setDefault(SETTING_ENABLE_UPNP, false);
setDefault(SETTING_BRIDGE_RELAY, false);
setDefault(SETTING_PUBLISH_SERVER_DESCRIPTOR, "1");
@@ -258,6 +259,21 @@ ServerSettings::isBridgeEnabled()
return value(SETTING_BRIDGE_RELAY).toBool() && isServerEnabled();
}
+/** Sets to <b>enabled</b> whether Tor should be a non-exit node when acting as
+ * a server. */
+void
+ServerSettings::setNonExitEnabled(bool enabled)
+{
+ setValue(SETTING_NONEXIT_RELAY, enabled);
+}
+
+/** Returns true if Tor is configured to act as a non-exit node. */
+bool
+ServerSettings::isNonExitEnabled()
+{
+ return value(SETTING_NONEXIT_RELAY).toBool() && isServerEnabled();
+}
+
/** Sets the server's ORPort. */
void
ServerSettings::setORPort(quint16 orPort)
diff --git a/src/vidalia/config/ServerSettings.h b/src/vidalia/config/ServerSettings.h
index 79a5db9..9479c5a 100644
--- a/src/vidalia/config/ServerSettings.h
+++ b/src/vidalia/config/ServerSettings.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -42,6 +42,12 @@ public:
/** Returns true if Tor is configured to act as a bridge node. */
bool isBridgeEnabled();
+ /** Sets to <b>enabled</b> whether Tor should be a non-exit node when acting
+ * as a server. */
+ void setNonExitEnabled(bool enable);
+ /** Returns true if Tor is configured to act as a non-exit node. */
+ bool isNonExitEnabled();
+
/** Sets the server's ORPort value. */
void setORPort(quint16 orPort);
/** Gets the server's ORPort value. */
diff --git a/src/vidalia/config/Service.cpp b/src/vidalia/config/Service.cpp
index 3e9b7f8..c880529 100644
--- a/src/vidalia/config/Service.cpp
+++ b/src/vidalia/config/Service.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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"
diff --git a/src/vidalia/config/Service.h b/src/vidalia/config/Service.h
index 8218774..6c6a790 100644
--- a/src/vidalia/config/Service.h
+++ b/src/vidalia/config/Service.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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
diff --git a/src/vidalia/config/ServiceList.cpp b/src/vidalia/config/ServiceList.cpp
index 7ce8c24..fd644f0 100644
--- a/src/vidalia/config/ServiceList.cpp
+++ b/src/vidalia/config/ServiceList.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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"
diff --git a/src/vidalia/config/ServiceList.h b/src/vidalia/config/ServiceList.h
index fb35f9c..a5c216d 100644
--- a/src/vidalia/config/ServiceList.h
+++ b/src/vidalia/config/ServiceList.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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
diff --git a/src/vidalia/config/ServicePage.cpp b/src/vidalia/config/ServicePage.cpp
index 91c29da..ac412f9 100644
--- a/src/vidalia/config/ServicePage.cpp
+++ b/src/vidalia/config/ServicePage.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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"
diff --git a/src/vidalia/config/ServicePage.h b/src/vidalia/config/ServicePage.h
index bdb0c51..622673f 100644
--- a/src/vidalia/config/ServicePage.h
+++ b/src/vidalia/config/ServicePage.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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
@@ -16,7 +16,6 @@
#include "TorSettings.h"
#include "ServiceSettings.h"
#include "ExitPolicy.h"
-#include "HelpBrowser.h"
#include "TorControl.h"
diff --git a/src/vidalia/config/ServicePage.ui b/src/vidalia/config/ServicePage.ui
index 8be3a59..8fc6c57 100644
--- a/src/vidalia/config/ServicePage.ui
+++ b/src/vidalia/config/ServicePage.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>ServicePage</class>
- <widget class="QWidget" name="ServicePage" >
- <property name="geometry" >
+ <widget class="QWidget" name="ServicePage">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,133 +10,137 @@
<height>400</height>
</rect>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>600</width>
<height>400</height>
</size>
</property>
- <property name="windowTitle" >
- <string>Form</string>
+ <property name="windowTitle">
+ <string notr="true"/>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <widget class="QGroupBox" name="groupBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <widget class="QGroupBox" name="groupBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title" >
+ <property name="title">
<string>Provided Hidden Services</string>
</property>
- <layout class="QGridLayout" >
- <item rowspan="5" row="0" column="0" >
- <widget class="QTableWidget" name="serviceWidget" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <layout class="QGridLayout">
+ <item row="0" column="0" rowspan="5">
+ <widget class="QTableWidget" name="serviceWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="selectionMode" >
+ <property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
- <property name="selectionBehavior" >
+ <property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
- <property name="textElideMode" >
+ <property name="textElideMode">
<enum>Qt::ElideLeft</enum>
</property>
- <property name="showGrid" >
+ <property name="showGrid">
<bool>true</bool>
</property>
<column>
- <property name="text" >
+ <property name="text">
<string>Onion Address</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>Virtual Port</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>Target</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>Directory Path</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>Enabled</string>
</property>
</column>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QToolButton" name="addButton" >
- <property name="toolTip" >
+ <item row="0" column="1">
+ <widget class="QToolButton" name="addButton">
+ <property name="toolTip">
<string>Add new service to list</string>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/22x22/list-add.png</iconset>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/list-add.png</normaloff>:/images/22x22/list-add.png</iconset>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QToolButton" name="removeButton" >
- <property name="toolTip" >
+ <item row="1" column="1">
+ <widget class="QToolButton" name="removeButton">
+ <property name="toolTip">
<string>Remove selected service from list</string>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/22x22/list-remove.png</iconset>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/list-remove.png</normaloff>:/images/22x22/list-remove.png</iconset>
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QToolButton" name="copyButton" >
- <property name="toolTip" >
+ <item row="2" column="1">
+ <widget class="QToolButton" name="copyButton">
+ <property name="toolTip">
<string>Copy onion address of selected service to clipboard</string>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/22x22/edit-copy.png</iconset>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/edit-copy.png</normaloff>:/images/22x22/edit-copy.png</iconset>
</property>
</widget>
</item>
- <item row="3" column="1" >
- <widget class="QToolButton" name="browseButton" >
- <property name="toolTip" >
+ <item row="3" column="1">
+ <widget class="QToolButton" name="browseButton">
+ <property name="toolTip">
<string>Browse in local file system and choose directory for selected service</string>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/22x22/folder.png</iconset>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/folder.png</normaloff>:/images/22x22/folder.png</iconset>
</property>
</widget>
</item>
- <item row="4" column="1" >
+ <item row="4" column="1">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>21</width>
<height>46</height>
@@ -148,10 +153,10 @@
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>141</height>
@@ -161,6 +166,8 @@
</item>
</layout>
</widget>
- <resources/>
+ <resources>
+ <include location="../res/vidalia.qrc"/>
+ </resources>
<connections/>
</ui>
diff --git a/src/vidalia/config/ServiceSettings.cpp b/src/vidalia/config/ServiceSettings.cpp
index d74ab43..3c6fa91 100644
--- a/src/vidalia/config/ServiceSettings.cpp
+++ b/src/vidalia/config/ServiceSettings.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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"
diff --git a/src/vidalia/config/ServiceSettings.h b/src/vidalia/config/ServiceSettings.h
index dc2d677..946dc62 100644
--- a/src/vidalia/config/ServiceSettings.h
+++ b/src/vidalia/config/ServiceSettings.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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
diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp
index 046ff72..b05b428 100644
--- a/src/vidalia/config/TorSettings.cpp
+++ b/src/vidalia/config/TorSettings.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -42,6 +42,8 @@
#define SETTING_USE_RANDOM_PASSWORD "UseRandomPassword"
#define SETTING_WARN_PLAINTEXT_PORTS "WarnPlaintextPorts"
#define SETTING_REJECT_PLAINTEXT_PORTS "RejectPlaintextPorts"
+#define SETTING_BOOTSTRAP "Bootstrap"
+#define SETTING_BOOTSTRAP_FROM "BootstrapFrom"
/** Default to using hashed password authentication */
#define DEFAULT_AUTH_METHOD PasswordAuth
@@ -88,6 +90,8 @@ TorSettings::TorSettings(TorControl *torControl)
setDefault(SETTING_WARN_PLAINTEXT_PORTS, QList<QVariant>() << 23 << 109
<< 110 << 143);
setDefault(SETTING_REJECT_PLAINTEXT_PORTS, QList<QVariant>());
+ setDefault(SETTING_BOOTSTRAP, false);
+ setDefault(SETTING_BOOTSTRAP_FROM, "");
}
/** Applies any changes to Tor's control port or authentication settings. */
@@ -423,3 +427,26 @@ TorSettings::hashPassword(const QString &password)
.arg(base16_encode(key));
}
+void
+TorSettings::setBootstrap(bool enabled)
+{
+ setValue(SETTING_BOOTSTRAP, enabled);
+}
+
+bool
+TorSettings::bootstrap() const
+{
+ return value(SETTING_BOOTSTRAP).toBool();
+}
+
+void
+TorSettings::setBootstrapFrom(const QString &from)
+{
+ setValue(SETTING_BOOTSTRAP_FROM, from);
+}
+
+QString
+TorSettings::bootstrapFrom() const
+{
+ return QDir::convertSeparators(value(SETTING_BOOTSTRAP_FROM).toString());
+}
diff --git a/src/vidalia/config/TorSettings.h b/src/vidalia/config/TorSettings.h
index a116c61..a4f8ec9 100644
--- a/src/vidalia/config/TorSettings.h
+++ b/src/vidalia/config/TorSettings.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -118,6 +118,15 @@ public:
* "tor --hash-password foo". */
static QString hashPassword(const QString &password);
+ /** Returns true if Vidalia needs to bootstrap the torrc file */
+ bool bootstrap() const;
+ /** Enables or disables bootstrap */
+ void setBootstrap(bool enabled);
+ /** Returns the path of the bootstrap torrc file */
+ QString bootstrapFrom() const;
+ /** Sets the location of the bootstrap torrc file */
+ void setBootstrapFrom(const QString &from);
+
private:
/** Returns the AuthenticationMethod enum value for the string
* description of the authentication method given in <b>authMethod</b>. */
diff --git a/src/vidalia/config/TorrcDialog.cpp b/src/vidalia/config/TorrcDialog.cpp
index 81d1a4a..a1ad569 100644
--- a/src/vidalia/config/TorrcDialog.cpp
+++ b/src/vidalia/config/TorrcDialog.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -19,6 +19,7 @@
#include "Vidalia.h"
#include <QMessageBox>
+#include <QToolBar>
void
TorHighlighter::highlightBlock(const QString &text)
@@ -43,6 +44,8 @@ TorrcDialog::TorrcDialog(QWidget *parent)
{
/* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this);
+ loadToolBar();
+
TorHighlighter *highlighter = new TorHighlighter(ui.teditTorrc);
/* Retrieve the global TorControl instance */
@@ -61,6 +64,21 @@ TorrcDialog::~TorrcDialog()
}
+void
+TorrcDialog::loadToolBar()
+{
+ QToolBar *tb = new QToolBar(this);
+ tb->addAction(ui.actionCut);
+ tb->addAction(ui.actionCopy);
+ tb->addAction(ui.actionPaste);
+ tb->addAction(ui.actionUndo);
+ tb->addAction(ui.actionRedo);
+ tb->addAction(ui.actionSelect_All);
+
+ tb->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+ ui.verticalLayout->insertWidget(0, tb);
+}
+
/** Gives a shallow parse phase to the settings to catch most errors
* and passes on the error messages from Tor if the setting's value isn't
* valid. It returns false if something went wrong.
diff --git a/src/vidalia/config/TorrcDialog.h b/src/vidalia/config/TorrcDialog.h
index b5eadcc..fb11574 100644
--- a/src/vidalia/config/TorrcDialog.h
+++ b/src/vidalia/config/TorrcDialog.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -49,6 +49,7 @@ private slots:
void saveTorrc();
private:
+ void loadToolBar();
/** Loads the contents of the torrc file that Tor has loaded */
void loadTorrc();
/** Parses the options edited and sets them through SETCONF
diff --git a/src/vidalia/config/TorrcDialog.ui b/src/vidalia/config/TorrcDialog.ui
index c72a255..42971b4 100644
--- a/src/vidalia/config/TorrcDialog.ui
+++ b/src/vidalia/config/TorrcDialog.ui
@@ -19,158 +19,11 @@
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
- <layout class="QGridLayout" name="gridLayout">
- <item row="1" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
<widget class="QTextEdit" name="teditTorrc"/>
</item>
- <item row="5" column="0">
- <widget class="QCheckBox" name="chkSave">
- <property name="text">
- <string>Save settings. If unchecked it will only apply settings to the current Tor instance.</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QPushButton" name="btnCut">
- <property name="text">
- <string>Cut</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/editcut.png</normaloff>:/images/22x22/editcut.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnCopy">
- <property name="text">
- <string>Copy</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/edit-copy.png</normaloff>:/images/22x22/edit-copy.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnPaste">
- <property name="text">
- <string>Paste</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/editpaste.png</normaloff>:/images/22x22/editpaste.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnUndo">
- <property name="text">
- <string>Undo</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/edit_undo.png</normaloff>:/images/22x22/edit_undo.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnRedo">
- <property name="text">
- <string>Redo</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/edit_redo.png</normaloff>:/images/22x22/edit_redo.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnSelectAll">
- <property name="text">
- <string>Select All</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/22x22/edit_select_all.png</normaloff>:/images/22x22/edit_select_all.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>22</width>
- <height>22</height>
- </size>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="3" column="0">
+ <item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QRadioButton" name="rdoAll">
@@ -191,6 +44,16 @@
</item>
</layout>
</item>
+ <item>
+ <widget class="QCheckBox" name="chkSave">
+ <property name="text">
+ <string>Save settings. If unchecked it will only apply settings to the current Tor instance.</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item row="1" column="0">
@@ -204,6 +67,78 @@
</widget>
</item>
</layout>
+ <action name="actionCut">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/editcut.png</normaloff>:/images/22x22/editcut.png</iconset>
+ </property>
+ <property name="text">
+ <string>Cut</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+X</string>
+ </property>
+ </action>
+ <action name="actionCopy">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/edit-copy.png</normaloff>:/images/22x22/edit-copy.png</iconset>
+ </property>
+ <property name="text">
+ <string>Copy</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+C</string>
+ </property>
+ </action>
+ <action name="actionPaste">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/editpaste.png</normaloff>:/images/22x22/editpaste.png</iconset>
+ </property>
+ <property name="text">
+ <string>Paste</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+V</string>
+ </property>
+ </action>
+ <action name="actionUndo">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/edit_undo.png</normaloff>:/images/22x22/edit_undo.png</iconset>
+ </property>
+ <property name="text">
+ <string>Undo</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+Z</string>
+ </property>
+ </action>
+ <action name="actionRedo">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/edit_redo.png</normaloff>:/images/22x22/edit_redo.png</iconset>
+ </property>
+ <property name="text">
+ <string>Redo</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+Shift+Z</string>
+ </property>
+ </action>
+ <action name="actionSelect_All">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/22x22/edit_select_all.png</normaloff>:/images/22x22/edit_select_all.png</iconset>
+ </property>
+ <property name="text">
+ <string>Select All</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+A</string>
+ </property>
+ </action>
</widget>
<resources>
<include location="../res/vidalia.qrc"/>
@@ -226,8 +161,8 @@
</hints>
</connection>
<connection>
- <sender>btnUndo</sender>
- <signal>clicked()</signal>
+ <sender>actionUndo</sender>
+ <signal>triggered()</signal>
<receiver>teditTorrc</receiver>
<slot>undo()</slot>
<hints>
@@ -242,8 +177,8 @@
</hints>
</connection>
<connection>
- <sender>btnRedo</sender>
- <signal>clicked()</signal>
+ <sender>actionRedo</sender>
+ <signal>triggered()</signal>
<receiver>teditTorrc</receiver>
<slot>redo()</slot>
<hints>
@@ -258,8 +193,8 @@
</hints>
</connection>
<connection>
- <sender>btnSelectAll</sender>
- <signal>clicked()</signal>
+ <sender>actionSelect_All</sender>
+ <signal>triggered()</signal>
<receiver>teditTorrc</receiver>
<slot>selectAll()</slot>
<hints>
@@ -274,8 +209,8 @@
</hints>
</connection>
<connection>
- <sender>btnCopy</sender>
- <signal>clicked()</signal>
+ <sender>actionCopy</sender>
+ <signal>triggered()</signal>
<receiver>teditTorrc</receiver>
<slot>copy()</slot>
<hints>
@@ -290,8 +225,8 @@
</hints>
</connection>
<connection>
- <sender>btnPaste</sender>
- <signal>clicked()</signal>
+ <sender>actionPaste</sender>
+ <signal>triggered()</signal>
<receiver>teditTorrc</receiver>
<slot>paste()</slot>
<hints>
@@ -306,8 +241,8 @@
</hints>
</connection>
<connection>
- <sender>btnCut</sender>
- <signal>clicked()</signal>
+ <sender>actionCut</sender>
+ <signal>triggered()</signal>
<receiver>teditTorrc</receiver>
<slot>cut()</slot>
<hints>
diff --git a/src/vidalia/config/UPNPControl.cpp b/src/vidalia/config/UPNPControl.cpp
index a87f785..f1003c9 100644
--- a/src/vidalia/config/UPNPControl.cpp
+++ b/src/vidalia/config/UPNPControl.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/UPNPControl.h b/src/vidalia/config/UPNPControl.h
index 2e7006a..17d462d 100644
--- a/src/vidalia/config/UPNPControl.h
+++ b/src/vidalia/config/UPNPControl.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/UPNPControlThread.cpp b/src/vidalia/config/UPNPControlThread.cpp
index d92ff46..25f5649 100644
--- a/src/vidalia/config/UPNPControlThread.cpp
+++ b/src/vidalia/config/UPNPControlThread.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/UPNPControlThread.h b/src/vidalia/config/UPNPControlThread.h
index 4a183f1..8b366ab 100644
--- a/src/vidalia/config/UPNPControlThread.h
+++ b/src/vidalia/config/UPNPControlThread.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/UPNPTestDialog.cpp b/src/vidalia/config/UPNPTestDialog.cpp
index 7c28cd8..9652027 100644
--- a/src/vidalia/config/UPNPTestDialog.cpp
+++ b/src/vidalia/config/UPNPTestDialog.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/UPNPTestDialog.h b/src/vidalia/config/UPNPTestDialog.h
index 1c26212..2204e26 100644
--- a/src/vidalia/config/UPNPTestDialog.h
+++ b/src/vidalia/config/UPNPTestDialog.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/VSettings.cpp b/src/vidalia/config/VSettings.cpp
index 168392c..aab0f9b 100644
--- a/src/vidalia/config/VSettings.cpp
+++ b/src/vidalia/config/VSettings.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/VSettings.h b/src/vidalia/config/VSettings.h
index d921b97..ed31255 100644
--- a/src/vidalia/config/VSettings.h
+++ b/src/vidalia/config/VSettings.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/VidaliaSettings.cpp b/src/vidalia/config/VidaliaSettings.cpp
index f16e456..0812b03 100644
--- a/src/vidalia/config/VidaliaSettings.cpp
+++ b/src/vidalia/config/VidaliaSettings.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/config/VidaliaSettings.h b/src/vidalia/config/VidaliaSettings.h
index dbcc860..2667b12 100644
--- a/src/vidalia/config/VidaliaSettings.h
+++ b/src/vidalia/config/VidaliaSettings.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/help/browser/HelpBrowser.cpp b/src/vidalia/help/browser/HelpBrowser.cpp
index 94d77c3..34ee1b0 100644
--- a/src/vidalia/help/browser/HelpBrowser.cpp
+++ b/src/vidalia/help/browser/HelpBrowser.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/help/browser/HelpBrowser.h b/src/vidalia/help/browser/HelpBrowser.h
index 2170822..2b9bdd5 100644
--- a/src/vidalia/help/browser/HelpBrowser.h
+++ b/src/vidalia/help/browser/HelpBrowser.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/help/browser/HelpTextBrowser.cpp b/src/vidalia/help/browser/HelpTextBrowser.cpp
index cb525ab..d580825 100644
--- a/src/vidalia/help/browser/HelpTextBrowser.cpp
+++ b/src/vidalia/help/browser/HelpTextBrowser.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/help/browser/HelpTextBrowser.h b/src/vidalia/help/browser/HelpTextBrowser.h
index 5ca8700..c222eee 100644
--- a/src/vidalia/help/browser/HelpTextBrowser.h
+++ b/src/vidalia/help/browser/HelpTextBrowser.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/help/content/ar/bridges.html b/src/vidalia/help/content/ar/bridges.html
index 2bb31b9..9559708 100644
--- a/src/vidalia/help/content/ar/bridges.html
+++ b/src/vidalia/help/content/ar/bridges.html
@@ -1,15 +1,15 @@
<!--
-** $Id: bridges.html 3007 2008-08-22 00:12:08Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ar/config.html b/src/vidalia/help/content/ar/config.html
index 4cb3cf0..1c5fa66 100644
--- a/src/vidalia/help/content/ar/config.html
+++ b/src/vidalia/help/content/ar/config.html
@@ -1,73 +1,73 @@
<!--
-** $Id: config.html 4323 2010-06-26 15:46:44Z runa $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of 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>
+<h1> تهيئة فيداليا و تور</h1>
<hr />
<p>
-يسمح لك فيداليا بتكوين بعض الجوانب المعدلة الأكثر شيوعا لفيداليا وتور. يسمح
-لك ايضا بضبط وإدارة <a href="server.html">مرحل تور</a> حتى تتمكن من مساعدة
-شبكة تور بالنموّ..
+فيداليا يسمح لك بتهيئة بعض الجوانب التي يعدلها العديد من مستخدمي فيداليا و
+تور. كما أنه يتيح لك إنشاء وإدارة <a href="server.html">توصيلة تور</a> حتى
+تتمكن من مساعدة شبكة تور على النمو.
</p>
<a name="general"/>
-<h3>إعدادات عامة</h3>
+<h3>الإعدادات العامة</h3>
<p>
-الاعدادات في الصفحة <i>العامة</i> هي الإعدادات الأكثر تعديلا.
+الإعدادات على الصفحة <i>العامة</i>التي يرغب في تبديلها المستخدمون تشمل معظم
+الإعدادات.
</p>
<ul>
- <li><b>تور التنفيذي</b>: هو تور التنفيذي الذي سوف يقوم فيداليا بتشغيله عند
-إختيارك <i>بدء</i> من قائمة الشريط. اذا كان لديك عدة إصدارات مثبتة لتور,
-يمكنك إخبار فيداليا أي إصدار تريد تشغيله عن طريق نقر زر <i>تصفّح</i>
-والانتقال الى تثبيت تور المعين الذي تريده.
+ <li><b>ملف تور التنفيذي</b> : هذا هو الملف القابل للتنفيذ الذي ستقوم بتشغيله
+فيداليا عند اختيار<i>ابدأ</i> من ايقونة تور. إذا كان عندك إصدارات متعددة من
+تور ، فمن الممكن أن تختار الإصدار الذي ترغب في تشغيله بالنقر على
+<i>استعراض</i والانتقال إلى تثبيت اصدار تور الذي تريد تثبيته.
</li>
- <li><b>خيارات بدء التشغيل</b>: هذا الإعداد يسمح لك بتشغيل فيداليا لتور تلقائيا
-عند تشغيل فيداليا. يمكنك أيضا تكوين فيداليا ليتم تشغيله عند بدء تشغيل النظام
-الخاص بك (<i>نظام ويندوز فقط</i>).
+ <li><b>بدء التشغيل خيارات</b> : هذا الإعداد يسمح بجعل تور يعمل تلقائيا عندما
+يبدأ فيداليا. يمكنك أيضا تهيئة فيداليا بحيث يعمل عند بدء تشغيل جهاز الكبموتر
+<i>(ويندوز فقط).</i>
</li>
</ul>
-<a name="network"/>
+<a name="الشبكة"/>
<h3>إعدادات الشبكة</h3>
<p>
-صفحة إعدادات <i>الشبكة</i> تتيح لك تغيير كيفية إتصال تور بشبكة تور.
+صفحة إعدادات <i>الشبكة</i> تتيح لك تغيير كيف يتصل برنامج تور بشبكة تور
+المركزية.
</p>
<ul>
- <li><b>أنا أستخدم وكيل للوصول الى الانترنت</b>: اذا كان اتصال الانترنت الخاص بك
-يتطلب وكيل بروتوكول نقل النص التشعبي (HTTP), يمكنك تكوين تور لإرسال جميع
-طلبات الدليل الخاصة به واتصالات مرحل تور من خلال الوكيل الخاص بك. يجب عليك
-تحديد على الاقل اسم المسضيف أو عنوان الوكيل الخاص بك, والمنفذ الذي يصغي اليه
-الوكيل الخاص بك للاتصالات. اذا طلب وكيلك مصادقة, يمكنك ايضا إدخال <i>اسم
-المستخدم</i> و <i>كلمة المرور</i> الذين تستخدمهم للاتصال بالوكيل الخاص بك.
-وإلا, يمكنك ترك هذه الحقول فارغة.
+ <li><b>أنا استخدم وكيل للوصول إلى الإنترنت</b> : إذا كان اتصال إنترنت لديك يتطلب
+عنوان البروكسي ، يمكنك تهيئة تور لإرسال جميع طلبات الدليل وتتابع الاتصالات
+من خلال البروكسي. يجب تحديد اسم المضيف أو عنوان الوكيل الخاص بك على الاقل،
+و البورت portالذي الوكيل يصغي للاتصالات. إذا الوكيل يتطلب ان كان البروكسي
+يتطلب التحقق ، فيمكنك أيضا إدخال <i>اسم المستخدم وكلمة المرور</i> الذي
+تستخدمه للاتصال . خلاف ذلك ، يمكنك ترك هذه الحقول فارغة.
</li>
- <li><b>جدار الحماية الخاص بي يسمح لي فقط بالاتصال بمنافذ معينة</b>: إذا كنت تعمل
-خلف جدار حماية أو وكيل تقييدي يحد من المنافذ التي يمكنك الاتصال بها, يمكنك
-تكوين تور للاتصال مباشرة بمرحلات فقط تستمع على المنافذ المسموح بها من قبل
-جدار الحماية أو الوكيل الخاص بك. يكفي أن تدخل قائمة المنافذ التي يسمح بها
-جدار الحماية أو الوكيل الخاص بك, مفصولة بفواصل. (<i>مثال: 80,443,8080</i>)
+ <li><b> فقط جدار الحماية يتيح لي الاتصال بمنافذ معينة</b> : إذا كنت خلف جدار
+حماية أو أي قيود تحد من استخدام البورتات للاتصال بشبكة تور، يمكنك تهيئة تور
+للتواصل فقط مع تبديلات مسموح بها من قبل جدار الحماية أو البروكسي. يكفي أن
+تدخل قائمة المنافذ او البورتات التي يسمح بها جدار الحماية أو الوكيل ، بينها
+فاصلة . <i>(مثال : 80،443،8080)</i>
</li>
- <li><b>مزود خدمة الانترنت (ISP) الخاص بي يمنع الاتصالات الى شبكة تور</b>: اذا
-كان مزود خدمة الانترنت (ISP) الخاص بك يمنع الاتصالات الى شبكة تور, يستطيع
-تور محاولة تجنب التعرض للتصفية عن طريق تشفير اتصالات الدليل الخاص به
-والاتصال بشبكة تور عبر مرحلات تسمى <i>جسور</i> (Tor 0.2.0.3-alpha او احدث
-فقط). يمكنك إضافة مرحلات جسر عن طريق تحديد إما عنوان ورقم المنفذ الخاص بهم
-او العنوان ورقم المنفذ والبصمة الخاص بهم.<br/>
+ <li><b>مقدمي خدمات الإنترنت يحظر الاتصال بشبكة تور</b> : إذا كان (مقدم الخدمة)
+يحظر الاتصالات مع شبكة تور ، فإن تور بامكانه محاولة تجنب منعها من خلال
+تشفير الاتصالات والاتصال بالشبكة من خلال التبديلات والتي تسمى <i>الجسور</i>
+(تور 0.2.0.3-ألفا أو طرازات أحدث). يمكنك إضافة جسور إما عن طريق تحديد
+عنوانهم ورقم المنفذ ، أو عنوان ورقم المنفذ ، وبصمته.<br/>
- وفيما يلي أمثلة على صيغ عنوان جسر صالح:
+ فيما يلي أمثلة من نماذج صالحة للجسور :
<ul>
<li>
128.213.48.13:8080
@@ -79,99 +79,98 @@
128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73
</li>
</ul>
- حتى اذا كنت لا تعرف اية عناوين مرحّل الجسر, تفقّد صندوق الفحص يمكن ان لا
-يزال مفيدا. سوف يقوم تور بتشفير طلبات الدليل الخاص به التي يمكنها هزيمة
-آليات المنع التي تحاول تصفية طلبات تور للحصول على معلومات حول المرحلات
-الأخرى. اذا كانت الاتصالات الى مرحلات تور العادية محظورة ايضا, فإنك تحتاج
-الى تعلّم عنوان مرحل جسر بطريقة ما وإضافته هنا. أنظر موضوع المساعدة حول <a
-href="bridges.html#finding">إيجاد مرحلات جسر</a> للمزيد من المعلومات حول
-كيفية تعلّم عناوين مرحّل الجسر والبصمات.
+ وحتى لو كنت لا تعرف أي عناوين للجسور ، قد يكون اختيار هذا الخيار مفيدا. سوف
+يقوم تور بتشفير طلبات الدليل الخاص به ، والتي يمكنها من هزيمة آليات الحظر
+التي تحاول منع طلبات تور من الحصول على معلومات عن تبديلات أخرى. إذا منعت
+تبديلات تور العادية ايضا، ثم كنت بحاجة لمعرفة عنوان تتابع جسر بطريقة ما أو
+بأخرى وإضافته هنا. راجع موضوع المساعدة فى <a
+href="bridges.html#finding">إيجاد تبديلات للجسور</a> لمزيد من المعلومات حول
+كيفية معرفة عناوين جديدة لتتابع الجسور وبصماتها .
</li>
</ul>
-<a name="relay"/>
-<h3>إعدادات مرحل</h3>
+<a name="تبدية"/>
+<h3>إعدادات التبديلات</h3>
<p>
-<i> أنظر <a href="server.html">موضوع المساعدة هذا</a> للحصول على معلومات
-مفصّلة حول ضبط وإدارة مرحّل تور. </i>
+<i>انظر <a href="server.html">هذا الموضوع مساعدة</a> للحصول على معلومات
+مفصلة حول إنشاء وإدارة تبديلة تور.</i>
</p>
-<a name="appearance"/>
+<a name="لمظهر"/>
<h3>إعدادات المظهر</h3>
<p>
-الاعدادات في صفحة <i>المظهر</i> تسمح لك بتخصيص شكل وأسلوب فيداليا.
+الإعدادات على صفحة <i>المظهر</i> تسمح لك بتخصيص مظهر فيداليا.
</p>
<ul>
- <li><b>اللغة</b>: تم ترجمت واجهة فيداليا إلى لغات عديدة من قبل متطوعين
-مساعدين. عند تشغيل فيداليا لأول مرة, سوف يحاول تخمين أي لغة يستخدمها جهازك
-حاليا. اذا كانت تخمينات فيداليا غير صحيحة أو إذا كنت تفضل لغة مختلفة, يمكنك
-اختيار لغة أخرى من صندوق القائمة المنسدلة. سوف تحتاج إلى إعادة تشغيل فيداليا
-بعد تغيير لغة العرض لتصبح التغييرات نافذة المفعول.
+ <li><b>اللغة</b> :تم ترجمة واجهة فيداليا إلى العديد من اللغات من قبل
+المتطوعين. عندما يتم تشغيل فيداليا للمرة الأولى ، فإنه سيحاول تخمين لغة
+الكمبيوتر التي تستخدمها حاليا. إذا كتن تخمين فيداليا غير صحيح ، أو إذا كنت
+تفضل لغة مختلفة ، يمكنك اختيار لغة أخرى من مربع القائمة المنسدلة. سوف تحتاج
+إلى إعادة تشغيل فيداليا مرة اخرى بعد تغيير لغة العرض لتصبح التغييرات نافذة
+المفعول.
</li>
- <li><b>الأسلوب</b>: في معظم الحالات، سوف يقوم فيداليا افتراضيا بإستخدام أسلوب
-الواجهة الافتراضي للنظام الأساسي الخاص بك. إذا لم يعجبك الخيار الافتراضي،
-يمكنك اختيار أي أسلوب واجهة تفضل من صندوق القائمة المنسدلة.
+ <li><b>النمط</b> : في معظم الحالات ، سوف يقوم فيداليا باستخدام النمط الافتراضي
+على جهازك . إذا كان لا يروقك النمط الافتراضي ، يمكنك اختيار نمط واجهة آخر من
+مربع القائمة المنسدلة.
</li>
</ul>
-<a name="advanced"/>
+<a name="متقدمة"/>
<h3>إعدادات متقدمة</h3>
<p>
-الاعدادات في الصفحة <i>المتقدمة</i> ينبغي تعديلها بشكل عام فقط من قبل
-مستخدمين أكثر خبرة.
+ <i>الصفحة المتقدمة </i> عموما ينبغي أن يتم تعديل الإعدادات فقط من قبل ذوي
+الخبرة على.
</p>
<ul>
- <li><b>العنوان ومنفذ التحكم</b>: منفذ <i>التحكم</i> هو المنفذ الذي يستخدمه
-فيداليا للاتصال مع تور. هذا لا يحتاج إلى تغيير ما لم يكن لديك تعارض مع خدمة
-أخرى على جهازك, أو إذا كنت تستخدم فيداليا للتحكم ومراقبة عملية لتور تعمل على
-جهاز آخر.
+ <li><b>التحكم بالعنوان <i>والمنفذ</i></b> : <b>بالمنفذ</b> <i>التحكم</i> هو
+المنفذ الذي يستخدم فيداليا لاجراء اتصال مع تور. هذا لا يحتاج إلى تغيير ما لم
+يكن لديه تعارض مع خدمة أخرى على جهازك ، أو إذا كنت تستخدم فيداليا لمراقبة
+ورصد اتصال لتور على جهاز آخر.
</li>
- <li><b>مصادقة منفذ التحكم</b>: تستخدم مصادقة منفذ التحكم للحد من التطبيقات على
-جهازك التي يمكن الاتصال بها وإعادة تكوين تثبيت تور. أساليب المصادقة المتوفرة
-هي:
+ <li><b>التحكم بمصادقة المنافذ</b>يستخدم التحكم بمصادقة المنافذ لتقييد عدد
+التطبيقات على جهازك التي باستطاعتها الاتصال و تهيئة تثبيت تور . أساليب
+المصادقة المتوفرة: :
<ul>
<li>
- <b>لا يوجد</b> -- لا يلزم مصادقة. إستخدام هذا الخيار <b>مثبّط</b>
-بقوة. يستطيع أي تطبيق أو مستخدم على جهاز الكمبيوتر الخاص بك إعادة تكوين
-تثبيت تور.
+ لا مصادقة مطلوبة <b>بلا</b> --. الخيار <b>بشدة</b> استخدام هذا الخيار غير
+مفضل. ويمكن لأي مستخدم على الكمبيوتر الخاص بك تهيئة تثبيت تور .
</li>
<li>
- <b>كلمة المرور</b> <i>(افتراضيا)</i> -- اذا تم إختيار هذه الطريقة, يمكنك
-تحديد كلمة المرور التي سوف يطلبها تور في كل مرة يقوم مستخدم أو تطبيق
-بالاتصال بمنفذ التحكم لتور. اذا قام فيداليا بتشغيل تور لك, يمكنك جعل فيداليا
-يولّد كلمة مرور جديدة عشوائيا في كل مرة يقوم بتشغيل تور عن طريق تفقد صندوق
-فحص <i>التوليد العشوائي</i>.
+ <b>كلمة المرور</b> <i>(الافتراضي)</i> -- إذا تم تحديد هذا الأسلوب ، يمكنك
+تحديد كلمة السر التي يطلبها تور في كل مرة يتصل مستخدم على منفذ تور. إذا قام
+فيداليا بتشغيل تور لك ، يمكن له توليد كلمة سر جديدة في كل مرة يبدأ تور عن
+طريق التحقق من صندوق <i>شكل عشوائي.</i>
</li>
<li>
- <b>ملف تعريف الارتباط</b> -- اذا تم إختيار مصادقة ملف تعريف الارتباط, سوف
-يقوم تور بكتابة ملف (أو, <i>ملف تعريف الارتباط</i>) يحتوي بايتات عشوائية
-لدليل البيانات الخاص به عند تشغيله. أي مستخدم أو تطبيق يحاول الاتصال بمنفذ
-التحكم لتور يجب أن يكون قادرا على توفير محتويات ملف تعريف الارتباط هذا .
+ <b> الكعكات كوكيز</b> -- اذا تم اختيار التحقق من الكوكيز ، تور سينشئ ملف (أو
+<i>الكعكة)</i> التي تحتوي على بايت عشوائي إلى دليل البيانات الخاصة به عند
+بدء تشغيله. يجب أن يكون أي مستخدم يحاول الاتصال إلى منفذ تحكم تور قادرا على
+توفير محتويات هذه الكعكة.
</li>
</ul>
</li>
- <li><b>ملف تكوين تور</b> <i>(إختياري)</i>: يمكنك إستخدام هذا الخيار لجعل فيداليا
-يقوم بتشغيل تور بإستخدام <i>تورك</i> محدد, ملف تكوين تور. اذا تركت هذا الحقل
-فارغا, سوف يستخدم تور موقع تورك الافتراضي الخاص به.
+ <li><b> ملف تهيئة تور </b> <i>(اختياري)</i> : يمكنك استخدام هذا الخيار لبدء
+فيداليا تور باستخدام <i>torrc</i> محددة ، او ملف تهيئة تور. إذا تركت هذا
+الحقل فارغا ، سوف يستخدم تور موقعه الافتراضي torrc.
</li>
- <li><b>دليل بيانات تور</b> <i>(إختياري)</i>: يمكنك تحديد الدليل الذي سوف يقوم
-تور بتخزين بياناته المحفوظة, مثل معلومات مرحل تور المؤقتة, مفاتيح مرحل تور
-وملفات التكوين. اذا تركت هذا الحقل فارغا, سوف يستخدم تور موقع دليل البيانات
-الافتراضي الخاص به.
+ <li><b> دليل بيانات تور </b> <i>(اختياري)</i> : يمكنك تحديد الدليل الذي سيقوم
+تور بحفظ البيانات الخاصة فيه، مثل المعلومات المخزنة مؤقتا عن تبديلة تور ،
+مفاتيح تتابع تور ، وملفات التهيئة. إذا تركت هذا الحقل فارغا ، سوف يقوم تور
+بوضع البيانات الخاصة به في الدليل الافتراضي.
</li>
- <li><b>الأذونات</b> <i>(إختياري, غير متوفر في ويندوز)</i>: اذا قمت بإدخال قيمة
-<b>للتشغيل كمستخدم</b>, سوف يقوم تور <i>بضبط هوية المستخدم</i> لهذا المسخدم
-عند بدء تشغيله. اذا قمت بإدخال قيمة <b>للتشغيل كمجموعة</b>, سوف يقوم تور
-<i>بضبط هوية المجموعة</i> لهذه المجموعة عند بدء تشغيلها.
+ <li><b>أذونات</b> <i>(اختياري ، غيرمتوفر على ويندوز)</i> : إذا اخترت <b>تشغيل
+كمستخدم</b> ، سيقوم تور بعمل <i>setuid</i> لهذا المستخدم عند بدء
+تشغيله. إذا قمت بإختيار <b>تشغيل كمجموعة</b> ، سوف يقوم تور بعمل
+<i>setgid</i> إلى هذه المجموعة عند بدء تشغيله.
</li>
</ul>
-<a name="services"/>
-<h3>إعدادات الخدمة الخفية</h3>
+<a name="الخدمات"/>
+<h3>إعدادات الخدمة المخفية</h3>
<p>
-الخدمات الخفية تسمح لك بتقديم أي نوع من الخدمة على أساس برنامج التعاون الفني
-(TCP), على سبيل المثال: خدمة بروتوكول نقل النص التشعبي (HTTP), الى الآخرين
-بدون كشف عنوان IP الخاص بك.
+الخدمات المخفية تسمح لك بتقديم أي نوع من الخدمة على أساس برنامج التعاون
+الفني ، على سبيل المثال خدمة النص المتشعب ، للآخرين دون الكشف عن عنوان
+بروتوكول الإنترنت الخاص بك.
</p>
</body>
diff --git a/src/vidalia/help/content/ar/index.html b/src/vidalia/help/content/ar/index.html
index 4c461a3..44adde7 100644
--- a/src/vidalia/help/content/ar/index.html
+++ b/src/vidalia/help/content/ar/index.html
@@ -1,15 +1,15 @@
<!--
-** $Id: index.html 2366 2008-03-01 17:58:23Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ar/links.html b/src/vidalia/help/content/ar/links.html
index 2e17d01..3238a53 100644
--- a/src/vidalia/help/content/ar/links.html
+++ b/src/vidalia/help/content/ar/links.html
@@ -1,15 +1,15 @@
<!--
-** $Id: links.html 4323 2010-06-26 15:46:44Z runa $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ar/log.html b/src/vidalia/help/content/ar/log.html
index d2c0f70..27273dd 100644
--- a/src/vidalia/help/content/ar/log.html
+++ b/src/vidalia/help/content/ar/log.html
@@ -1,15 +1,15 @@
<!--
-** $Id: log.html 4323 2010-06-26 15:46:44Z runa $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ar/netview.html b/src/vidalia/help/content/ar/netview.html
index 6b93e04..f73f684 100644
--- a/src/vidalia/help/content/ar/netview.html
+++ b/src/vidalia/help/content/ar/netview.html
@@ -1,15 +1,15 @@
<!--
-** $Id: netview.html 2366 2008-03-01 17:58:23Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ar/running.html b/src/vidalia/help/content/ar/running.html
index ce1eef2..bfb03df 100644
--- a/src/vidalia/help/content/ar/running.html
+++ b/src/vidalia/help/content/ar/running.html
@@ -1,15 +1,15 @@
<!--
-** $Id: running.html 2366 2008-03-01 17:58:23Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ar/server.html b/src/vidalia/help/content/ar/server.html
index 829a801..75c91dd 100644
--- a/src/vidalia/help/content/ar/server.html
+++ b/src/vidalia/help/content/ar/server.html
@@ -1,15 +1,15 @@
<!--
-** $Id: server.html 4323 2010-06-26 15:46:44Z runa $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ar/services.html b/src/vidalia/help/content/ar/services.html
index 97d57bc..cc60e58 100644
--- a/src/vidalia/help/content/ar/services.html
+++ b/src/vidalia/help/content/ar/services.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ar/troubleshooting.html b/src/vidalia/help/content/ar/troubleshooting.html
index 399b423..7420f5d 100644
--- a/src/vidalia/help/content/ar/troubleshooting.html
+++ b/src/vidalia/help/content/ar/troubleshooting.html
@@ -1,15 +1,15 @@
<!--
-** $Id: troubleshooting.html 4366 2010-08-03 18:21:39Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/bms/bridges.html b/src/vidalia/help/content/bms/bridges.html
index 5b2567c..26b850c 100644
--- a/src/vidalia/help/content/bms/bridges.html
+++ b/src/vidalia/help/content/bms/bridges.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/bms/config.html b/src/vidalia/help/content/bms/config.html
index 693c1d2..a6f510c 100644
--- a/src/vidalia/help/content/bms/config.html
+++ b/src/vidalia/help/content/bms/config.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/bms/index.html b/src/vidalia/help/content/bms/index.html
index 1704fa3..853ddfc 100644
--- a/src/vidalia/help/content/bms/index.html
+++ b/src/vidalia/help/content/bms/index.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/bms/links.html b/src/vidalia/help/content/bms/links.html
index 0f5678d..ac2c75d 100644
--- a/src/vidalia/help/content/bms/links.html
+++ b/src/vidalia/help/content/bms/links.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/bms/log.html b/src/vidalia/help/content/bms/log.html
index 2ea865d..1f17b37 100644
--- a/src/vidalia/help/content/bms/log.html
+++ b/src/vidalia/help/content/bms/log.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/bms/netview.html b/src/vidalia/help/content/bms/netview.html
index 9f504ed..8916aad 100644
--- a/src/vidalia/help/content/bms/netview.html
+++ b/src/vidalia/help/content/bms/netview.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/bms/running.html b/src/vidalia/help/content/bms/running.html
index fb3a058..8307fd0 100644
--- a/src/vidalia/help/content/bms/running.html
+++ b/src/vidalia/help/content/bms/running.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/bms/server.html b/src/vidalia/help/content/bms/server.html
index 6dae358..ddebdeb 100644
--- a/src/vidalia/help/content/bms/server.html
+++ b/src/vidalia/help/content/bms/server.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/bms/services.html b/src/vidalia/help/content/bms/services.html
index b13f598..9d1c92c 100644
--- a/src/vidalia/help/content/bms/services.html
+++ b/src/vidalia/help/content/bms/services.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/bms/troubleshooting.html b/src/vidalia/help/content/bms/troubleshooting.html
index 112d41d..ad93d22 100644
--- a/src/vidalia/help/content/bms/troubleshooting.html
+++ b/src/vidalia/help/content/bms/troubleshooting.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/de/config.html b/src/vidalia/help/content/de/config.html
index bb47085..876f04b 100644
--- a/src/vidalia/help/content/de/config.html
+++ b/src/vidalia/help/content/de/config.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/de/index.html b/src/vidalia/help/content/de/index.html
index d8d9c02..836ac3e 100644
--- a/src/vidalia/help/content/de/index.html
+++ b/src/vidalia/help/content/de/index.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/de/links.html b/src/vidalia/help/content/de/links.html
index 0d73e07..3a2a64b 100644
--- a/src/vidalia/help/content/de/links.html
+++ b/src/vidalia/help/content/de/links.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/de/log.html b/src/vidalia/help/content/de/log.html
index 6c9d9fb..04a3213 100644
--- a/src/vidalia/help/content/de/log.html
+++ b/src/vidalia/help/content/de/log.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/de/netview.html b/src/vidalia/help/content/de/netview.html
index 1e0adc4..9cc77c1 100644
--- a/src/vidalia/help/content/de/netview.html
+++ b/src/vidalia/help/content/de/netview.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/de/running.html b/src/vidalia/help/content/de/running.html
index 3dc8f48..068c113 100644
--- a/src/vidalia/help/content/de/running.html
+++ b/src/vidalia/help/content/de/running.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/de/server.html b/src/vidalia/help/content/de/server.html
index 8d0c365..da7a72b 100644
--- a/src/vidalia/help/content/de/server.html
+++ b/src/vidalia/help/content/de/server.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/de/troubleshooting.html b/src/vidalia/help/content/de/troubleshooting.html
index 12e0a19..3855400 100644
--- a/src/vidalia/help/content/de/troubleshooting.html
+++ b/src/vidalia/help/content/de/troubleshooting.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/en/bridges.html b/src/vidalia/help/content/en/bridges.html
index 8f99cd3..24a0c27 100644
--- a/src/vidalia/help/content/en/bridges.html
+++ b/src/vidalia/help/content/en/bridges.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/en/config.html b/src/vidalia/help/content/en/config.html
index 889a402..b1c25c0 100644
--- a/src/vidalia/help/content/en/config.html
+++ b/src/vidalia/help/content/en/config.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/en/contents.xml b/src/vidalia/help/content/en/contents.xml
index ba6ba31..ae42116 100644
--- a/src/vidalia/help/content/en/contents.xml
+++ b/src/vidalia/help/content/en/contents.xml
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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">
diff --git a/src/vidalia/help/content/en/index.html b/src/vidalia/help/content/en/index.html
index d9710d7..8ea83d3 100644
--- a/src/vidalia/help/content/en/index.html
+++ b/src/vidalia/help/content/en/index.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/en/links.html b/src/vidalia/help/content/en/links.html
index 20eafd3..1326f44 100644
--- a/src/vidalia/help/content/en/links.html
+++ b/src/vidalia/help/content/en/links.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
@@ -28,18 +28,10 @@
</tr>
<tr>
<td> </td>
- <td>Wiki</td>
+ <td>Wiki and Bugtracker</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>
+ <a href="http://trac.torproject.org/">
+ http://trac.torproject.org/</a>
</td>
</tr>
</table>
@@ -57,24 +49,16 @@
<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>
+ <a href="https://www.torproject.org/docs/faq.html">
+ https://www.torproject.org/docs/faq.html</a>
</td>
</tr>
<tr>
<td> </td>
- <td>Bugtracker</td>
+ <td>Wiki and Bugtracker</td>
<td>
- <a href="https://bugs.torproject.org/flyspray/">
- https://bugs.torproject.org/flyspray</a>
+ <a href="https://trac.torproject.org/">
+ https://trac.torproject.org/</a>
</td>
</tr>
</table>
diff --git a/src/vidalia/help/content/en/log.html b/src/vidalia/help/content/en/log.html
index 5731710..966b4ba 100644
--- a/src/vidalia/help/content/en/log.html
+++ b/src/vidalia/help/content/en/log.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/en/netview.html b/src/vidalia/help/content/en/netview.html
index e34aa0d..5e887be 100644
--- a/src/vidalia/help/content/en/netview.html
+++ b/src/vidalia/help/content/en/netview.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/en/running.html b/src/vidalia/help/content/en/running.html
index b6561c9..38dbfa1 100644
--- a/src/vidalia/help/content/en/running.html
+++ b/src/vidalia/help/content/en/running.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/en/server.html b/src/vidalia/help/content/en/server.html
index 924991d..ccfedd8 100644
--- a/src/vidalia/help/content/en/server.html
+++ b/src/vidalia/help/content/en/server.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/en/services.html b/src/vidalia/help/content/en/services.html
index 4ad627c..4e636bd 100644
--- a/src/vidalia/help/content/en/services.html
+++ b/src/vidalia/help/content/en/services.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/en/troubleshooting.html b/src/vidalia/help/content/en/troubleshooting.html
index 3e76582..751920a 100644
--- a/src/vidalia/help/content/en/troubleshooting.html
+++ b/src/vidalia/help/content/en/troubleshooting.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/es/bridges.html b/src/vidalia/help/content/es/bridges.html
index 21ed039..0cbcd39 100644
--- a/src/vidalia/help/content/es/bridges.html
+++ b/src/vidalia/help/content/es/bridges.html
@@ -1,15 +1,15 @@
<!--
-** $Id: bridges.html 3007 2008-08-22 00:12:08Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fa/bridges.html b/src/vidalia/help/content/fa/bridges.html
index 141d2a0..43daff8 100644
--- a/src/vidalia/help/content/fa/bridges.html
+++ b/src/vidalia/help/content/fa/bridges.html
@@ -1,15 +1,15 @@
<!--
-** $Id: bridges.html 3007 2008-08-22 00:12:08Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fa/config.html b/src/vidalia/help/content/fa/config.html
index e8cc601..67cc5df 100644
--- a/src/vidalia/help/content/fa/config.html
+++ b/src/vidalia/help/content/fa/config.html
@@ -1,15 +1,15 @@
<!--
-** $Id: config.html 4323 2010-06-26 15:46:44Z runa $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fa/index.html b/src/vidalia/help/content/fa/index.html
index c226423..0c14592 100644
--- a/src/vidalia/help/content/fa/index.html
+++ b/src/vidalia/help/content/fa/index.html
@@ -1,15 +1,15 @@
<!--
-** $Id: index.html 2366 2008-03-01 17:58:23Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fa/links.html b/src/vidalia/help/content/fa/links.html
index 4f7e322..a6c8bab 100644
--- a/src/vidalia/help/content/fa/links.html
+++ b/src/vidalia/help/content/fa/links.html
@@ -1,15 +1,15 @@
<!--
-** $Id: links.html 4323 2010-06-26 15:46:44Z runa $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fa/log.html b/src/vidalia/help/content/fa/log.html
index 1baf872..cd838b7 100644
--- a/src/vidalia/help/content/fa/log.html
+++ b/src/vidalia/help/content/fa/log.html
@@ -1,15 +1,15 @@
<!--
-** $Id: log.html 4323 2010-06-26 15:46:44Z runa $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fa/netview.html b/src/vidalia/help/content/fa/netview.html
index 22aedd9..7e21870 100644
--- a/src/vidalia/help/content/fa/netview.html
+++ b/src/vidalia/help/content/fa/netview.html
@@ -1,15 +1,15 @@
<!--
-** $Id: netview.html 2366 2008-03-01 17:58:23Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fa/running.html b/src/vidalia/help/content/fa/running.html
index a28ec05..771d2ee 100644
--- a/src/vidalia/help/content/fa/running.html
+++ b/src/vidalia/help/content/fa/running.html
@@ -1,15 +1,15 @@
<!--
-** $Id: running.html 2366 2008-03-01 17:58:23Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fa/server.html b/src/vidalia/help/content/fa/server.html
index bf54b8a..1748015 100644
--- a/src/vidalia/help/content/fa/server.html
+++ b/src/vidalia/help/content/fa/server.html
@@ -1,15 +1,15 @@
<!--
-** $Id: server.html 4323 2010-06-26 15:46:44Z runa $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fa/services.html b/src/vidalia/help/content/fa/services.html
index 8fe1f4d..75bc53c 100644
--- a/src/vidalia/help/content/fa/services.html
+++ b/src/vidalia/help/content/fa/services.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fa/troubleshooting.html b/src/vidalia/help/content/fa/troubleshooting.html
index 41caa04..212d7a1 100644
--- a/src/vidalia/help/content/fa/troubleshooting.html
+++ b/src/vidalia/help/content/fa/troubleshooting.html
@@ -1,15 +1,15 @@
<!--
-** $Id: troubleshooting.html 4366 2010-08-03 18:21:39Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fi/bridges.html b/src/vidalia/help/content/fi/bridges.html
index 4951e93..b441f05 100644
--- a/src/vidalia/help/content/fi/bridges.html
+++ b/src/vidalia/help/content/fi/bridges.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/fi/config.html b/src/vidalia/help/content/fi/config.html
index d9760a1..1145a9f 100644
--- a/src/vidalia/help/content/fi/config.html
+++ b/src/vidalia/help/content/fi/config.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/fi/index.html b/src/vidalia/help/content/fi/index.html
index 9d7075a..c2c5ab6 100644
--- a/src/vidalia/help/content/fi/index.html
+++ b/src/vidalia/help/content/fi/index.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/fi/links.html b/src/vidalia/help/content/fi/links.html
index 397da6a..6e5a0f6 100644
--- a/src/vidalia/help/content/fi/links.html
+++ b/src/vidalia/help/content/fi/links.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/fi/log.html b/src/vidalia/help/content/fi/log.html
index facc03e..4339d26 100644
--- a/src/vidalia/help/content/fi/log.html
+++ b/src/vidalia/help/content/fi/log.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/fi/netview.html b/src/vidalia/help/content/fi/netview.html
index f379387..d03ab22 100644
--- a/src/vidalia/help/content/fi/netview.html
+++ b/src/vidalia/help/content/fi/netview.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/fi/running.html b/src/vidalia/help/content/fi/running.html
index 6a237cc..b7082db 100644
--- a/src/vidalia/help/content/fi/running.html
+++ b/src/vidalia/help/content/fi/running.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/fi/server.html b/src/vidalia/help/content/fi/server.html
index 36c22b6..7b2e30e 100644
--- a/src/vidalia/help/content/fi/server.html
+++ b/src/vidalia/help/content/fi/server.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/fi/troubleshooting.html b/src/vidalia/help/content/fi/troubleshooting.html
index 014c5c0..e56ac58 100644
--- a/src/vidalia/help/content/fi/troubleshooting.html
+++ b/src/vidalia/help/content/fi/troubleshooting.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/fr/bridges.html b/src/vidalia/help/content/fr/bridges.html
index 1e488af..b362ba5 100644
--- a/src/vidalia/help/content/fr/bridges.html
+++ b/src/vidalia/help/content/fr/bridges.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fr/config.html b/src/vidalia/help/content/fr/config.html
index 4985cde..730acac 100644
--- a/src/vidalia/help/content/fr/config.html
+++ b/src/vidalia/help/content/fr/config.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fr/index.html b/src/vidalia/help/content/fr/index.html
index b21b355..fdc40ad 100644
--- a/src/vidalia/help/content/fr/index.html
+++ b/src/vidalia/help/content/fr/index.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fr/links.html b/src/vidalia/help/content/fr/links.html
index 512c41b..f7771a4 100644
--- a/src/vidalia/help/content/fr/links.html
+++ b/src/vidalia/help/content/fr/links.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fr/log.html b/src/vidalia/help/content/fr/log.html
index e83b992..c29f95f 100644
--- a/src/vidalia/help/content/fr/log.html
+++ b/src/vidalia/help/content/fr/log.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fr/netview.html b/src/vidalia/help/content/fr/netview.html
index 1b744af..0343ccc 100644
--- a/src/vidalia/help/content/fr/netview.html
+++ b/src/vidalia/help/content/fr/netview.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fr/running.html b/src/vidalia/help/content/fr/running.html
index 54c0115..ab0f2da 100644
--- a/src/vidalia/help/content/fr/running.html
+++ b/src/vidalia/help/content/fr/running.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fr/server.html b/src/vidalia/help/content/fr/server.html
index d02e09a..1ed055b 100644
--- a/src/vidalia/help/content/fr/server.html
+++ b/src/vidalia/help/content/fr/server.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fr/services.html b/src/vidalia/help/content/fr/services.html
index 7f4265d..dff8776 100644
--- a/src/vidalia/help/content/fr/services.html
+++ b/src/vidalia/help/content/fr/services.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/fr/troubleshooting.html b/src/vidalia/help/content/fr/troubleshooting.html
index 5f37a32..79873fd 100644
--- a/src/vidalia/help/content/fr/troubleshooting.html
+++ b/src/vidalia/help/content/fr/troubleshooting.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/it/links.html b/src/vidalia/help/content/it/links.html
index 3fc47eb..68e8cff 100644
--- a/src/vidalia/help/content/it/links.html
+++ b/src/vidalia/help/content/it/links.html
@@ -1,15 +1,15 @@
<!--
-** $Id: links.html 4323 2010-06-26 15:46:44Z runa $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/my/bridges.html b/src/vidalia/help/content/my/bridges.html
index 5b2567c..9a59daf 100644
--- a/src/vidalia/help/content/my/bridges.html
+++ b/src/vidalia/help/content/my/bridges.html
@@ -1,15 +1,15 @@
<!--
-** $Id: bridges.html 3007 2008-08-22 00:12:08Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/my/config.html b/src/vidalia/help/content/my/config.html
index 693c1d2..e3ae08d 100644
--- a/src/vidalia/help/content/my/config.html
+++ b/src/vidalia/help/content/my/config.html
@@ -1,15 +1,15 @@
<!--
-** $Id: config.html 4323 2010-06-26 15:46:44Z runa $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/my/index.html b/src/vidalia/help/content/my/index.html
index 1704fa3..7782308 100644
--- a/src/vidalia/help/content/my/index.html
+++ b/src/vidalia/help/content/my/index.html
@@ -1,15 +1,15 @@
<!--
-** $Id: index.html 2366 2008-03-01 17:58:23Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/my/links.html b/src/vidalia/help/content/my/links.html
index 0f5678d..5f92f10 100644
--- a/src/vidalia/help/content/my/links.html
+++ b/src/vidalia/help/content/my/links.html
@@ -1,15 +1,15 @@
<!--
-** $Id: links.html 4323 2010-06-26 15:46:44Z runa $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/my/log.html b/src/vidalia/help/content/my/log.html
index 2ea865d..862fbc5 100644
--- a/src/vidalia/help/content/my/log.html
+++ b/src/vidalia/help/content/my/log.html
@@ -1,15 +1,15 @@
<!--
-** $Id: log.html 4323 2010-06-26 15:46:44Z runa $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/my/netview.html b/src/vidalia/help/content/my/netview.html
index 9f504ed..bd1fab2 100644
--- a/src/vidalia/help/content/my/netview.html
+++ b/src/vidalia/help/content/my/netview.html
@@ -1,15 +1,15 @@
<!--
-** $Id: netview.html 2366 2008-03-01 17:58:23Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/my/running.html b/src/vidalia/help/content/my/running.html
index fb3a058..e42f841 100644
--- a/src/vidalia/help/content/my/running.html
+++ b/src/vidalia/help/content/my/running.html
@@ -1,15 +1,15 @@
<!--
-** $Id: running.html 2366 2008-03-01 17:58:23Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/my/server.html b/src/vidalia/help/content/my/server.html
index 6dae358..8823957 100644
--- a/src/vidalia/help/content/my/server.html
+++ b/src/vidalia/help/content/my/server.html
@@ -1,15 +1,15 @@
<!--
-** $Id: server.html 4323 2010-06-26 15:46:44Z runa $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/my/services.html b/src/vidalia/help/content/my/services.html
index b13f598..9d1c92c 100644
--- a/src/vidalia/help/content/my/services.html
+++ b/src/vidalia/help/content/my/services.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/my/troubleshooting.html b/src/vidalia/help/content/my/troubleshooting.html
index 112d41d..5bfd4e0 100644
--- a/src/vidalia/help/content/my/troubleshooting.html
+++ b/src/vidalia/help/content/my/troubleshooting.html
@@ -1,15 +1,15 @@
<!--
-** $Id: troubleshooting.html 4366 2010-08-03 18:21:39Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/nl/index.html b/src/vidalia/help/content/nl/index.html
index 3fb60db..2289b41 100644
--- a/src/vidalia/help/content/nl/index.html
+++ b/src/vidalia/help/content/nl/index.html
@@ -1,15 +1,15 @@
<!--
-** $Id: index.html 2366 2008-03-01 17:58:23Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/nl/links.html b/src/vidalia/help/content/nl/links.html
index bbd48a8..a1d021e 100644
--- a/src/vidalia/help/content/nl/links.html
+++ b/src/vidalia/help/content/nl/links.html
@@ -1,15 +1,15 @@
<!--
-** $Id: links.html 4323 2010-06-26 15:46:44Z runa $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/nl/running.html b/src/vidalia/help/content/nl/running.html
index 9085702..82173cb 100644
--- a/src/vidalia/help/content/nl/running.html
+++ b/src/vidalia/help/content/nl/running.html
@@ -1,15 +1,15 @@
<!--
-** $Id: running.html 2366 2008-03-01 17:58:23Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/pl/bridges.html b/src/vidalia/help/content/pl/bridges.html
index c3e0a35..40a8e93 100644
--- a/src/vidalia/help/content/pl/bridges.html
+++ b/src/vidalia/help/content/pl/bridges.html
@@ -1,15 +1,15 @@
<!--
-** $Id: bridges.html 3007 2008-08-22 00:12:08Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/pl/index.html b/src/vidalia/help/content/pl/index.html
index d883a94..a37c481 100644
--- a/src/vidalia/help/content/pl/index.html
+++ b/src/vidalia/help/content/pl/index.html
@@ -1,15 +1,15 @@
<!--
-** $Id: index.html 2366 2008-03-01 17:58:23Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/pl/links.html b/src/vidalia/help/content/pl/links.html
index c9c073c..50514ae 100644
--- a/src/vidalia/help/content/pl/links.html
+++ b/src/vidalia/help/content/pl/links.html
@@ -1,15 +1,15 @@
<!--
-** $Id: links.html 4323 2010-06-26 15:46:44Z runa $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/po/.tx/config b/src/vidalia/help/content/po/.tx/config
index df54520..3e69947 100644
--- a/src/vidalia/help/content/po/.tx/config
+++ b/src/vidalia/help/content/po/.tx/config
@@ -1,49 +1,49 @@
-[torproject.vidalia-help-bridges-pot]
+[torproject.2-vidalia-help-bridges-pot]
file_filter = <lang>/bridges.po
source_file = templates/bridges.pot
source_lang = en
-[torproject.vidalia-help-links-pot]
+[torproject.3-vidalia-help-links-pot]
file_filter = <lang>/links.po
source_file = templates/links.pot
source_lang = en
-[torproject.vidalia-help-netview-pot]
+[torproject.3-vidalia-help-netview-pot]
file_filter = <lang>/netview.po
source_file = templates/netview.pot
source_lang = en
-[torproject.vidalia-help-running-pot]
+[torproject.2-vidalia-help-running-pot]
file_filter = <lang>/running.po
source_file = templates/running.pot
source_lang = en
-[torproject.vidalia-help-troubleshooting-pot]
+[torproject.2-vidalia-help-troubleshooting-pot]
file_filter = <lang>/troubleshooting.po
source_file = templates/troubleshooting.pot
source_lang = en
-[torproject.vidalia-help-config-pot]
+[torproject.3-vidalia-help-config-pot]
file_filter = <lang>/config.po
source_file = templates/config.pot
source_lang = en
-[torproject.vidalia-help-log-pot]
+[torproject.3-vidalia-help-log-pot]
file_filter = <lang>/log.po
source_file = templates/log.pot
source_lang = en
-[torproject.vidalia-help-index-pot]
+[torproject.3-vidalia-help-index-pot]
file_filter = <lang>/index.po
source_file = templates/index.pot
source_lang = en
-[torproject.vidalia-help-server-pot]
+[torproject.3-vidalia-help-server-pot]
file_filter = <lang>/server.po
source_file = templates/server.pot
source_lang = en
-[torproject.vidalia-help-services-pot]
+[torproject.3-vidalia-help-services-pot]
file_filter = <lang>/services.po
source_file = templates/services.pot
source_lang = en
diff --git a/src/vidalia/help/content/po/af/config.po b/src/vidalia/help/content/po/af/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/af/config.po
+++ b/src/vidalia/help/content/po/af/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/af/index.po b/src/vidalia/help/content/po/af/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/af/index.po
+++ b/src/vidalia/help/content/po/af/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/af/links.po b/src/vidalia/help/content/po/af/links.po
index 3d33249..1a9ffda 100644
--- a/src/vidalia/help/content/po/af/links.po
+++ b/src/vidalia/help/content/po/af/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/af/log.po b/src/vidalia/help/content/po/af/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/af/log.po
+++ b/src/vidalia/help/content/po/af/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/af/netview.po b/src/vidalia/help/content/po/af/netview.po
index 47f3d73..41a9038 100644
--- a/src/vidalia/help/content/po/af/netview.po
+++ b/src/vidalia/help/content/po/af/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/af/running.po b/src/vidalia/help/content/po/af/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/af/running.po
+++ b/src/vidalia/help/content/po/af/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/af/server.po b/src/vidalia/help/content/po/af/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/af/server.po
+++ b/src/vidalia/help/content/po/af/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/af/services.po b/src/vidalia/help/content/po/af/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/af/services.po
+++ b/src/vidalia/help/content/po/af/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/af/troubleshooting.po b/src/vidalia/help/content/po/af/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/af/troubleshooting.po
+++ b/src/vidalia/help/content/po/af/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ak/config.po b/src/vidalia/help/content/po/ak/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ak/config.po
+++ b/src/vidalia/help/content/po/ak/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ak/index.po b/src/vidalia/help/content/po/ak/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ak/index.po
+++ b/src/vidalia/help/content/po/ak/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ak/links.po b/src/vidalia/help/content/po/ak/links.po
index 3d33249..257d8ac 100644
--- a/src/vidalia/help/content/po/ak/links.po
+++ b/src/vidalia/help/content/po/ak/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ak\n"
+"Plural-Forms: nplurals=2; plural=n > 1\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/ak/log.po b/src/vidalia/help/content/po/ak/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ak/log.po
+++ b/src/vidalia/help/content/po/ak/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ak/netview.po b/src/vidalia/help/content/po/ak/netview.po
index 47f3d73..c3d32d8 100644
--- a/src/vidalia/help/content/po/ak/netview.po
+++ b/src/vidalia/help/content/po/ak/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ak\n"
+"Plural-Forms: nplurals=2; plural=n > 1\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/ak/running.po b/src/vidalia/help/content/po/ak/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ak/running.po
+++ b/src/vidalia/help/content/po/ak/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ak/server.po b/src/vidalia/help/content/po/ak/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ak/server.po
+++ b/src/vidalia/help/content/po/ak/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ak/services.po b/src/vidalia/help/content/po/ak/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ak/services.po
+++ b/src/vidalia/help/content/po/ak/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ak/troubleshooting.po b/src/vidalia/help/content/po/ak/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ak/troubleshooting.po
+++ b/src/vidalia/help/content/po/ak/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/am/config.po b/src/vidalia/help/content/po/am/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/am/config.po
+++ b/src/vidalia/help/content/po/am/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/am/index.po b/src/vidalia/help/content/po/am/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/am/index.po
+++ b/src/vidalia/help/content/po/am/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/am/links.po b/src/vidalia/help/content/po/am/links.po
index 3d33249..354628e 100644
--- a/src/vidalia/help/content/po/am/links.po
+++ b/src/vidalia/help/content/po/am/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: am\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/am/log.po b/src/vidalia/help/content/po/am/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/am/log.po
+++ b/src/vidalia/help/content/po/am/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/am/netview.po b/src/vidalia/help/content/po/am/netview.po
index 47f3d73..7ae44b2 100644
--- a/src/vidalia/help/content/po/am/netview.po
+++ b/src/vidalia/help/content/po/am/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: am\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/am/running.po b/src/vidalia/help/content/po/am/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/am/running.po
+++ b/src/vidalia/help/content/po/am/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/am/server.po b/src/vidalia/help/content/po/am/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/am/server.po
+++ b/src/vidalia/help/content/po/am/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/am/services.po b/src/vidalia/help/content/po/am/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/am/services.po
+++ b/src/vidalia/help/content/po/am/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/am/troubleshooting.po b/src/vidalia/help/content/po/am/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/am/troubleshooting.po
+++ b/src/vidalia/help/content/po/am/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ar/config.po b/src/vidalia/help/content/po/ar/config.po
index b8d0f05..6823c38 100644
--- a/src/vidalia/help/content/po/ar/config.po
+++ b/src/vidalia/help/content/po/ar/config.po
@@ -1,35 +1,22 @@
#
-# $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.
-#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2010-09-02 05:38+0200\n"
-"Last-Translator: shadi <shadi at 35point5.com>\n"
+"PO-Revision-Date: 2011-03-22 16:41+0000\n"
+"Last-Translator: gahgeer <gahgeer at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
#. type: Content of: <html><body><h1>
#: en/config.html:16
msgid "Configuring Vidalia and Tor"
-msgstr "تكوين فيداليا وتور"
+msgstr " تهيئة فيداليا و تور"
#. type: Content of: <html><body><p>
#: en/config.html:20
@@ -38,9 +25,9 @@ msgid ""
"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."
msgstr ""
-"يسمح لك فيداليا بتكوين بعض الجوانب المعدلة الأكثر شيوعا لفيداليا وتور. يسمح "
-"لك ايضا بضبط وإدارة <a href=\"server.html\">مرحل تور</a> حتى تتمكن من مساعدة "
-"شبكة تور بالنموّ.."
+"فيداليا يسمح لك بتهيئة بعض الجوانب التي يعدلها العديد من مستخدمي فيداليا و "
+"تور. كما أنه يتيح لك إنشاء وإدارة <a href=\"server.html\">توصيلة تور</a> حتى"
+" تتمكن من مساعدة شبكة تور على النمو."
#. type: Content of: <html><body>
#: en/config.html:26
@@ -50,26 +37,29 @@ msgstr "<a name=\"general\"/>"
#. type: Content of: <html><body><h3>
#: en/config.html:27
msgid "General Settings"
-msgstr "إعدادات عامة"
+msgstr "الإعدادات العامة"
#. type: Content of: <html><body><p>
#: en/config.html:29
-msgid "Settings on the <i>General</i> page are the most commonly modified settings."
-msgstr "الاعدادات في الصفحة <i>العامة</i> هي الإعدادات الأكثر تعديلا."
+msgid ""
+"Settings on the <i>General</i> page are the most commonly modified settings."
+msgstr ""
+"الإعدادات على الصفحة <i>العامة</i>التي يرغب في تبديلها المستخدمون تشمل معظم"
+" الإعدادات."
#. type: Content of: <html><body><ul><li>
#: en/config.html:32
msgid ""
-"<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 "
+"<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."
msgstr ""
-"<b>تور التنفيذي</b>: هو تور التنفيذي الذي سوف يقوم فيداليا بتشغيله عند "
-"إختيارك <i>بدء</i> من قائمة الشريط. اذا كان لديك عدة إصدارات مثبتة لتور, "
-"يمكنك إخبار فيداليا أي إصدار تريد تشغيله عن طريق نقر زر <i>تصفّح</i> "
-"والانتقال الى تثبيت تور المعين الذي تريده."
+"<b>ملف تور التنفيذي</b> : هذا هو الملف القابل للتنفيذ الذي ستقوم بتشغيله "
+"فيداليا عند اختيار<i>ابدأ</i> من ايقونة تور. إذا كان عندك إصدارات متعددة من "
+"تور ، فمن الممكن أن تختار الإصدار الذي ترغب في تشغيله بالنقر على "
+"<i>استعراض</i والانتقال إلى تثبيت اصدار تور الذي تريد تثبيته."
#. type: Content of: <html><body><ul><li>
#: en/config.html:39
@@ -78,14 +68,14 @@ msgid ""
"automatically start Tor when Vidalia starts. You can also configure Vidalia "
"to run when your system starts (<i>Windows only</i>)."
msgstr ""
-"<b>خيارات بدء التشغيل</b>: هذا الإعداد يسمح لك بتشغيل فيداليا لتور تلقائيا "
-"عند تشغيل فيداليا. يمكنك أيضا تكوين فيداليا ليتم تشغيله عند بدء تشغيل النظام "
-"الخاص بك (<i>نظام ويندوز فقط</i>)."
+"<b>بدء التشغيل خيارات</b> : هذا الإعداد يسمح بجعل تور يعمل تلقائيا عندما "
+"يبدأ فيداليا. يمكنك أيضا تهيئة فيداليا بحيث يعمل عند بدء تشغيل جهاز الكبموتر"
+" <i>(ويندوز فقط).</i>"
#. type: Content of: <html><body>
#: en/config.html:46
msgid "<a name=\"network\"/>"
-msgstr "<a name=\"network\"/>"
+msgstr "<a name=\"الشبكة\"/>"
#. type: Content of: <html><body><h3>
#: en/config.html:47
@@ -95,9 +85,11 @@ msgstr "إعدادات الشبكة"
#. type: Content of: <html><body><p>
#: en/config.html:49
msgid ""
-"The <i>Network</i> settings page lets you change how Tor connects to the Tor "
-"network."
-msgstr "صفحة إعدادات <i>الشبكة</i> تتيح لك تغيير كيفية إتصال تور بشبكة تور."
+"The <i>Network</i> settings page lets you change how Tor connects to the Tor"
+" network."
+msgstr ""
+"صفحة إعدادات <i>الشبكة</i> تتيح لك تغيير كيف يتصل برنامج تور بشبكة تور "
+"المركزية."
#. type: Content of: <html><body><ul><li>
#: en/config.html:53
@@ -110,13 +102,12 @@ msgid ""
"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."
msgstr ""
-"<b>أنا أستخدم وكيل للوصول الى الانترنت</b>: اذا كان اتصال الانترنت الخاص بك "
-"يتطلب وكيل بروتوكول نقل النص التشعبي (HTTP), يمكنك تكوين تور لإرسال جميع "
-"طلبات الدليل الخاصة به واتصالات مرحل تور من خلال الوكيل الخاص بك. يجب عليك "
-"تحديد على الاقل اسم المسضيف أو عنوان الوكيل الخاص بك, والمنفذ الذي يصغي اليه "
-"الوكيل الخاص بك للاتصالات. اذا طلب وكيلك مصادقة, يمكنك ايضا إدخال <i>اسم "
-"المستخدم</i> و <i>كلمة المرور</i> الذين تستخدمهم للاتصال بالوكيل الخاص بك. "
-"وإلا, يمكنك ترك هذه الحقول فارغة."
+"<b>أنا استخدم وكيل للوصول إلى الإنترنت</b> : إذا كان اتصال إنترنت لديك يتطلب"
+" عنوان البروكسي ، يمكنك تهيئة تور لإرسال جميع طلبات الدليل وتتابع الاتصالات "
+"من خلال البروكسي. يجب تحديد اسم المضيف أو عنوان الوكيل الخاص بك على الاقل، "
+"و البورت portالذي الوكيل يصغي للاتصالات. إذا الوكيل يتطلب ان كان البروكسي "
+"يتطلب التحقق ، فيمكنك أيضا إدخال <i>اسم المستخدم وكلمة المرور</i> الذي "
+"تستخدمه للاتصال . خلاف ذلك ، يمكنك ترك هذه الحقول فارغة."
#. type: Content of: <html><body><ul><li>
#: en/config.html:62
@@ -125,14 +116,14 @@ msgid ""
"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>)"
+"list of ports permitted by your firewall or proxy, separated by commas. "
+"(<i>Example: 80,443,8080</i>)"
msgstr ""
-"<b>جدار الحماية الخاص بي يسمح لي فقط بالاتصال بمنافذ معينة</b>: إذا كنت تعمل "
-"خلف جدار حماية أو وكيل تقييدي يحد من المنافذ التي يمكنك الاتصال بها, يمكنك "
-"تكوين تور للاتصال مباشرة بمرحلات فقط تستمع على المنافذ المسموح بها من قبل "
-"جدار الحماية أو الوكيل الخاص بك. يكفي أن تدخل قائمة المنافذ التي يسمح بها "
-"جدار الحماية أو الوكيل الخاص بك, مفصولة بفواصل. (<i>مثال: 80,443,8080</i>)"
+"<b> فقط جدار الحماية يتيح لي الاتصال بمنافذ معينة</b> : إذا كنت خلف جدار "
+"حماية أو أي قيود تحد من استخدام البورتات للاتصال بشبكة تور، يمكنك تهيئة تور"
+" للتواصل فقط مع تبديلات مسموح بها من قبل جدار الحماية أو البروكسي. يكفي أن "
+"تدخل قائمة المنافذ او البورتات التي يسمح بها جدار الحماية أو الوكيل ، بينها "
+"فاصلة . <i>(مثال : 80،443،8080)</i>"
#. type: Content of: <html><body><ul><li>
#: en/config.html:69
@@ -141,20 +132,19 @@ msgid ""
"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."
+"or newer only). You can add bridge relays by specifying either their address"
+" and port number, or their address, port number, and fingerprint."
msgstr ""
-"<b>مزود خدمة الانترنت (ISP) الخاص بي يمنع الاتصالات الى شبكة تور</b>: اذا "
-"كان مزود خدمة الانترنت (ISP) الخاص بك يمنع الاتصالات الى شبكة تور, يستطيع "
-"تور محاولة تجنب التعرض للتصفية عن طريق تشفير اتصالات الدليل الخاص به "
-"والاتصال بشبكة تور عبر مرحلات تسمى <i>جسور</i> (Tor 0.2.0.3-alpha او احدث "
-"فقط). يمكنك إضافة مرحلات جسر عن طريق تحديد إما عنوان ورقم المنفذ الخاص بهم "
-"او العنوان ورقم المنفذ والبصمة الخاص بهم."
+"<b>مقدمي خدمات الإنترنت يحظر الاتصال بشبكة تور</b> : إذا كان (مقدم الخدمة) "
+"يحظر الاتصالات مع شبكة تور ، فإن تور بامكانه محاولة تجنب منعها من خلال "
+"تشفير الاتصالات والاتصال بالشبكة من خلال التبديلات والتي تسمى <i>الجسور</i> "
+"(تور 0.2.0.3-ألفا أو طرازات أحدث). يمكنك إضافة جسور إما عن طريق تحديد "
+"عنوانهم ورقم المنفذ ، أو عنوان ورقم المنفذ ، وبصمته."
#. type: Content of: <html><body><ul><li>
#: en/config.html:77
msgid "Below are examples of valid bridge address formats:"
-msgstr "وفيما يلي أمثلة على صيغ عنوان جسر صالح:"
+msgstr "فيما يلي أمثلة من نماذج صالحة للجسور : "
#. type: Content of: <html><body><ul><li><ul><li>
#: en/config.html:80
@@ -176,44 +166,44 @@ msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
msgid ""
"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 "
+"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."
msgstr ""
-"حتى اذا كنت لا تعرف اية عناوين مرحّل الجسر, تفقّد صندوق الفحص يمكن ان لا "
-"يزال مفيدا. سوف يقوم تور بتشفير طلبات الدليل الخاص به التي يمكنها هزيمة "
-"آليات المنع التي تحاول تصفية طلبات تور للحصول على معلومات حول المرحلات "
-"الأخرى. اذا كانت الاتصالات الى مرحلات تور العادية محظورة ايضا, فإنك تحتاج "
-"الى تعلّم عنوان مرحل جسر بطريقة ما وإضافته هنا. أنظر موضوع المساعدة حول <a "
-"href=\"bridges.html#finding\">إيجاد مرحلات جسر</a> للمزيد من المعلومات حول "
-"كيفية تعلّم عناوين مرحّل الجسر والبصمات."
+"وحتى لو كنت لا تعرف أي عناوين للجسور ، قد يكون اختيار هذا الخيار مفيدا. سوف "
+"يقوم تور بتشفير طلبات الدليل الخاص به ، والتي يمكنها من هزيمة آليات الحظر "
+"التي تحاول منع طلبات تور من الحصول على معلومات عن تبديلات أخرى. إذا منعت "
+"تبديلات تور العادية ايضا، ثم كنت بحاجة لمعرفة عنوان تتابع جسر بطريقة ما أو "
+"بأخرى وإضافته هنا. راجع موضوع المساعدة فى <a "
+"href=\"bridges.html#finding\">إيجاد تبديلات للجسور</a> لمزيد من المعلومات "
+"حول كيفية معرفة عناوين جديدة لتتابع الجسور وبصماتها ."
#. type: Content of: <html><body>
#: en/config.html:100
msgid "<a name=\"relay\"/>"
-msgstr "<a name=\"relay\"/>"
+msgstr "<a name=\"تبدية\"/>"
#. type: Content of: <html><body><h3>
#: en/config.html:101
msgid "Relay Settings"
-msgstr "إعدادات مرحل"
+msgstr "إعدادات التبديلات"
#. type: Content of: <html><body><p>
#: en/config.html:103
msgid ""
-"<i> See <a href=\"server.html\">this help topic</a> for detailed information "
-"about setting up and managing a Tor relay. </i>"
+"<i> See <a href=\"server.html\">this help topic</a> for detailed information"
+" about setting up and managing a Tor relay. </i>"
msgstr ""
-"<i> أنظر <a href=\"server.html\">موضوع المساعدة هذا</a> للحصول على معلومات "
-"مفصّلة حول ضبط وإدارة مرحّل تور. </i>"
+"<i>انظر <a href=\"server.html\">هذا الموضوع مساعدة</a> للحصول على معلومات "
+"مفصلة حول إنشاء وإدارة تبديلة تور.</i>"
#. type: Content of: <html><body>
#: en/config.html:109
msgid "<a name=\"appearance\"/>"
-msgstr "<a name=\"appearance\"/>"
+msgstr "<a name=\"لمظهر\"/>"
#. type: Content of: <html><body><h3>
#: en/config.html:110
@@ -225,23 +215,23 @@ msgstr "إعدادات المظهر"
msgid ""
"The settings on the <i>Appearance</i> page allow you to customize the look "
"and feel of Vidalia."
-msgstr "الاعدادات في صفحة <i>المظهر</i> تسمح لك بتخصيص شكل وأسلوب فيداليا."
+msgstr "الإعدادات على صفحة <i>المظهر</i> تسمح لك بتخصيص مظهر فيداليا."
#. type: Content of: <html><body><ul><li>
#: en/config.html:116
msgid ""
-"<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."
+"<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."
msgstr ""
-"<b>اللغة</b>: تم ترجمت واجهة فيداليا إلى لغات عديدة من قبل متطوعين مساعدين. "
-"عند تشغيل فيداليا لأول مرة, سوف يحاول تخمين أي لغة يستخدمها جهازك حاليا. اذا "
-"كانت تخمينات فيداليا غير صحيحة أو إذا كنت تفضل لغة مختلفة, يمكنك اختيار لغة "
-"أخرى من صندوق القائمة المنسدلة. سوف تحتاج إلى إعادة تشغيل فيداليا بعد تغيير "
-"لغة العرض لتصبح التغييرات نافذة المفعول."
+"<b>اللغة</b> :تم ترجمة واجهة فيداليا إلى العديد من اللغات من قبل المتطوعين. "
+"عندما يتم تشغيل فيداليا للمرة الأولى ، فإنه سيحاول تخمين لغة الكمبيوتر التي "
+"تستخدمها حاليا. إذا كتن تخمين فيداليا غير صحيح ، أو إذا كنت تفضل لغة مختلفة "
+"، يمكنك اختيار لغة أخرى من مربع القائمة المنسدلة. سوف تحتاج إلى إعادة تشغيل "
+"فيداليا مرة اخرى بعد تغيير لغة العرض لتصبح التغييرات نافذة المفعول."
#. type: Content of: <html><body><ul><li>
#: en/config.html:124
@@ -250,14 +240,14 @@ msgid ""
"default interface style. If you dislike the default, you can choose "
"whichever interface style you prefer from the dropdown box."
msgstr ""
-"<b>الأسلوب</b>: في معظم الحالات، سوف يقوم فيداليا افتراضيا بإستخدام أسلوب "
-"الواجهة الافتراضي للنظام الأساسي الخاص بك. إذا لم يعجبك الخيار الافتراضي، "
-"يمكنك اختيار أي أسلوب واجهة تفضل من صندوق القائمة المنسدلة."
+"<b>النمط</b> : في معظم الحالات ، سوف يقوم فيداليا باستخدام النمط الافتراضي "
+"على جهازك . إذا كان لا يروقك النمط الافتراضي ، يمكنك اختيار نمط واجهة آخر من"
+" مربع القائمة المنسدلة."
#. type: Content of: <html><body>
#: en/config.html:131
msgid "<a name=\"advanced\"/>"
-msgstr "<a name=\"advanced\"/>"
+msgstr "<a name=\"متقدمة\"/>"
#. type: Content of: <html><body><h3>
#: en/config.html:132
@@ -270,21 +260,21 @@ msgid ""
"The settings on the <i>Advanced</i> page should generally only be modified "
"by more experienced users."
msgstr ""
-"الاعدادات في الصفحة <i>المتقدمة</i> ينبغي تعديلها بشكل عام فقط من قبل "
-"مستخدمين أكثر خبرة."
+" <i>الصفحة المتقدمة </i> عموما ينبغي أن يتم تعديل الإعدادات فقط من قبل ذوي "
+"الخبرة على."
#. type: Content of: <html><body><ul><li>
#: en/config.html:138
msgid ""
-"<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 "
+"<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."
msgstr ""
-"<b>العنوان ومنفذ التحكم</b>: منفذ <i>التحكم</i> هو المنفذ الذي يستخدمه "
-"فيداليا للاتصال مع تور. هذا لا يحتاج إلى تغيير ما لم يكن لديك تعارض مع خدمة "
-"أخرى على جهازك, أو إذا كنت تستخدم فيداليا للتحكم ومراقبة عملية لتور تعمل على "
-"جهاز آخر."
+"<b>التحكم بالعنوان <i>والمنفذ</i></b> : <b>بالمنفذ</b> <i>التحكم</i> هو "
+"المنفذ الذي يستخدم فيداليا لاجراء اتصال مع تور. هذا لا يحتاج إلى تغيير ما لم"
+" يكن لديه تعارض مع خدمة أخرى على جهازك ، أو إذا كنت تستخدم فيداليا لمراقبة "
+"ورصد اتصال لتور على جهاز آخر."
#. type: Content of: <html><body><ul><li>
#: en/config.html:144
@@ -293,9 +283,9 @@ msgid ""
"limit the applications on your machine that can connect to and reconfigure "
"your Tor installation. The available authentication methods are:"
msgstr ""
-"<b>مصادقة منفذ التحكم</b>: تستخدم مصادقة منفذ التحكم للحد من التطبيقات على "
-"جهازك التي يمكن الاتصال بها وإعادة تكوين تثبيت تور. أساليب المصادقة المتوفرة "
-"هي:"
+"<b>التحكم بمصادقة المنافذ</b>يستخدم التحكم بمصادقة المنافذ لتقييد عدد "
+"التطبيقات على جهازك التي باستطاعتها الاتصال و تهيئة تثبيت تور . أساليب "
+"المصادقة المتوفرة: :"
#. type: Content of: <html><body><ul><li><ul><li>
#: en/config.html:150
@@ -304,8 +294,8 @@ msgid ""
"<b>strongly</b> discouraged. Any application or user on your computer can "
"reconfigure your Tor installation."
msgstr ""
-"<b>لا يوجد</b> -- لا يلزم مصادقة. إستخدام هذا الخيار <b>مثبّط</b> بقوة. "
-"يستطيع أي تطبيق أو مستخدم على جهاز الكمبيوتر الخاص بك إعادة تكوين تثبيت تور."
+"لا مصادقة مطلوبة <b>بلا</b> --. الخيار <b>بشدة</b> استخدام هذا الخيار غير "
+"مفضل. ويمكن لأي مستخدم على الكمبيوتر الخاص بك تهيئة تثبيت تور ."
#. type: Content of: <html><body><ul><li><ul><li>
#: en/config.html:155
@@ -313,27 +303,26 @@ msgid ""
"<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."
+"Vidalia randomly generate a new password each time it starts Tor by checking"
+" the <i>Randomly Generate</i> checkbox."
msgstr ""
-"<b>كلمة المرور</b> <i>(افتراضيا)</i> -- اذا تم إختيار هذه الطريقة, يمكنك "
-"تحديد كلمة المرور التي سوف يطلبها تور في كل مرة يقوم مستخدم أو تطبيق "
-"بالاتصال بمنفذ التحكم لتور. اذا قام فيداليا بتشغيل تور لك, يمكنك جعل فيداليا "
-"يولّد كلمة مرور جديدة عشوائيا في كل مرة يقوم بتشغيل تور عن طريق تفقد صندوق "
-"فحص <i>التوليد العشوائي</i>."
+"<b>كلمة المرور</b> <i>(الافتراضي)</i> -- إذا تم تحديد هذا الأسلوب ، يمكنك "
+"تحديد كلمة السر التي يطلبها تور في كل مرة يتصل مستخدم على منفذ تور. إذا قام "
+"فيداليا بتشغيل تور لك ، يمكن له توليد كلمة سر جديدة في كل مرة يبدأ تور عن "
+"طريق التحقق من صندوق <i>شكل عشوائي.</i> "
#. type: Content of: <html><body><ul><li><ul><li>
#: en/config.html:162
msgid ""
-"<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 "
+"<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."
msgstr ""
-"<b>ملف تعريف الارتباط</b> -- اذا تم إختيار مصادقة ملف تعريف الارتباط, سوف "
-"يقوم تور بكتابة ملف (أو, <i>ملف تعريف الارتباط</i>) يحتوي بايتات عشوائية "
-"لدليل البيانات الخاص به عند تشغيله. أي مستخدم أو تطبيق يحاول الاتصال بمنفذ "
-"التحكم لتور يجب أن يكون قادرا على توفير محتويات ملف تعريف الارتباط هذا ."
+"<b> الكعكات كوكيز</b> -- اذا تم اختيار التحقق من الكوكيز ، تور سينشئ ملف (أو"
+" <i>الكعكة)</i> التي تحتوي على بايت عشوائي إلى دليل البيانات الخاصة به عند "
+"بدء تشغيله. يجب أن يكون أي مستخدم يحاول الاتصال إلى منفذ تحكم تور قادرا على"
+" توفير محتويات هذه الكعكة."
#. type: Content of: <html><body><ul><li>
#: en/config.html:170
@@ -343,9 +332,9 @@ msgid ""
"file. If you leave this field blank, Tor will uses its own default torrc "
"location."
msgstr ""
-"<b>ملف تكوين تور</b> <i>(إختياري)</i>: يمكنك إستخدام هذا الخيار لجعل فيداليا "
-"يقوم بتشغيل تور بإستخدام <i>تورك</i> محدد, ملف تكوين تور. اذا تركت هذا "
-"الحقل فارغا, سوف يستخدم تور موقع تورك الافتراضي الخاص به."
+"<b> ملف تهيئة تور </b> <i>(اختياري)</i> : يمكنك استخدام هذا الخيار لبدء "
+"فيداليا تور باستخدام <i>torrc</i> محددة ، او ملف تهيئة تور. إذا تركت هذا "
+"الحقل فارغا ، سوف يستخدم تور موقعه الافتراضي torrc."
#. type: Content of: <html><body><ul><li>
#: en/config.html:175
@@ -355,40 +344,40 @@ msgid ""
"information, Tor relay keys, and configuration files. If you leave this "
"field blank, Tor will use its own default data directory location."
msgstr ""
-"<b>دليل بيانات تور</b> <i>(إختياري)</i>: يمكنك تحديد الدليل الذي سوف يقوم "
-"تور بتخزين بياناته المحفوظة, مثل معلومات مرحل تور المؤقتة, مفاتيح مرحل تور "
-"وملفات التكوين. اذا تركت هذا الحقل فارغا, سوف يستخدم تور موقع دليل البيانات "
-"الافتراضي الخاص به."
+"<b> دليل بيانات تور </b> <i>(اختياري)</i> : يمكنك تحديد الدليل الذي سيقوم "
+"تور بحفظ البيانات الخاصة فيه، مثل المعلومات المخزنة مؤقتا عن تبديلة تور ، "
+"مفاتيح تتابع تور ، وملفات التهيئة. إذا تركت هذا الحقل فارغا ، سوف يقوم تور "
+"بوضع البيانات الخاصة به في الدليل الافتراضي."
#. type: Content of: <html><body><ul><li>
#: en/config.html:181
msgid ""
-"<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 "
+"<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."
msgstr ""
-"<b>الأذونات</b> <i>(إختياري, غير متوفر في ويندوز)</i>: اذا قمت بإدخال قيمة "
-"<b>للتشغيل كمستخدم</b>, سوف يقوم تور <i>بضبط هوية المستخدم</i> لهذا المسخدم "
-"عند بدء تشغيله. اذا قمت بإدخال قيمة <b>للتشغيل كمجموعة</b>, سوف يقوم تور "
-"<i>بضبط هوية المجموعة</i> لهذه المجموعة عند بدء تشغيلها."
+"<b>أذونات</b> <i>(اختياري ، غيرمتوفر على ويندوز)</i> : إذا اخترت <b>تشغيل "
+"كمستخدم</b> ، سيقوم تور بعمل <i>setuid</i> لهذا المستخدم عند بدء تشغيله. "
+"إذا قمت بإختيار <b>تشغيل كمجموعة</b> ، سوف يقوم تور بعمل <i>setgid</i> إلى "
+"هذه المجموعة عند بدء تشغيله."
#. type: Content of: <html><body>
#: en/config.html:189
msgid "<a name=\"services\"/>"
-msgstr "<a name=\"services\"/>"
+msgstr "<a name=\"الخدمات\"/>"
#. type: Content of: <html><body><h3>
#: en/config.html:190
msgid "Hidden Service Settings"
-msgstr "إعدادات الخدمة الخفية"
+msgstr "إعدادات الخدمة المخفية"
#. type: Content of: <html><body><p>
#: en/config.html:192
msgid ""
-"Hidden services allow you to provide any kind of TCP-based service, e.g. an "
-"HTTP service, to others without revealing your IP address."
+"Hidden services allow you to provide any kind of TCP-based service, e.g. an"
+" HTTP service, to others without revealing your IP address."
msgstr ""
-"الخدمات الخفية تسمح لك بتقديم أي نوع من الخدمة على أساس برنامج التعاون الفني "
-"(TCP), على سبيل المثال: خدمة بروتوكول نقل النص التشعبي (HTTP), الى الآخرين "
-"بدون كشف عنوان IP الخاص بك."
+"الخدمات المخفية تسمح لك بتقديم أي نوع من الخدمة على أساس برنامج التعاون "
+"الفني ، على سبيل المثال خدمة النص المتشعب ، للآخرين دون الكشف عن عنوان "
+"بروتوكول الإنترنت الخاص بك."
diff --git a/src/vidalia/help/content/po/ar/index.po b/src/vidalia/help/content/po/ar/index.po
index f45b54a..934aa12 100644
--- a/src/vidalia/help/content/po/ar/index.po
+++ b/src/vidalia/help/content/po/ar/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ar/links.po b/src/vidalia/help/content/po/ar/links.po
index 97a895e..14f0e24 100644
--- a/src/vidalia/help/content/po/ar/links.po
+++ b/src/vidalia/help/content/po/ar/links.po
@@ -1,53 +1,40 @@
#
-# $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.
-#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: 2010-08-22 06:30+0200\n"
-"Last-Translator: shadi <shadi at 35point5.com>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr "روابط مفيدة"
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr "فيداليا"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr "وnbsp;وnbsp;وnbsp;"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr "الصفحة الرئيسية"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
@@ -56,71 +43,38 @@ msgstr ""
"https://www.torproject.org/vidalia/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr "ويكي (Wiki)"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> http://trac.vidalia-"
-"project.net/wiki</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr "متعقّب الأخطاء"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/report\"> http://trac.vidalia-"
-"project.net/report</a>"
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr "تور"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr "الأسئلة المتداولة (FAQ)"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
diff --git a/src/vidalia/help/content/po/ar/log.po b/src/vidalia/help/content/po/ar/log.po
index d3486c2..ca4d354 100644
--- a/src/vidalia/help/content/po/ar/log.po
+++ b/src/vidalia/help/content/po/ar/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ar/netview.po b/src/vidalia/help/content/po/ar/netview.po
index 9c06890..7ff8e18 100644
--- a/src/vidalia/help/content/po/ar/netview.po
+++ b/src/vidalia/help/content/po/ar/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ar/running.po b/src/vidalia/help/content/po/ar/running.po
index c98a05e..9f0cc52 100644
--- a/src/vidalia/help/content/po/ar/running.po
+++ b/src/vidalia/help/content/po/ar/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ar/server.po b/src/vidalia/help/content/po/ar/server.po
index 10110bb..24a82a0 100644
--- a/src/vidalia/help/content/po/ar/server.po
+++ b/src/vidalia/help/content/po/ar/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ar/services.po b/src/vidalia/help/content/po/ar/services.po
index e917c81..b63f2a8 100644
--- a/src/vidalia/help/content/po/ar/services.po
+++ b/src/vidalia/help/content/po/ar/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ar/troubleshooting.po b/src/vidalia/help/content/po/ar/troubleshooting.po
index fcc2278..d4af559 100644
--- a/src/vidalia/help/content/po/ar/troubleshooting.po
+++ b/src/vidalia/help/content/po/ar/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/arn/config.po b/src/vidalia/help/content/po/arn/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/arn/config.po
+++ b/src/vidalia/help/content/po/arn/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/arn/index.po b/src/vidalia/help/content/po/arn/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/arn/index.po
+++ b/src/vidalia/help/content/po/arn/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/arn/links.po b/src/vidalia/help/content/po/arn/links.po
index 3d33249..90757e1 100644
--- a/src/vidalia/help/content/po/arn/links.po
+++ b/src/vidalia/help/content/po/arn/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: arn\n"
+"Plural-Forms: nplurals=2; plural=n > 1\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/arn/log.po b/src/vidalia/help/content/po/arn/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/arn/log.po
+++ b/src/vidalia/help/content/po/arn/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/arn/netview.po b/src/vidalia/help/content/po/arn/netview.po
index 47f3d73..5ceca62 100644
--- a/src/vidalia/help/content/po/arn/netview.po
+++ b/src/vidalia/help/content/po/arn/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: arn\n"
+"Plural-Forms: nplurals=2; plural=n > 1\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/arn/running.po b/src/vidalia/help/content/po/arn/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/arn/running.po
+++ b/src/vidalia/help/content/po/arn/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/arn/server.po b/src/vidalia/help/content/po/arn/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/arn/server.po
+++ b/src/vidalia/help/content/po/arn/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/arn/services.po b/src/vidalia/help/content/po/arn/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/arn/services.po
+++ b/src/vidalia/help/content/po/arn/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/arn/troubleshooting.po b/src/vidalia/help/content/po/arn/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/arn/troubleshooting.po
+++ b/src/vidalia/help/content/po/arn/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ast/config.po b/src/vidalia/help/content/po/ast/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ast/config.po
+++ b/src/vidalia/help/content/po/ast/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ast/index.po b/src/vidalia/help/content/po/ast/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ast/index.po
+++ b/src/vidalia/help/content/po/ast/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ast/links.po b/src/vidalia/help/content/po/ast/links.po
index 3d33249..68c08ff 100644
--- a/src/vidalia/help/content/po/ast/links.po
+++ b/src/vidalia/help/content/po/ast/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/ast/log.po b/src/vidalia/help/content/po/ast/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ast/log.po
+++ b/src/vidalia/help/content/po/ast/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ast/netview.po b/src/vidalia/help/content/po/ast/netview.po
index 47f3d73..d8b3403 100644
--- a/src/vidalia/help/content/po/ast/netview.po
+++ b/src/vidalia/help/content/po/ast/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/ast/running.po b/src/vidalia/help/content/po/ast/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ast/running.po
+++ b/src/vidalia/help/content/po/ast/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ast/server.po b/src/vidalia/help/content/po/ast/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ast/server.po
+++ b/src/vidalia/help/content/po/ast/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ast/services.po b/src/vidalia/help/content/po/ast/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ast/services.po
+++ b/src/vidalia/help/content/po/ast/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ast/troubleshooting.po b/src/vidalia/help/content/po/ast/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ast/troubleshooting.po
+++ b/src/vidalia/help/content/po/ast/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/az/config.po b/src/vidalia/help/content/po/az/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/az/config.po
+++ b/src/vidalia/help/content/po/az/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/az/index.po b/src/vidalia/help/content/po/az/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/az/index.po
+++ b/src/vidalia/help/content/po/az/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/az/links.po b/src/vidalia/help/content/po/az/links.po
index 3d33249..c1a7e1a 100644
--- a/src/vidalia/help/content/po/az/links.po
+++ b/src/vidalia/help/content/po/az/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/az/log.po b/src/vidalia/help/content/po/az/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/az/log.po
+++ b/src/vidalia/help/content/po/az/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/az/netview.po b/src/vidalia/help/content/po/az/netview.po
index 47f3d73..094d880 100644
--- a/src/vidalia/help/content/po/az/netview.po
+++ b/src/vidalia/help/content/po/az/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/az/running.po b/src/vidalia/help/content/po/az/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/az/running.po
+++ b/src/vidalia/help/content/po/az/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/az/server.po b/src/vidalia/help/content/po/az/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/az/server.po
+++ b/src/vidalia/help/content/po/az/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/az/services.po b/src/vidalia/help/content/po/az/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/az/services.po
+++ b/src/vidalia/help/content/po/az/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/az/troubleshooting.po b/src/vidalia/help/content/po/az/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/az/troubleshooting.po
+++ b/src/vidalia/help/content/po/az/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/be/config.po b/src/vidalia/help/content/po/be/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/be/config.po
+++ b/src/vidalia/help/content/po/be/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/be/index.po b/src/vidalia/help/content/po/be/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/be/index.po
+++ b/src/vidalia/help/content/po/be/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/be/links.po b/src/vidalia/help/content/po/be/links.po
index 3d33249..113b905 100644
--- a/src/vidalia/help/content/po/be/links.po
+++ b/src/vidalia/help/content/po/be/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/be/log.po b/src/vidalia/help/content/po/be/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/be/log.po
+++ b/src/vidalia/help/content/po/be/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/be/netview.po b/src/vidalia/help/content/po/be/netview.po
index 47f3d73..8289556 100644
--- a/src/vidalia/help/content/po/be/netview.po
+++ b/src/vidalia/help/content/po/be/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/be/running.po b/src/vidalia/help/content/po/be/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/be/running.po
+++ b/src/vidalia/help/content/po/be/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/be/server.po b/src/vidalia/help/content/po/be/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/be/server.po
+++ b/src/vidalia/help/content/po/be/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/be/services.po b/src/vidalia/help/content/po/be/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/be/services.po
+++ b/src/vidalia/help/content/po/be/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/be/troubleshooting.po b/src/vidalia/help/content/po/be/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/be/troubleshooting.po
+++ b/src/vidalia/help/content/po/be/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bg/config.po b/src/vidalia/help/content/po/bg/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/bg/config.po
+++ b/src/vidalia/help/content/po/bg/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bg/index.po b/src/vidalia/help/content/po/bg/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/bg/index.po
+++ b/src/vidalia/help/content/po/bg/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bg/links.po b/src/vidalia/help/content/po/bg/links.po
index 3d33249..02b3929 100644
--- a/src/vidalia/help/content/po/bg/links.po
+++ b/src/vidalia/help/content/po/bg/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/bg/log.po b/src/vidalia/help/content/po/bg/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/bg/log.po
+++ b/src/vidalia/help/content/po/bg/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bg/netview.po b/src/vidalia/help/content/po/bg/netview.po
index 47f3d73..62bfd23 100644
--- a/src/vidalia/help/content/po/bg/netview.po
+++ b/src/vidalia/help/content/po/bg/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/bg/running.po b/src/vidalia/help/content/po/bg/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/bg/running.po
+++ b/src/vidalia/help/content/po/bg/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bg/server.po b/src/vidalia/help/content/po/bg/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/bg/server.po
+++ b/src/vidalia/help/content/po/bg/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bg/services.po b/src/vidalia/help/content/po/bg/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/bg/services.po
+++ b/src/vidalia/help/content/po/bg/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bg/troubleshooting.po b/src/vidalia/help/content/po/bg/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/bg/troubleshooting.po
+++ b/src/vidalia/help/content/po/bg/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bn/config.po b/src/vidalia/help/content/po/bn/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/bn/config.po
+++ b/src/vidalia/help/content/po/bn/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bn/index.po b/src/vidalia/help/content/po/bn/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/bn/index.po
+++ b/src/vidalia/help/content/po/bn/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bn/links.po b/src/vidalia/help/content/po/bn/links.po
index 3d33249..b3da2bb 100644
--- a/src/vidalia/help/content/po/bn/links.po
+++ b/src/vidalia/help/content/po/bn/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/bn/log.po b/src/vidalia/help/content/po/bn/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/bn/log.po
+++ b/src/vidalia/help/content/po/bn/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bn/netview.po b/src/vidalia/help/content/po/bn/netview.po
index 47f3d73..45b9b57 100644
--- a/src/vidalia/help/content/po/bn/netview.po
+++ b/src/vidalia/help/content/po/bn/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/bn/running.po b/src/vidalia/help/content/po/bn/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/bn/running.po
+++ b/src/vidalia/help/content/po/bn/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bn/server.po b/src/vidalia/help/content/po/bn/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/bn/server.po
+++ b/src/vidalia/help/content/po/bn/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bn/services.po b/src/vidalia/help/content/po/bn/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/bn/services.po
+++ b/src/vidalia/help/content/po/bn/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bn/troubleshooting.po b/src/vidalia/help/content/po/bn/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/bn/troubleshooting.po
+++ b/src/vidalia/help/content/po/bn/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bn_IN/config.po b/src/vidalia/help/content/po/bn_IN/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/bn_IN/config.po
+++ b/src/vidalia/help/content/po/bn_IN/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bn_IN/index.po b/src/vidalia/help/content/po/bn_IN/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/bn_IN/index.po
+++ b/src/vidalia/help/content/po/bn_IN/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bn_IN/links.po b/src/vidalia/help/content/po/bn_IN/links.po
index 3d33249..6901113 100644
--- a/src/vidalia/help/content/po/bn_IN/links.po
+++ b/src/vidalia/help/content/po/bn_IN/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/bn_IN/log.po b/src/vidalia/help/content/po/bn_IN/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/bn_IN/log.po
+++ b/src/vidalia/help/content/po/bn_IN/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bn_IN/netview.po b/src/vidalia/help/content/po/bn_IN/netview.po
index 47f3d73..b5b86d6 100644
--- a/src/vidalia/help/content/po/bn_IN/netview.po
+++ b/src/vidalia/help/content/po/bn_IN/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/bn_IN/running.po b/src/vidalia/help/content/po/bn_IN/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/bn_IN/running.po
+++ b/src/vidalia/help/content/po/bn_IN/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bn_IN/server.po b/src/vidalia/help/content/po/bn_IN/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/bn_IN/server.po
+++ b/src/vidalia/help/content/po/bn_IN/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bn_IN/services.po b/src/vidalia/help/content/po/bn_IN/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/bn_IN/services.po
+++ b/src/vidalia/help/content/po/bn_IN/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bn_IN/troubleshooting.po b/src/vidalia/help/content/po/bn_IN/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/bn_IN/troubleshooting.po
+++ b/src/vidalia/help/content/po/bn_IN/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bo/bridges.po b/src/vidalia/help/content/po/bo/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/bo/bridges.po
+++ b/src/vidalia/help/content/po/bo/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/bo/config.po b/src/vidalia/help/content/po/bo/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/bo/config.po
+++ b/src/vidalia/help/content/po/bo/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bo/index.po b/src/vidalia/help/content/po/bo/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/bo/index.po
+++ b/src/vidalia/help/content/po/bo/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bo/links.po b/src/vidalia/help/content/po/bo/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/bo/links.po
+++ b/src/vidalia/help/content/po/bo/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bo/log.po b/src/vidalia/help/content/po/bo/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/bo/log.po
+++ b/src/vidalia/help/content/po/bo/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bo/netview.po b/src/vidalia/help/content/po/bo/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/bo/netview.po
+++ b/src/vidalia/help/content/po/bo/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bo/running.po b/src/vidalia/help/content/po/bo/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/bo/running.po
+++ b/src/vidalia/help/content/po/bo/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bo/server.po b/src/vidalia/help/content/po/bo/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/bo/server.po
+++ b/src/vidalia/help/content/po/bo/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bo/services.po b/src/vidalia/help/content/po/bo/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/bo/services.po
+++ b/src/vidalia/help/content/po/bo/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bo/troubleshooting.po b/src/vidalia/help/content/po/bo/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/bo/troubleshooting.po
+++ b/src/vidalia/help/content/po/bo/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/br/bridges.po b/src/vidalia/help/content/po/br/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/br/bridges.po
+++ b/src/vidalia/help/content/po/br/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/br/config.po b/src/vidalia/help/content/po/br/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/br/config.po
+++ b/src/vidalia/help/content/po/br/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/br/index.po b/src/vidalia/help/content/po/br/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/br/index.po
+++ b/src/vidalia/help/content/po/br/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/br/links.po b/src/vidalia/help/content/po/br/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/br/links.po
+++ b/src/vidalia/help/content/po/br/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/br/log.po b/src/vidalia/help/content/po/br/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/br/log.po
+++ b/src/vidalia/help/content/po/br/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/br/netview.po b/src/vidalia/help/content/po/br/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/br/netview.po
+++ b/src/vidalia/help/content/po/br/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/br/running.po b/src/vidalia/help/content/po/br/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/br/running.po
+++ b/src/vidalia/help/content/po/br/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/br/server.po b/src/vidalia/help/content/po/br/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/br/server.po
+++ b/src/vidalia/help/content/po/br/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/br/services.po b/src/vidalia/help/content/po/br/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/br/services.po
+++ b/src/vidalia/help/content/po/br/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/br/troubleshooting.po b/src/vidalia/help/content/po/br/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/br/troubleshooting.po
+++ b/src/vidalia/help/content/po/br/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bs/bridges.po b/src/vidalia/help/content/po/bs/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/bs/bridges.po
+++ b/src/vidalia/help/content/po/bs/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/bs/config.po b/src/vidalia/help/content/po/bs/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/bs/config.po
+++ b/src/vidalia/help/content/po/bs/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bs/index.po b/src/vidalia/help/content/po/bs/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/bs/index.po
+++ b/src/vidalia/help/content/po/bs/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bs/links.po b/src/vidalia/help/content/po/bs/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/bs/links.po
+++ b/src/vidalia/help/content/po/bs/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bs/log.po b/src/vidalia/help/content/po/bs/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/bs/log.po
+++ b/src/vidalia/help/content/po/bs/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bs/netview.po b/src/vidalia/help/content/po/bs/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/bs/netview.po
+++ b/src/vidalia/help/content/po/bs/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bs/running.po b/src/vidalia/help/content/po/bs/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/bs/running.po
+++ b/src/vidalia/help/content/po/bs/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bs/server.po b/src/vidalia/help/content/po/bs/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/bs/server.po
+++ b/src/vidalia/help/content/po/bs/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bs/services.po b/src/vidalia/help/content/po/bs/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/bs/services.po
+++ b/src/vidalia/help/content/po/bs/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/bs/troubleshooting.po b/src/vidalia/help/content/po/bs/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/bs/troubleshooting.po
+++ b/src/vidalia/help/content/po/bs/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ca/config.po b/src/vidalia/help/content/po/ca/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ca/config.po
+++ b/src/vidalia/help/content/po/ca/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ca/index.po b/src/vidalia/help/content/po/ca/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ca/index.po
+++ b/src/vidalia/help/content/po/ca/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ca/links.po b/src/vidalia/help/content/po/ca/links.po
index 3d33249..c9d047b 100644
--- a/src/vidalia/help/content/po/ca/links.po
+++ b/src/vidalia/help/content/po/ca/links.po
@@ -1,112 +1,80 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 03:39+0000\n"
+"Last-Translator: Il_Tifossi <lluita_i_no_dorm at hotmail.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.5.3\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
-msgstr ""
+msgstr "Enllaços útils"
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
-msgstr ""
+msgstr "Vidalia"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
-msgstr ""
+msgstr " "
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
-msgstr ""
+msgstr "Pàgina d'inici"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
+"<a href=\"https://www.torproject.org/vidalia/\"> "
+"https://www.torproject.org/vidalia/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
-msgstr ""
+msgstr "Tor"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
-msgstr ""
+msgstr "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
-msgstr ""
+msgstr "Preguntes més freqüents"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/ca/log.po b/src/vidalia/help/content/po/ca/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ca/log.po
+++ b/src/vidalia/help/content/po/ca/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ca/netview.po b/src/vidalia/help/content/po/ca/netview.po
index 47f3d73..060c759 100644
--- a/src/vidalia/help/content/po/ca/netview.po
+++ b/src/vidalia/help/content/po/ca/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/ca/running.po b/src/vidalia/help/content/po/ca/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ca/running.po
+++ b/src/vidalia/help/content/po/ca/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ca/server.po b/src/vidalia/help/content/po/ca/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ca/server.po
+++ b/src/vidalia/help/content/po/ca/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ca/services.po b/src/vidalia/help/content/po/ca/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ca/services.po
+++ b/src/vidalia/help/content/po/ca/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ca/troubleshooting.po b/src/vidalia/help/content/po/ca/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ca/troubleshooting.po
+++ b/src/vidalia/help/content/po/ca/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/cs/config.po b/src/vidalia/help/content/po/cs/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/cs/config.po
+++ b/src/vidalia/help/content/po/cs/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/cs/index.po b/src/vidalia/help/content/po/cs/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/cs/index.po
+++ b/src/vidalia/help/content/po/cs/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/cs/links.po b/src/vidalia/help/content/po/cs/links.po
index 3d33249..549c146 100644
--- a/src/vidalia/help/content/po/cs/links.po
+++ b/src/vidalia/help/content/po/cs/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/cs/log.po b/src/vidalia/help/content/po/cs/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/cs/log.po
+++ b/src/vidalia/help/content/po/cs/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/cs/netview.po b/src/vidalia/help/content/po/cs/netview.po
index 47f3d73..8a804a7 100644
--- a/src/vidalia/help/content/po/cs/netview.po
+++ b/src/vidalia/help/content/po/cs/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/cs/running.po b/src/vidalia/help/content/po/cs/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/cs/running.po
+++ b/src/vidalia/help/content/po/cs/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/cs/server.po b/src/vidalia/help/content/po/cs/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/cs/server.po
+++ b/src/vidalia/help/content/po/cs/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/cs/services.po b/src/vidalia/help/content/po/cs/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/cs/services.po
+++ b/src/vidalia/help/content/po/cs/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/cs/troubleshooting.po b/src/vidalia/help/content/po/cs/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/cs/troubleshooting.po
+++ b/src/vidalia/help/content/po/cs/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/csb/config.po b/src/vidalia/help/content/po/csb/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/csb/config.po
+++ b/src/vidalia/help/content/po/csb/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/csb/index.po b/src/vidalia/help/content/po/csb/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/csb/index.po
+++ b/src/vidalia/help/content/po/csb/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/csb/links.po b/src/vidalia/help/content/po/csb/links.po
index 3d33249..5222225 100644
--- a/src/vidalia/help/content/po/csb/links.po
+++ b/src/vidalia/help/content/po/csb/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: csb\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/csb/log.po b/src/vidalia/help/content/po/csb/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/csb/log.po
+++ b/src/vidalia/help/content/po/csb/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/csb/netview.po b/src/vidalia/help/content/po/csb/netview.po
index 47f3d73..b40bd36 100644
--- a/src/vidalia/help/content/po/csb/netview.po
+++ b/src/vidalia/help/content/po/csb/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: csb\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/csb/running.po b/src/vidalia/help/content/po/csb/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/csb/running.po
+++ b/src/vidalia/help/content/po/csb/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/csb/server.po b/src/vidalia/help/content/po/csb/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/csb/server.po
+++ b/src/vidalia/help/content/po/csb/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/csb/services.po b/src/vidalia/help/content/po/csb/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/csb/services.po
+++ b/src/vidalia/help/content/po/csb/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/csb/troubleshooting.po b/src/vidalia/help/content/po/csb/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/csb/troubleshooting.po
+++ b/src/vidalia/help/content/po/csb/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/cy/config.po b/src/vidalia/help/content/po/cy/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/cy/config.po
+++ b/src/vidalia/help/content/po/cy/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/cy/index.po b/src/vidalia/help/content/po/cy/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/cy/index.po
+++ b/src/vidalia/help/content/po/cy/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/cy/links.po b/src/vidalia/help/content/po/cy/links.po
index 3d33249..f3cbb53 100644
--- a/src/vidalia/help/content/po/cy/links.po
+++ b/src/vidalia/help/content/po/cy/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: cy\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/cy/log.po b/src/vidalia/help/content/po/cy/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/cy/log.po
+++ b/src/vidalia/help/content/po/cy/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/cy/netview.po b/src/vidalia/help/content/po/cy/netview.po
index 47f3d73..d1cdb64 100644
--- a/src/vidalia/help/content/po/cy/netview.po
+++ b/src/vidalia/help/content/po/cy/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: cy\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/cy/running.po b/src/vidalia/help/content/po/cy/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/cy/running.po
+++ b/src/vidalia/help/content/po/cy/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/cy/server.po b/src/vidalia/help/content/po/cy/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/cy/server.po
+++ b/src/vidalia/help/content/po/cy/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/cy/services.po b/src/vidalia/help/content/po/cy/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/cy/services.po
+++ b/src/vidalia/help/content/po/cy/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/cy/troubleshooting.po b/src/vidalia/help/content/po/cy/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/cy/troubleshooting.po
+++ b/src/vidalia/help/content/po/cy/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/da/bridges.po b/src/vidalia/help/content/po/da/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/da/bridges.po
+++ b/src/vidalia/help/content/po/da/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/da/config.po b/src/vidalia/help/content/po/da/config.po
index 92f675c..a44674f 100644
--- a/src/vidalia/help/content/po/da/config.po
+++ b/src/vidalia/help/content/po/da/config.po
@@ -1,33 +1,22 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"PO-Revision-Date: 2011-03-22 16:41+0000\n"
+"Last-Translator: aputsiaq <aputtu 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.5.3\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/config.html:16
msgid "Configuring Vidalia and Tor"
-msgstr ""
+msgstr "Konfigurerer Vidalia og Tor"
#. type: Content of: <html><body><p>
#: en/config.html:20
@@ -36,31 +25,43 @@ msgid ""
"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."
msgstr ""
+"Vidalia lader dig konfigurere nogle af de aspekter som hyppigst ændres i "
+"Vidalia og Tor. Det lader dig også opsætte og håndtere et <a "
+"href=\"server.html\">Tor-relæ</a>, så du kan hjælpe Tor-netværket med at "
+"gro."
#. type: Content of: <html><body>
#: en/config.html:26
msgid "<a name=\"general\"/>"
-msgstr ""
+msgstr "<a name=\"general\"/>"
#. type: Content of: <html><body><h3>
#: en/config.html:27
msgid "General Settings"
-msgstr ""
+msgstr "Generelle indstillinger"
#. type: Content of: <html><body><p>
#: en/config.html:29
-msgid "Settings on the <i>General</i> page are the most commonly modified settings."
+msgid ""
+"Settings on the <i>General</i> page are the most commonly modified settings."
msgstr ""
+"Indstillinger på siden <i>Generelt</i> er de indstillinger som hyppigst "
+"ændres."
#. type: Content of: <html><body><ul><li>
#: en/config.html:32
msgid ""
-"<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 "
+"<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."
msgstr ""
+"<b>Tor-eksekverbar</b>: Dette er den eksekverbare Tor som Vidalia vil køre "
+"når du vælger <i>Start</i> fra bakkemenuen. Hvis du har flere versioner af "
+"Tor installeret, så kan du fortælle Vidalia hvilken version du vil køre ved "
+"at klikke på <i>Gennemse</i>-knappen og navigere til den særlige Tor-"
+"installation du foretrækker."
#. type: Content of: <html><body><ul><li>
#: en/config.html:39
@@ -69,22 +70,25 @@ msgid ""
"automatically start Tor when Vidalia starts. You can also configure Vidalia "
"to run when your system starts (<i>Windows only</i>)."
msgstr ""
+"<b>Opstartsvalg:</b> Med denne indstilling kan du få Vidalia til automatisk "
+"at starte Tor når Vidalia starter. Du kan også konfigurere Vidalia til at "
+"køre når dit system starter <i>(kun Windows).</i>"
#. type: Content of: <html><body>
#: en/config.html:46
msgid "<a name=\"network\"/>"
-msgstr ""
+msgstr "<a name=\"network\"/>"
#. type: Content of: <html><body><h3>
#: en/config.html:47
msgid "Network Settings"
-msgstr ""
+msgstr "Netværksindstillinger"
#. type: Content of: <html><body><p>
#: en/config.html:49
msgid ""
-"The <i>Network</i> settings page lets you change how Tor connects to the Tor "
-"network."
+"The <i>Network</i> settings page lets you change how Tor connects to the Tor"
+" network."
msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -106,8 +110,8 @@ msgid ""
"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>)"
+"list of ports permitted by your firewall or proxy, separated by commas. "
+"(<i>Example: 80,443,8080</i>)"
msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -117,39 +121,39 @@ msgid ""
"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."
+"or newer only). You can add bridge relays by specifying either their address"
+" and port number, or their address, port number, and fingerprint."
msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/config.html:77
msgid "Below are examples of valid bridge address formats:"
-msgstr ""
+msgstr "Nedenfor er eksempler på gyldige bro-adresseformater:"
#. type: Content of: <html><body><ul><li><ul><li>
#: en/config.html:80
msgid "128.213.48.13:8080"
-msgstr ""
+msgstr "128.213.48.13:8080"
#. type: Content of: <html><body><ul><li><ul><li>
#: en/config.html:83
msgid "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73"
-msgstr ""
+msgstr "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73"
#. type: Content of: <html><body><ul><li><ul><li>
#: en/config.html:86
msgid "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
-msgstr ""
+msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
#. type: Content of: <html><body><ul><li>
#: en/config.html:89
msgid ""
"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 "
+"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."
msgstr ""
@@ -157,29 +161,29 @@ msgstr ""
#. type: Content of: <html><body>
#: en/config.html:100
msgid "<a name=\"relay\"/>"
-msgstr ""
+msgstr "<a name=\"relay\"/>"
#. type: Content of: <html><body><h3>
#: en/config.html:101
msgid "Relay Settings"
-msgstr ""
+msgstr "Indstillinger for relæ"
#. type: Content of: <html><body><p>
#: en/config.html:103
msgid ""
-"<i> See <a href=\"server.html\">this help topic</a> for detailed information "
-"about setting up and managing a Tor relay. </i>"
+"<i> See <a href=\"server.html\">this help topic</a> for detailed information"
+" about setting up and managing a Tor relay. </i>"
msgstr ""
#. type: Content of: <html><body>
#: en/config.html:109
msgid "<a name=\"appearance\"/>"
-msgstr ""
+msgstr "<a name=\"appearance\"/>"
#. type: Content of: <html><body><h3>
#: en/config.html:110
msgid "Appearance Settings"
-msgstr ""
+msgstr "Indstillinger for udseende"
#. type: Content of: <html><body><p>
#: en/config.html:112
@@ -191,12 +195,12 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/config.html:116
msgid ""
-"<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."
+"<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."
msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -227,8 +231,8 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/config.html:138
msgid ""
-"<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 "
+"<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."
msgstr ""
@@ -255,15 +259,15 @@ msgid ""
"<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."
+"Vidalia randomly generate a new password each time it starts Tor by checking"
+" the <i>Randomly Generate</i> checkbox."
msgstr ""
#. type: Content of: <html><body><ul><li><ul><li>
#: en/config.html:162
msgid ""
-"<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 "
+"<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."
msgstr ""
@@ -289,9 +293,9 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/config.html:181
msgid ""
-"<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 "
+"<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."
msgstr ""
@@ -308,6 +312,6 @@ msgstr ""
#. type: Content of: <html><body><p>
#: en/config.html:192
msgid ""
-"Hidden services allow you to provide any kind of TCP-based service, e.g. an "
-"HTTP service, to others without revealing your IP address."
+"Hidden services allow you to provide any kind of TCP-based service, e.g. an"
+" HTTP service, to others without revealing your IP address."
msgstr ""
diff --git a/src/vidalia/help/content/po/da/index.po b/src/vidalia/help/content/po/da/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/da/index.po
+++ b/src/vidalia/help/content/po/da/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/da/links.po b/src/vidalia/help/content/po/da/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/da/links.po
+++ b/src/vidalia/help/content/po/da/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/da/log.po b/src/vidalia/help/content/po/da/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/da/log.po
+++ b/src/vidalia/help/content/po/da/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/da/netview.po b/src/vidalia/help/content/po/da/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/da/netview.po
+++ b/src/vidalia/help/content/po/da/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/da/running.po b/src/vidalia/help/content/po/da/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/da/running.po
+++ b/src/vidalia/help/content/po/da/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/da/server.po b/src/vidalia/help/content/po/da/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/da/server.po
+++ b/src/vidalia/help/content/po/da/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/da/services.po b/src/vidalia/help/content/po/da/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/da/services.po
+++ b/src/vidalia/help/content/po/da/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/da/troubleshooting.po b/src/vidalia/help/content/po/da/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/da/troubleshooting.po
+++ b/src/vidalia/help/content/po/da/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/de/bridges.po b/src/vidalia/help/content/po/de/bridges.po
index 11982c8..a3181cb 100644
--- a/src/vidalia/help/content/po/de/bridges.po
+++ b/src/vidalia/help/content/po/de/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/de/config.po b/src/vidalia/help/content/po/de/config.po
index ca7a1bf..645b291 100644
--- a/src/vidalia/help/content/po/de/config.po
+++ b/src/vidalia/help/content/po/de/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/de/index.po b/src/vidalia/help/content/po/de/index.po
index 482a980..8c031bf 100644
--- a/src/vidalia/help/content/po/de/index.po
+++ b/src/vidalia/help/content/po/de/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/de/links.po b/src/vidalia/help/content/po/de/links.po
index f38afd3..553bffb 100644
--- a/src/vidalia/help/content/po/de/links.po
+++ b/src/vidalia/help/content/po/de/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/de/log.po b/src/vidalia/help/content/po/de/log.po
index 8141fba..7e226bc 100644
--- a/src/vidalia/help/content/po/de/log.po
+++ b/src/vidalia/help/content/po/de/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/de/netview.po b/src/vidalia/help/content/po/de/netview.po
index 74f36bb..cabc87b 100644
--- a/src/vidalia/help/content/po/de/netview.po
+++ b/src/vidalia/help/content/po/de/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/de/running.po b/src/vidalia/help/content/po/de/running.po
index 02e80f4..b73d5d3 100644
--- a/src/vidalia/help/content/po/de/running.po
+++ b/src/vidalia/help/content/po/de/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/de/server.po b/src/vidalia/help/content/po/de/server.po
index ac78df7..b5990dc 100644
--- a/src/vidalia/help/content/po/de/server.po
+++ b/src/vidalia/help/content/po/de/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/de/services.po b/src/vidalia/help/content/po/de/services.po
index a57bd57..115e970 100644
--- a/src/vidalia/help/content/po/de/services.po
+++ b/src/vidalia/help/content/po/de/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/de/troubleshooting.po b/src/vidalia/help/content/po/de/troubleshooting.po
index f74392b..b495396 100644
--- a/src/vidalia/help/content/po/de/troubleshooting.po
+++ b/src/vidalia/help/content/po/de/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/dz/config.po b/src/vidalia/help/content/po/dz/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/dz/config.po
+++ b/src/vidalia/help/content/po/dz/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/dz/index.po b/src/vidalia/help/content/po/dz/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/dz/index.po
+++ b/src/vidalia/help/content/po/dz/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/dz/links.po b/src/vidalia/help/content/po/dz/links.po
index 3d33249..a5803d5 100644
--- a/src/vidalia/help/content/po/dz/links.po
+++ b/src/vidalia/help/content/po/dz/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: dz\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/dz/log.po b/src/vidalia/help/content/po/dz/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/dz/log.po
+++ b/src/vidalia/help/content/po/dz/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/dz/netview.po b/src/vidalia/help/content/po/dz/netview.po
index 47f3d73..2894859 100644
--- a/src/vidalia/help/content/po/dz/netview.po
+++ b/src/vidalia/help/content/po/dz/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: dz\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/dz/running.po b/src/vidalia/help/content/po/dz/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/dz/running.po
+++ b/src/vidalia/help/content/po/dz/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/dz/server.po b/src/vidalia/help/content/po/dz/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/dz/server.po
+++ b/src/vidalia/help/content/po/dz/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/dz/services.po b/src/vidalia/help/content/po/dz/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/dz/services.po
+++ b/src/vidalia/help/content/po/dz/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/dz/troubleshooting.po b/src/vidalia/help/content/po/dz/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/dz/troubleshooting.po
+++ b/src/vidalia/help/content/po/dz/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/el/config.po b/src/vidalia/help/content/po/el/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/el/config.po
+++ b/src/vidalia/help/content/po/el/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/el/index.po b/src/vidalia/help/content/po/el/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/el/index.po
+++ b/src/vidalia/help/content/po/el/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/el/links.po b/src/vidalia/help/content/po/el/links.po
index 3d33249..93a1118 100644
--- a/src/vidalia/help/content/po/el/links.po
+++ b/src/vidalia/help/content/po/el/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/el/log.po b/src/vidalia/help/content/po/el/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/el/log.po
+++ b/src/vidalia/help/content/po/el/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/el/netview.po b/src/vidalia/help/content/po/el/netview.po
index 47f3d73..188d4fd 100644
--- a/src/vidalia/help/content/po/el/netview.po
+++ b/src/vidalia/help/content/po/el/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/el/running.po b/src/vidalia/help/content/po/el/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/el/running.po
+++ b/src/vidalia/help/content/po/el/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/el/server.po b/src/vidalia/help/content/po/el/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/el/server.po
+++ b/src/vidalia/help/content/po/el/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/el/services.po b/src/vidalia/help/content/po/el/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/el/services.po
+++ b/src/vidalia/help/content/po/el/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/el/troubleshooting.po b/src/vidalia/help/content/po/el/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/el/troubleshooting.po
+++ b/src/vidalia/help/content/po/el/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/en/bridges.po b/src/vidalia/help/content/po/en/bridges.po
index 2eaadbb..1ca7993 100644
--- a/src/vidalia/help/content/po/en/bridges.po
+++ b/src/vidalia/help/content/po/en/bridges.po
@@ -5,8 +5,8 @@
## the LICENSE file, found in the top level directory of this
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed by
-## the Vidalia Project at http://www.vidalia-project.net/. No part of
-## Vidalia, including this file, may be copied, modified, propagated, or
+## the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+No part of Vidalia, including this file, may be copied, modified, propagated, or
## distributed except according to the terms described in the LICENSE
## file.
##
diff --git a/src/vidalia/help/content/po/en/config.po b/src/vidalia/help/content/po/en/config.po
index d40ebf7..38567ae 100644
--- a/src/vidalia/help/content/po/en/config.po
+++ b/src/vidalia/help/content/po/en/config.po
@@ -5,8 +5,8 @@
## the LICENSE file, found in the top level directory of this
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
-## by the Vidalia Project at http://www.vidalia-project.net/. No part
-## of Vidalia, including this file, may be copied, modified,
+## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/en/index.po b/src/vidalia/help/content/po/en/index.po
index 22301d3..05eef92 100644
--- a/src/vidalia/help/content/po/en/index.po
+++ b/src/vidalia/help/content/po/en/index.po
@@ -5,8 +5,8 @@
## the LICENSE file, found in the top level directory of this
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
-## by the Vidalia Project at http://www.vidalia-project.net/. No part
-## of Vidalia, including this file, may be copied, modified,
+## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/en/links.po b/src/vidalia/help/content/po/en/links.po
index c9580ad..2b863bf 100644
--- a/src/vidalia/help/content/po/en/links.po
+++ b/src/vidalia/help/content/po/en/links.po
@@ -5,8 +5,8 @@
## the LICENSE file, found in the top level directory of this
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
-## by the Vidalia Project at http://www.vidalia-project.net/. No part
-## of Vidalia, including this file, may be copied, modified,
+## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/en/log.po b/src/vidalia/help/content/po/en/log.po
index 737b0da..c035e44 100644
--- a/src/vidalia/help/content/po/en/log.po
+++ b/src/vidalia/help/content/po/en/log.po
@@ -5,8 +5,8 @@
## the LICENSE file, found in the top level directory of this
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
-## by the Vidalia Project at http://www.vidalia-project.net/. No part
-## of Vidalia, including this file, may be copied, modified,
+## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/en/netview.po b/src/vidalia/help/content/po/en/netview.po
index 7523f08..30df021 100644
--- a/src/vidalia/help/content/po/en/netview.po
+++ b/src/vidalia/help/content/po/en/netview.po
@@ -5,8 +5,8 @@
## the LICENSE file, found in the top level directory of this
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
-## by the Vidalia Project at http://www.vidalia-project.net/. No part
-## of Vidalia, including this file, may be copied, modified,
+## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/en/running.po b/src/vidalia/help/content/po/en/running.po
index 7cd5742..3f8e9d6 100644
--- a/src/vidalia/help/content/po/en/running.po
+++ b/src/vidalia/help/content/po/en/running.po
@@ -5,8 +5,8 @@
## the LICENSE file, found in the top level directory of this
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
-## by the Vidalia Project at http://www.vidalia-project.net/. No part
-## of Vidalia, including this file, may be copied, modified,
+## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/en/server.po b/src/vidalia/help/content/po/en/server.po
index 7299a3f..5cbbd9d 100644
--- a/src/vidalia/help/content/po/en/server.po
+++ b/src/vidalia/help/content/po/en/server.po
@@ -5,8 +5,8 @@
## the LICENSE file, found in the top level directory of this
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
-## by the Vidalia Project at http://www.vidalia-project.net/. No part
-## of Vidalia, including this file, may be copied, modified,
+## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/en/services.po b/src/vidalia/help/content/po/en/services.po
index c2705db..5042798 100644
--- a/src/vidalia/help/content/po/en/services.po
+++ b/src/vidalia/help/content/po/en/services.po
@@ -5,8 +5,8 @@
## the LICENSE file, found in the top level directory of this
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
-## by the Vidalia Project at http://www.vidalia-project.net/. No part
-## of Vidalia, including this file, may be copied, modified,
+## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/en/troubleshooting.po b/src/vidalia/help/content/po/en/troubleshooting.po
index a04a965..469ba59 100644
--- a/src/vidalia/help/content/po/en/troubleshooting.po
+++ b/src/vidalia/help/content/po/en/troubleshooting.po
@@ -5,8 +5,8 @@
## the LICENSE file, found in the top level directory of this
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
-## by the Vidalia Project at http://www.vidalia-project.net/. No part
-## of Vidalia, including this file, may be copied, modified,
+## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
diff --git a/src/vidalia/help/content/po/eo/config.po b/src/vidalia/help/content/po/eo/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/eo/config.po
+++ b/src/vidalia/help/content/po/eo/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/eo/index.po b/src/vidalia/help/content/po/eo/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/eo/index.po
+++ b/src/vidalia/help/content/po/eo/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/eo/links.po b/src/vidalia/help/content/po/eo/links.po
index 3d33249..6035d73 100644
--- a/src/vidalia/help/content/po/eo/links.po
+++ b/src/vidalia/help/content/po/eo/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/eo/log.po b/src/vidalia/help/content/po/eo/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/eo/log.po
+++ b/src/vidalia/help/content/po/eo/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/eo/netview.po b/src/vidalia/help/content/po/eo/netview.po
index 47f3d73..056acbb 100644
--- a/src/vidalia/help/content/po/eo/netview.po
+++ b/src/vidalia/help/content/po/eo/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/eo/running.po b/src/vidalia/help/content/po/eo/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/eo/running.po
+++ b/src/vidalia/help/content/po/eo/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/eo/server.po b/src/vidalia/help/content/po/eo/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/eo/server.po
+++ b/src/vidalia/help/content/po/eo/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/eo/services.po b/src/vidalia/help/content/po/eo/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/eo/services.po
+++ b/src/vidalia/help/content/po/eo/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/eo/troubleshooting.po b/src/vidalia/help/content/po/eo/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/eo/troubleshooting.po
+++ b/src/vidalia/help/content/po/eo/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/es/config.po b/src/vidalia/help/content/po/es/config.po
index abc617b..a3cf8de 100644
--- a/src/vidalia/help/content/po/es/config.po
+++ b/src/vidalia/help/content/po/es/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/es/index.po b/src/vidalia/help/content/po/es/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/es/index.po
+++ b/src/vidalia/help/content/po/es/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/es/links.po b/src/vidalia/help/content/po/es/links.po
index 3d33249..4c12c4e 100644
--- a/src/vidalia/help/content/po/es/links.po
+++ b/src/vidalia/help/content/po/es/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/es/log.po b/src/vidalia/help/content/po/es/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/es/log.po
+++ b/src/vidalia/help/content/po/es/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/es/netview.po b/src/vidalia/help/content/po/es/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/es/netview.po
+++ b/src/vidalia/help/content/po/es/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/es/running.po b/src/vidalia/help/content/po/es/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/es/running.po
+++ b/src/vidalia/help/content/po/es/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/es/server.po b/src/vidalia/help/content/po/es/server.po
index 8bff0c0..4dc4ee9 100644
--- a/src/vidalia/help/content/po/es/server.po
+++ b/src/vidalia/help/content/po/es/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/es/services.po b/src/vidalia/help/content/po/es/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/es/services.po
+++ b/src/vidalia/help/content/po/es/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/es/troubleshooting.po b/src/vidalia/help/content/po/es/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/es/troubleshooting.po
+++ b/src/vidalia/help/content/po/es/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/et/config.po b/src/vidalia/help/content/po/et/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/et/config.po
+++ b/src/vidalia/help/content/po/et/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/et/index.po b/src/vidalia/help/content/po/et/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/et/index.po
+++ b/src/vidalia/help/content/po/et/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/et/links.po b/src/vidalia/help/content/po/et/links.po
index 3d33249..f21e484 100644
--- a/src/vidalia/help/content/po/et/links.po
+++ b/src/vidalia/help/content/po/et/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/et/log.po b/src/vidalia/help/content/po/et/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/et/log.po
+++ b/src/vidalia/help/content/po/et/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/et/netview.po b/src/vidalia/help/content/po/et/netview.po
index 47f3d73..27aba36 100644
--- a/src/vidalia/help/content/po/et/netview.po
+++ b/src/vidalia/help/content/po/et/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/et/running.po b/src/vidalia/help/content/po/et/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/et/running.po
+++ b/src/vidalia/help/content/po/et/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/et/server.po b/src/vidalia/help/content/po/et/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/et/server.po
+++ b/src/vidalia/help/content/po/et/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/et/services.po b/src/vidalia/help/content/po/et/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/et/services.po
+++ b/src/vidalia/help/content/po/et/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/et/troubleshooting.po b/src/vidalia/help/content/po/et/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/et/troubleshooting.po
+++ b/src/vidalia/help/content/po/et/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/eu/config.po b/src/vidalia/help/content/po/eu/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/eu/config.po
+++ b/src/vidalia/help/content/po/eu/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/eu/index.po b/src/vidalia/help/content/po/eu/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/eu/index.po
+++ b/src/vidalia/help/content/po/eu/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/eu/links.po b/src/vidalia/help/content/po/eu/links.po
index 3d33249..c6900ed 100644
--- a/src/vidalia/help/content/po/eu/links.po
+++ b/src/vidalia/help/content/po/eu/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/eu/log.po b/src/vidalia/help/content/po/eu/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/eu/log.po
+++ b/src/vidalia/help/content/po/eu/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/eu/netview.po b/src/vidalia/help/content/po/eu/netview.po
index 47f3d73..0a395c8 100644
--- a/src/vidalia/help/content/po/eu/netview.po
+++ b/src/vidalia/help/content/po/eu/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/eu/running.po b/src/vidalia/help/content/po/eu/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/eu/running.po
+++ b/src/vidalia/help/content/po/eu/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/eu/server.po b/src/vidalia/help/content/po/eu/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/eu/server.po
+++ b/src/vidalia/help/content/po/eu/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/eu/services.po b/src/vidalia/help/content/po/eu/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/eu/services.po
+++ b/src/vidalia/help/content/po/eu/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/eu/troubleshooting.po b/src/vidalia/help/content/po/eu/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/eu/troubleshooting.po
+++ b/src/vidalia/help/content/po/eu/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fa/bridges.po b/src/vidalia/help/content/po/fa/bridges.po
index b8999a7..41259a2 100644
--- a/src/vidalia/help/content/po/fa/bridges.po
+++ b/src/vidalia/help/content/po/fa/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/fa/config.po b/src/vidalia/help/content/po/fa/config.po
index 30ea1cf..cd202ab 100644
--- a/src/vidalia/help/content/po/fa/config.po
+++ b/src/vidalia/help/content/po/fa/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fa/index.po b/src/vidalia/help/content/po/fa/index.po
index 125b9a8..a1b2a45 100644
--- a/src/vidalia/help/content/po/fa/index.po
+++ b/src/vidalia/help/content/po/fa/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fa/links.po b/src/vidalia/help/content/po/fa/links.po
index d434416..d75d432 100644
--- a/src/vidalia/help/content/po/fa/links.po
+++ b/src/vidalia/help/content/po/fa/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fa/log.po b/src/vidalia/help/content/po/fa/log.po
index 4887b71..02ebf3b 100644
--- a/src/vidalia/help/content/po/fa/log.po
+++ b/src/vidalia/help/content/po/fa/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fa/netview.po b/src/vidalia/help/content/po/fa/netview.po
index de480fd..59c2505 100644
--- a/src/vidalia/help/content/po/fa/netview.po
+++ b/src/vidalia/help/content/po/fa/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fa/running.po b/src/vidalia/help/content/po/fa/running.po
index 46556b9..442a62f 100644
--- a/src/vidalia/help/content/po/fa/running.po
+++ b/src/vidalia/help/content/po/fa/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fa/server.po b/src/vidalia/help/content/po/fa/server.po
index bee9a7d..ecb7ca2 100644
--- a/src/vidalia/help/content/po/fa/server.po
+++ b/src/vidalia/help/content/po/fa/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fa/services.po b/src/vidalia/help/content/po/fa/services.po
index 9d9a0c3..ed12243 100644
--- a/src/vidalia/help/content/po/fa/services.po
+++ b/src/vidalia/help/content/po/fa/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fa/troubleshooting.po b/src/vidalia/help/content/po/fa/troubleshooting.po
index 39feae6..33d5753 100644
--- a/src/vidalia/help/content/po/fa/troubleshooting.po
+++ b/src/vidalia/help/content/po/fa/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fi/bridges.po b/src/vidalia/help/content/po/fi/bridges.po
index 11982c8..a3181cb 100644
--- a/src/vidalia/help/content/po/fi/bridges.po
+++ b/src/vidalia/help/content/po/fi/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/fi/config.po b/src/vidalia/help/content/po/fi/config.po
index 633b48c..e9450b3 100644
--- a/src/vidalia/help/content/po/fi/config.po
+++ b/src/vidalia/help/content/po/fi/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fi/index.po b/src/vidalia/help/content/po/fi/index.po
index 9b5c30e..b4a7941 100644
--- a/src/vidalia/help/content/po/fi/index.po
+++ b/src/vidalia/help/content/po/fi/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fi/links.po b/src/vidalia/help/content/po/fi/links.po
index b0a4119..d2efb53 100644
--- a/src/vidalia/help/content/po/fi/links.po
+++ b/src/vidalia/help/content/po/fi/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fi/log.po b/src/vidalia/help/content/po/fi/log.po
index 8141fba..7e226bc 100644
--- a/src/vidalia/help/content/po/fi/log.po
+++ b/src/vidalia/help/content/po/fi/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fi/netview.po b/src/vidalia/help/content/po/fi/netview.po
index 15de0c5..3ab66ec 100644
--- a/src/vidalia/help/content/po/fi/netview.po
+++ b/src/vidalia/help/content/po/fi/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fi/running.po b/src/vidalia/help/content/po/fi/running.po
index 43bbb4e..b503af0 100644
--- a/src/vidalia/help/content/po/fi/running.po
+++ b/src/vidalia/help/content/po/fi/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fi/server.po b/src/vidalia/help/content/po/fi/server.po
index 09da128..3cb445f 100644
--- a/src/vidalia/help/content/po/fi/server.po
+++ b/src/vidalia/help/content/po/fi/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fi/services.po b/src/vidalia/help/content/po/fi/services.po
index db5f9fe..73d206c 100644
--- a/src/vidalia/help/content/po/fi/services.po
+++ b/src/vidalia/help/content/po/fi/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fi/troubleshooting.po b/src/vidalia/help/content/po/fi/troubleshooting.po
index f74392b..b495396 100644
--- a/src/vidalia/help/content/po/fi/troubleshooting.po
+++ b/src/vidalia/help/content/po/fi/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fil/config.po b/src/vidalia/help/content/po/fil/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/fil/config.po
+++ b/src/vidalia/help/content/po/fil/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fil/index.po b/src/vidalia/help/content/po/fil/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/fil/index.po
+++ b/src/vidalia/help/content/po/fil/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fil/links.po b/src/vidalia/help/content/po/fil/links.po
index 3d33249..6758ec5 100644
--- a/src/vidalia/help/content/po/fil/links.po
+++ b/src/vidalia/help/content/po/fil/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: fil\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/fil/log.po b/src/vidalia/help/content/po/fil/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/fil/log.po
+++ b/src/vidalia/help/content/po/fil/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fil/netview.po b/src/vidalia/help/content/po/fil/netview.po
index 47f3d73..217b3f2 100644
--- a/src/vidalia/help/content/po/fil/netview.po
+++ b/src/vidalia/help/content/po/fil/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: fil\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/fil/running.po b/src/vidalia/help/content/po/fil/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/fil/running.po
+++ b/src/vidalia/help/content/po/fil/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fil/server.po b/src/vidalia/help/content/po/fil/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/fil/server.po
+++ b/src/vidalia/help/content/po/fil/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fil/services.po b/src/vidalia/help/content/po/fil/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/fil/services.po
+++ b/src/vidalia/help/content/po/fil/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fil/troubleshooting.po b/src/vidalia/help/content/po/fil/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/fil/troubleshooting.po
+++ b/src/vidalia/help/content/po/fil/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fo/bridges.po b/src/vidalia/help/content/po/fo/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/fo/bridges.po
+++ b/src/vidalia/help/content/po/fo/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/fo/config.po b/src/vidalia/help/content/po/fo/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/fo/config.po
+++ b/src/vidalia/help/content/po/fo/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fo/index.po b/src/vidalia/help/content/po/fo/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/fo/index.po
+++ b/src/vidalia/help/content/po/fo/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fo/links.po b/src/vidalia/help/content/po/fo/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/fo/links.po
+++ b/src/vidalia/help/content/po/fo/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fo/log.po b/src/vidalia/help/content/po/fo/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/fo/log.po
+++ b/src/vidalia/help/content/po/fo/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fo/netview.po b/src/vidalia/help/content/po/fo/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/fo/netview.po
+++ b/src/vidalia/help/content/po/fo/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fo/running.po b/src/vidalia/help/content/po/fo/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/fo/running.po
+++ b/src/vidalia/help/content/po/fo/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fo/server.po b/src/vidalia/help/content/po/fo/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/fo/server.po
+++ b/src/vidalia/help/content/po/fo/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fo/services.po b/src/vidalia/help/content/po/fo/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/fo/services.po
+++ b/src/vidalia/help/content/po/fo/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fo/troubleshooting.po b/src/vidalia/help/content/po/fo/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/fo/troubleshooting.po
+++ b/src/vidalia/help/content/po/fo/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fr/config.po b/src/vidalia/help/content/po/fr/config.po
index da871e2..722a595 100644
--- a/src/vidalia/help/content/po/fr/config.po
+++ b/src/vidalia/help/content/po/fr/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fr/index.po b/src/vidalia/help/content/po/fr/index.po
index ee6855f..d1b99a1 100644
--- a/src/vidalia/help/content/po/fr/index.po
+++ b/src/vidalia/help/content/po/fr/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fr/links.po b/src/vidalia/help/content/po/fr/links.po
index 3b6deab..07734bb 100644
--- a/src/vidalia/help/content/po/fr/links.po
+++ b/src/vidalia/help/content/po/fr/links.po
@@ -1,50 +1,40 @@
#
-# $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.
-#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: 2010-06-26 15:49-0600\n"
-"Last-Translator: Runa Sandvik <runa.sandvik at gmail.com>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"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: Pootle 1.1.0\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr "Liens utiles"
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr "Vidalia"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr " "
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr "Page d'accueil"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
@@ -53,71 +43,38 @@ msgstr ""
"https://www.torproject.org/vidalia/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr "Wiki"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> http://trac.vidalia-"
-"project.net/wiki</a>"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr "Rapport de Bogues"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/report\"> http://trac.vidalia-"
-"project.net/report</a>"
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr "Tor"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr "FAQ"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
-msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
diff --git a/src/vidalia/help/content/po/fr/log.po b/src/vidalia/help/content/po/fr/log.po
index 8c379c1..b18adb4 100644
--- a/src/vidalia/help/content/po/fr/log.po
+++ b/src/vidalia/help/content/po/fr/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/fr/netview.po b/src/vidalia/help/content/po/fr/netview.po
index 200daea..0020086 100644
--- a/src/vidalia/help/content/po/fr/netview.po
+++ b/src/vidalia/help/content/po/fr/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/fr/running.po b/src/vidalia/help/content/po/fr/running.po
index bea6a16..491946b 100644
--- a/src/vidalia/help/content/po/fr/running.po
+++ b/src/vidalia/help/content/po/fr/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fr/server.po b/src/vidalia/help/content/po/fr/server.po
index 6b997a4..3ff8520 100644
--- a/src/vidalia/help/content/po/fr/server.po
+++ b/src/vidalia/help/content/po/fr/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/fr/services.po b/src/vidalia/help/content/po/fr/services.po
index 9f3bd0c..e97907f 100644
--- a/src/vidalia/help/content/po/fr/services.po
+++ b/src/vidalia/help/content/po/fr/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/fr/troubleshooting.po b/src/vidalia/help/content/po/fr/troubleshooting.po
index 62e82fb..d94cc91 100644
--- a/src/vidalia/help/content/po/fr/troubleshooting.po
+++ b/src/vidalia/help/content/po/fr/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fur/config.po b/src/vidalia/help/content/po/fur/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/fur/config.po
+++ b/src/vidalia/help/content/po/fur/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fur/index.po b/src/vidalia/help/content/po/fur/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/fur/index.po
+++ b/src/vidalia/help/content/po/fur/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fur/links.po b/src/vidalia/help/content/po/fur/links.po
index 3d33249..7b0d32a 100644
--- a/src/vidalia/help/content/po/fur/links.po
+++ b/src/vidalia/help/content/po/fur/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: fur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/fur/log.po b/src/vidalia/help/content/po/fur/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/fur/log.po
+++ b/src/vidalia/help/content/po/fur/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fur/netview.po b/src/vidalia/help/content/po/fur/netview.po
index 47f3d73..c4937ac 100644
--- a/src/vidalia/help/content/po/fur/netview.po
+++ b/src/vidalia/help/content/po/fur/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: fur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/fur/running.po b/src/vidalia/help/content/po/fur/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/fur/running.po
+++ b/src/vidalia/help/content/po/fur/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fur/server.po b/src/vidalia/help/content/po/fur/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/fur/server.po
+++ b/src/vidalia/help/content/po/fur/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fur/services.po b/src/vidalia/help/content/po/fur/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/fur/services.po
+++ b/src/vidalia/help/content/po/fur/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fur/troubleshooting.po b/src/vidalia/help/content/po/fur/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/fur/troubleshooting.po
+++ b/src/vidalia/help/content/po/fur/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fy/bridges.po b/src/vidalia/help/content/po/fy/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/fy/bridges.po
+++ b/src/vidalia/help/content/po/fy/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/fy/config.po b/src/vidalia/help/content/po/fy/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/fy/config.po
+++ b/src/vidalia/help/content/po/fy/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fy/index.po b/src/vidalia/help/content/po/fy/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/fy/index.po
+++ b/src/vidalia/help/content/po/fy/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fy/links.po b/src/vidalia/help/content/po/fy/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/fy/links.po
+++ b/src/vidalia/help/content/po/fy/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fy/log.po b/src/vidalia/help/content/po/fy/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/fy/log.po
+++ b/src/vidalia/help/content/po/fy/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fy/netview.po b/src/vidalia/help/content/po/fy/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/fy/netview.po
+++ b/src/vidalia/help/content/po/fy/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fy/running.po b/src/vidalia/help/content/po/fy/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/fy/running.po
+++ b/src/vidalia/help/content/po/fy/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fy/server.po b/src/vidalia/help/content/po/fy/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/fy/server.po
+++ b/src/vidalia/help/content/po/fy/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fy/services.po b/src/vidalia/help/content/po/fy/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/fy/services.po
+++ b/src/vidalia/help/content/po/fy/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/fy/troubleshooting.po b/src/vidalia/help/content/po/fy/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/fy/troubleshooting.po
+++ b/src/vidalia/help/content/po/fy/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ga/config.po b/src/vidalia/help/content/po/ga/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ga/config.po
+++ b/src/vidalia/help/content/po/ga/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ga/index.po b/src/vidalia/help/content/po/ga/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ga/index.po
+++ b/src/vidalia/help/content/po/ga/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ga/links.po b/src/vidalia/help/content/po/ga/links.po
index 3d33249..2d05449 100644
--- a/src/vidalia/help/content/po/ga/links.po
+++ b/src/vidalia/help/content/po/ga/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ga\n"
+"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/ga/log.po b/src/vidalia/help/content/po/ga/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ga/log.po
+++ b/src/vidalia/help/content/po/ga/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ga/netview.po b/src/vidalia/help/content/po/ga/netview.po
index 47f3d73..f951aa0 100644
--- a/src/vidalia/help/content/po/ga/netview.po
+++ b/src/vidalia/help/content/po/ga/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ga\n"
+"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/ga/running.po b/src/vidalia/help/content/po/ga/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ga/running.po
+++ b/src/vidalia/help/content/po/ga/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ga/server.po b/src/vidalia/help/content/po/ga/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ga/server.po
+++ b/src/vidalia/help/content/po/ga/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ga/services.po b/src/vidalia/help/content/po/ga/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ga/services.po
+++ b/src/vidalia/help/content/po/ga/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ga/troubleshooting.po b/src/vidalia/help/content/po/ga/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ga/troubleshooting.po
+++ b/src/vidalia/help/content/po/ga/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gl/config.po b/src/vidalia/help/content/po/gl/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/gl/config.po
+++ b/src/vidalia/help/content/po/gl/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gl/index.po b/src/vidalia/help/content/po/gl/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/gl/index.po
+++ b/src/vidalia/help/content/po/gl/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gl/links.po b/src/vidalia/help/content/po/gl/links.po
index 3d33249..0254b64 100644
--- a/src/vidalia/help/content/po/gl/links.po
+++ b/src/vidalia/help/content/po/gl/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/gl/log.po b/src/vidalia/help/content/po/gl/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/gl/log.po
+++ b/src/vidalia/help/content/po/gl/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gl/netview.po b/src/vidalia/help/content/po/gl/netview.po
index 47f3d73..5d0cf41 100644
--- a/src/vidalia/help/content/po/gl/netview.po
+++ b/src/vidalia/help/content/po/gl/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/gl/running.po b/src/vidalia/help/content/po/gl/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/gl/running.po
+++ b/src/vidalia/help/content/po/gl/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gl/server.po b/src/vidalia/help/content/po/gl/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/gl/server.po
+++ b/src/vidalia/help/content/po/gl/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gl/services.po b/src/vidalia/help/content/po/gl/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/gl/services.po
+++ b/src/vidalia/help/content/po/gl/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gl/troubleshooting.po b/src/vidalia/help/content/po/gl/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/gl/troubleshooting.po
+++ b/src/vidalia/help/content/po/gl/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gu/config.po b/src/vidalia/help/content/po/gu/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/gu/config.po
+++ b/src/vidalia/help/content/po/gu/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gu/index.po b/src/vidalia/help/content/po/gu/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/gu/index.po
+++ b/src/vidalia/help/content/po/gu/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gu/links.po b/src/vidalia/help/content/po/gu/links.po
index 3d33249..5abff46 100644
--- a/src/vidalia/help/content/po/gu/links.po
+++ b/src/vidalia/help/content/po/gu/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: gu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/gu/log.po b/src/vidalia/help/content/po/gu/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/gu/log.po
+++ b/src/vidalia/help/content/po/gu/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gu/netview.po b/src/vidalia/help/content/po/gu/netview.po
index 47f3d73..818c042 100644
--- a/src/vidalia/help/content/po/gu/netview.po
+++ b/src/vidalia/help/content/po/gu/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: gu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/gu/running.po b/src/vidalia/help/content/po/gu/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/gu/running.po
+++ b/src/vidalia/help/content/po/gu/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gu/server.po b/src/vidalia/help/content/po/gu/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/gu/server.po
+++ b/src/vidalia/help/content/po/gu/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gu/services.po b/src/vidalia/help/content/po/gu/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/gu/services.po
+++ b/src/vidalia/help/content/po/gu/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gu/troubleshooting.po b/src/vidalia/help/content/po/gu/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/gu/troubleshooting.po
+++ b/src/vidalia/help/content/po/gu/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gun/config.po b/src/vidalia/help/content/po/gun/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/gun/config.po
+++ b/src/vidalia/help/content/po/gun/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gun/index.po b/src/vidalia/help/content/po/gun/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/gun/index.po
+++ b/src/vidalia/help/content/po/gun/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gun/links.po b/src/vidalia/help/content/po/gun/links.po
index 3d33249..a4b75eb 100644
--- a/src/vidalia/help/content/po/gun/links.po
+++ b/src/vidalia/help/content/po/gun/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: gun\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/gun/log.po b/src/vidalia/help/content/po/gun/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/gun/log.po
+++ b/src/vidalia/help/content/po/gun/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gun/netview.po b/src/vidalia/help/content/po/gun/netview.po
index 47f3d73..2428ec9 100644
--- a/src/vidalia/help/content/po/gun/netview.po
+++ b/src/vidalia/help/content/po/gun/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: gun\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/gun/running.po b/src/vidalia/help/content/po/gun/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/gun/running.po
+++ b/src/vidalia/help/content/po/gun/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gun/server.po b/src/vidalia/help/content/po/gun/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/gun/server.po
+++ b/src/vidalia/help/content/po/gun/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gun/services.po b/src/vidalia/help/content/po/gun/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/gun/services.po
+++ b/src/vidalia/help/content/po/gun/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/gun/troubleshooting.po b/src/vidalia/help/content/po/gun/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/gun/troubleshooting.po
+++ b/src/vidalia/help/content/po/gun/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ha/config.po b/src/vidalia/help/content/po/ha/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ha/config.po
+++ b/src/vidalia/help/content/po/ha/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ha/index.po b/src/vidalia/help/content/po/ha/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ha/index.po
+++ b/src/vidalia/help/content/po/ha/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ha/links.po b/src/vidalia/help/content/po/ha/links.po
index 3d33249..8a6d946 100644
--- a/src/vidalia/help/content/po/ha/links.po
+++ b/src/vidalia/help/content/po/ha/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ha\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/ha/log.po b/src/vidalia/help/content/po/ha/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ha/log.po
+++ b/src/vidalia/help/content/po/ha/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ha/netview.po b/src/vidalia/help/content/po/ha/netview.po
index 47f3d73..e192f33 100644
--- a/src/vidalia/help/content/po/ha/netview.po
+++ b/src/vidalia/help/content/po/ha/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ha\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/ha/running.po b/src/vidalia/help/content/po/ha/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ha/running.po
+++ b/src/vidalia/help/content/po/ha/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ha/server.po b/src/vidalia/help/content/po/ha/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ha/server.po
+++ b/src/vidalia/help/content/po/ha/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ha/services.po b/src/vidalia/help/content/po/ha/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ha/services.po
+++ b/src/vidalia/help/content/po/ha/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ha/troubleshooting.po b/src/vidalia/help/content/po/ha/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ha/troubleshooting.po
+++ b/src/vidalia/help/content/po/ha/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/he/config.po b/src/vidalia/help/content/po/he/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/he/config.po
+++ b/src/vidalia/help/content/po/he/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/he/index.po b/src/vidalia/help/content/po/he/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/he/index.po
+++ b/src/vidalia/help/content/po/he/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/he/links.po b/src/vidalia/help/content/po/he/links.po
index 3d33249..7f76646 100644
--- a/src/vidalia/help/content/po/he/links.po
+++ b/src/vidalia/help/content/po/he/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/he/log.po b/src/vidalia/help/content/po/he/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/he/log.po
+++ b/src/vidalia/help/content/po/he/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/he/netview.po b/src/vidalia/help/content/po/he/netview.po
index 47f3d73..6500e46 100644
--- a/src/vidalia/help/content/po/he/netview.po
+++ b/src/vidalia/help/content/po/he/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/he/running.po b/src/vidalia/help/content/po/he/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/he/running.po
+++ b/src/vidalia/help/content/po/he/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/he/server.po b/src/vidalia/help/content/po/he/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/he/server.po
+++ b/src/vidalia/help/content/po/he/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/he/services.po b/src/vidalia/help/content/po/he/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/he/services.po
+++ b/src/vidalia/help/content/po/he/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/he/troubleshooting.po b/src/vidalia/help/content/po/he/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/he/troubleshooting.po
+++ b/src/vidalia/help/content/po/he/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hi/config.po b/src/vidalia/help/content/po/hi/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/hi/config.po
+++ b/src/vidalia/help/content/po/hi/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hi/index.po b/src/vidalia/help/content/po/hi/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/hi/index.po
+++ b/src/vidalia/help/content/po/hi/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hi/links.po b/src/vidalia/help/content/po/hi/links.po
index 3d33249..58ffb8a 100644
--- a/src/vidalia/help/content/po/hi/links.po
+++ b/src/vidalia/help/content/po/hi/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/hi/log.po b/src/vidalia/help/content/po/hi/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/hi/log.po
+++ b/src/vidalia/help/content/po/hi/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hi/netview.po b/src/vidalia/help/content/po/hi/netview.po
index 47f3d73..d80af46 100644
--- a/src/vidalia/help/content/po/hi/netview.po
+++ b/src/vidalia/help/content/po/hi/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/hi/running.po b/src/vidalia/help/content/po/hi/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/hi/running.po
+++ b/src/vidalia/help/content/po/hi/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hi/server.po b/src/vidalia/help/content/po/hi/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/hi/server.po
+++ b/src/vidalia/help/content/po/hi/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hi/services.po b/src/vidalia/help/content/po/hi/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/hi/services.po
+++ b/src/vidalia/help/content/po/hi/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hi/troubleshooting.po b/src/vidalia/help/content/po/hi/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/hi/troubleshooting.po
+++ b/src/vidalia/help/content/po/hi/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hr/config.po b/src/vidalia/help/content/po/hr/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/hr/config.po
+++ b/src/vidalia/help/content/po/hr/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hr/index.po b/src/vidalia/help/content/po/hr/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/hr/index.po
+++ b/src/vidalia/help/content/po/hr/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hr/links.po b/src/vidalia/help/content/po/hr/links.po
index 3d33249..530bc47 100644
--- a/src/vidalia/help/content/po/hr/links.po
+++ b/src/vidalia/help/content/po/hr/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/hr/log.po b/src/vidalia/help/content/po/hr/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/hr/log.po
+++ b/src/vidalia/help/content/po/hr/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hr/netview.po b/src/vidalia/help/content/po/hr/netview.po
index 47f3d73..67ab0ce 100644
--- a/src/vidalia/help/content/po/hr/netview.po
+++ b/src/vidalia/help/content/po/hr/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/hr/running.po b/src/vidalia/help/content/po/hr/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/hr/running.po
+++ b/src/vidalia/help/content/po/hr/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hr/server.po b/src/vidalia/help/content/po/hr/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/hr/server.po
+++ b/src/vidalia/help/content/po/hr/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hr/services.po b/src/vidalia/help/content/po/hr/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/hr/services.po
+++ b/src/vidalia/help/content/po/hr/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hr/troubleshooting.po b/src/vidalia/help/content/po/hr/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/hr/troubleshooting.po
+++ b/src/vidalia/help/content/po/hr/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ht/config.po b/src/vidalia/help/content/po/ht/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ht/config.po
+++ b/src/vidalia/help/content/po/ht/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ht/index.po b/src/vidalia/help/content/po/ht/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ht/index.po
+++ b/src/vidalia/help/content/po/ht/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ht/links.po b/src/vidalia/help/content/po/ht/links.po
index 3d33249..5d09a09 100644
--- a/src/vidalia/help/content/po/ht/links.po
+++ b/src/vidalia/help/content/po/ht/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ht\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/ht/log.po b/src/vidalia/help/content/po/ht/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ht/log.po
+++ b/src/vidalia/help/content/po/ht/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ht/netview.po b/src/vidalia/help/content/po/ht/netview.po
index 47f3d73..895ffb1 100644
--- a/src/vidalia/help/content/po/ht/netview.po
+++ b/src/vidalia/help/content/po/ht/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ht\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/ht/running.po b/src/vidalia/help/content/po/ht/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ht/running.po
+++ b/src/vidalia/help/content/po/ht/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ht/server.po b/src/vidalia/help/content/po/ht/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ht/server.po
+++ b/src/vidalia/help/content/po/ht/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ht/services.po b/src/vidalia/help/content/po/ht/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ht/services.po
+++ b/src/vidalia/help/content/po/ht/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ht/troubleshooting.po b/src/vidalia/help/content/po/ht/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ht/troubleshooting.po
+++ b/src/vidalia/help/content/po/ht/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hu/config.po b/src/vidalia/help/content/po/hu/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/hu/config.po
+++ b/src/vidalia/help/content/po/hu/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hu/index.po b/src/vidalia/help/content/po/hu/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/hu/index.po
+++ b/src/vidalia/help/content/po/hu/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hu/links.po b/src/vidalia/help/content/po/hu/links.po
index 3d33249..9498bed 100644
--- a/src/vidalia/help/content/po/hu/links.po
+++ b/src/vidalia/help/content/po/hu/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/hu/log.po b/src/vidalia/help/content/po/hu/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/hu/log.po
+++ b/src/vidalia/help/content/po/hu/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hu/netview.po b/src/vidalia/help/content/po/hu/netview.po
index 47f3d73..1d8621a 100644
--- a/src/vidalia/help/content/po/hu/netview.po
+++ b/src/vidalia/help/content/po/hu/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/hu/running.po b/src/vidalia/help/content/po/hu/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/hu/running.po
+++ b/src/vidalia/help/content/po/hu/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hu/server.po b/src/vidalia/help/content/po/hu/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/hu/server.po
+++ b/src/vidalia/help/content/po/hu/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hu/services.po b/src/vidalia/help/content/po/hu/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/hu/services.po
+++ b/src/vidalia/help/content/po/hu/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hu/troubleshooting.po b/src/vidalia/help/content/po/hu/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/hu/troubleshooting.po
+++ b/src/vidalia/help/content/po/hu/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hy/bridges.po b/src/vidalia/help/content/po/hy/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/hy/bridges.po
+++ b/src/vidalia/help/content/po/hy/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/hy/config.po b/src/vidalia/help/content/po/hy/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/hy/config.po
+++ b/src/vidalia/help/content/po/hy/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hy/index.po b/src/vidalia/help/content/po/hy/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/hy/index.po
+++ b/src/vidalia/help/content/po/hy/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hy/links.po b/src/vidalia/help/content/po/hy/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/hy/links.po
+++ b/src/vidalia/help/content/po/hy/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hy/log.po b/src/vidalia/help/content/po/hy/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/hy/log.po
+++ b/src/vidalia/help/content/po/hy/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hy/netview.po b/src/vidalia/help/content/po/hy/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/hy/netview.po
+++ b/src/vidalia/help/content/po/hy/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hy/running.po b/src/vidalia/help/content/po/hy/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/hy/running.po
+++ b/src/vidalia/help/content/po/hy/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hy/server.po b/src/vidalia/help/content/po/hy/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/hy/server.po
+++ b/src/vidalia/help/content/po/hy/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hy/services.po b/src/vidalia/help/content/po/hy/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/hy/services.po
+++ b/src/vidalia/help/content/po/hy/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/hy/troubleshooting.po b/src/vidalia/help/content/po/hy/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/hy/troubleshooting.po
+++ b/src/vidalia/help/content/po/hy/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/id/config.po b/src/vidalia/help/content/po/id/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/id/config.po
+++ b/src/vidalia/help/content/po/id/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/id/index.po b/src/vidalia/help/content/po/id/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/id/index.po
+++ b/src/vidalia/help/content/po/id/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/id/links.po b/src/vidalia/help/content/po/id/links.po
index 3d33249..ee4436d 100644
--- a/src/vidalia/help/content/po/id/links.po
+++ b/src/vidalia/help/content/po/id/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/id/log.po b/src/vidalia/help/content/po/id/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/id/log.po
+++ b/src/vidalia/help/content/po/id/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/id/netview.po b/src/vidalia/help/content/po/id/netview.po
index 47f3d73..08f1eac 100644
--- a/src/vidalia/help/content/po/id/netview.po
+++ b/src/vidalia/help/content/po/id/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/id/running.po b/src/vidalia/help/content/po/id/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/id/running.po
+++ b/src/vidalia/help/content/po/id/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/id/server.po b/src/vidalia/help/content/po/id/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/id/server.po
+++ b/src/vidalia/help/content/po/id/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/id/services.po b/src/vidalia/help/content/po/id/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/id/services.po
+++ b/src/vidalia/help/content/po/id/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/id/troubleshooting.po b/src/vidalia/help/content/po/id/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/id/troubleshooting.po
+++ b/src/vidalia/help/content/po/id/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/is/config.po b/src/vidalia/help/content/po/is/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/is/config.po
+++ b/src/vidalia/help/content/po/is/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/is/index.po b/src/vidalia/help/content/po/is/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/is/index.po
+++ b/src/vidalia/help/content/po/is/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/is/links.po b/src/vidalia/help/content/po/is/links.po
index 3d33249..b32f989 100644
--- a/src/vidalia/help/content/po/is/links.po
+++ b/src/vidalia/help/content/po/is/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/is/log.po b/src/vidalia/help/content/po/is/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/is/log.po
+++ b/src/vidalia/help/content/po/is/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/is/netview.po b/src/vidalia/help/content/po/is/netview.po
index 47f3d73..02af0a6 100644
--- a/src/vidalia/help/content/po/is/netview.po
+++ b/src/vidalia/help/content/po/is/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/is/running.po b/src/vidalia/help/content/po/is/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/is/running.po
+++ b/src/vidalia/help/content/po/is/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/is/server.po b/src/vidalia/help/content/po/is/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/is/server.po
+++ b/src/vidalia/help/content/po/is/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/is/services.po b/src/vidalia/help/content/po/is/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/is/services.po
+++ b/src/vidalia/help/content/po/is/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/is/troubleshooting.po b/src/vidalia/help/content/po/is/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/is/troubleshooting.po
+++ b/src/vidalia/help/content/po/is/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/it/config.po b/src/vidalia/help/content/po/it/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/it/config.po
+++ b/src/vidalia/help/content/po/it/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/it/index.po b/src/vidalia/help/content/po/it/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/it/index.po
+++ b/src/vidalia/help/content/po/it/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/it/links.po b/src/vidalia/help/content/po/it/links.po
index 75950bf..288186e 100644
--- a/src/vidalia/help/content/po/it/links.po
+++ b/src/vidalia/help/content/po/it/links.po
@@ -1,51 +1,40 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr "Link utili"
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr "Vidalia"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr " "
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr "Homepage"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
@@ -54,71 +43,38 @@ msgstr ""
"https://www.torproject.org/vidalia/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr "Wiki"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> http://trac.vidalia-"
-"project.net/wiki</a>"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr "Bugtracker"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/report\"> http://trac.vidalia-"
-"project.net/report</a>"
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr "Tor"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr "FAQ"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
-msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
diff --git a/src/vidalia/help/content/po/it/log.po b/src/vidalia/help/content/po/it/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/it/log.po
+++ b/src/vidalia/help/content/po/it/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/it/netview.po b/src/vidalia/help/content/po/it/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/it/netview.po
+++ b/src/vidalia/help/content/po/it/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/it/running.po b/src/vidalia/help/content/po/it/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/it/running.po
+++ b/src/vidalia/help/content/po/it/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/it/server.po b/src/vidalia/help/content/po/it/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/it/server.po
+++ b/src/vidalia/help/content/po/it/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/it/services.po b/src/vidalia/help/content/po/it/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/it/services.po
+++ b/src/vidalia/help/content/po/it/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/it/troubleshooting.po b/src/vidalia/help/content/po/it/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/it/troubleshooting.po
+++ b/src/vidalia/help/content/po/it/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ja/bridges.po b/src/vidalia/help/content/po/ja/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/ja/bridges.po
+++ b/src/vidalia/help/content/po/ja/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/ja/config.po b/src/vidalia/help/content/po/ja/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ja/config.po
+++ b/src/vidalia/help/content/po/ja/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ja/index.po b/src/vidalia/help/content/po/ja/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ja/index.po
+++ b/src/vidalia/help/content/po/ja/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ja/links.po b/src/vidalia/help/content/po/ja/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/ja/links.po
+++ b/src/vidalia/help/content/po/ja/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ja/log.po b/src/vidalia/help/content/po/ja/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ja/log.po
+++ b/src/vidalia/help/content/po/ja/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ja/netview.po b/src/vidalia/help/content/po/ja/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/ja/netview.po
+++ b/src/vidalia/help/content/po/ja/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ja/running.po b/src/vidalia/help/content/po/ja/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ja/running.po
+++ b/src/vidalia/help/content/po/ja/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ja/server.po b/src/vidalia/help/content/po/ja/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ja/server.po
+++ b/src/vidalia/help/content/po/ja/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ja/services.po b/src/vidalia/help/content/po/ja/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ja/services.po
+++ b/src/vidalia/help/content/po/ja/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ja/troubleshooting.po b/src/vidalia/help/content/po/ja/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ja/troubleshooting.po
+++ b/src/vidalia/help/content/po/ja/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/jv/bridges.po b/src/vidalia/help/content/po/jv/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/jv/bridges.po
+++ b/src/vidalia/help/content/po/jv/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/jv/config.po b/src/vidalia/help/content/po/jv/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/jv/config.po
+++ b/src/vidalia/help/content/po/jv/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/jv/index.po b/src/vidalia/help/content/po/jv/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/jv/index.po
+++ b/src/vidalia/help/content/po/jv/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/jv/links.po b/src/vidalia/help/content/po/jv/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/jv/links.po
+++ b/src/vidalia/help/content/po/jv/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/jv/log.po b/src/vidalia/help/content/po/jv/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/jv/log.po
+++ b/src/vidalia/help/content/po/jv/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/jv/netview.po b/src/vidalia/help/content/po/jv/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/jv/netview.po
+++ b/src/vidalia/help/content/po/jv/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/jv/running.po b/src/vidalia/help/content/po/jv/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/jv/running.po
+++ b/src/vidalia/help/content/po/jv/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/jv/server.po b/src/vidalia/help/content/po/jv/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/jv/server.po
+++ b/src/vidalia/help/content/po/jv/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/jv/services.po b/src/vidalia/help/content/po/jv/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/jv/services.po
+++ b/src/vidalia/help/content/po/jv/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/jv/troubleshooting.po b/src/vidalia/help/content/po/jv/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/jv/troubleshooting.po
+++ b/src/vidalia/help/content/po/jv/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ka/bridges.po b/src/vidalia/help/content/po/ka/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/ka/bridges.po
+++ b/src/vidalia/help/content/po/ka/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/ka/config.po b/src/vidalia/help/content/po/ka/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ka/config.po
+++ b/src/vidalia/help/content/po/ka/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ka/index.po b/src/vidalia/help/content/po/ka/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ka/index.po
+++ b/src/vidalia/help/content/po/ka/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ka/links.po b/src/vidalia/help/content/po/ka/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/ka/links.po
+++ b/src/vidalia/help/content/po/ka/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ka/log.po b/src/vidalia/help/content/po/ka/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ka/log.po
+++ b/src/vidalia/help/content/po/ka/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ka/netview.po b/src/vidalia/help/content/po/ka/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/ka/netview.po
+++ b/src/vidalia/help/content/po/ka/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ka/running.po b/src/vidalia/help/content/po/ka/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ka/running.po
+++ b/src/vidalia/help/content/po/ka/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ka/server.po b/src/vidalia/help/content/po/ka/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ka/server.po
+++ b/src/vidalia/help/content/po/ka/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ka/services.po b/src/vidalia/help/content/po/ka/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ka/services.po
+++ b/src/vidalia/help/content/po/ka/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ka/troubleshooting.po b/src/vidalia/help/content/po/ka/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ka/troubleshooting.po
+++ b/src/vidalia/help/content/po/ka/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/km/bridges.po b/src/vidalia/help/content/po/km/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/km/bridges.po
+++ b/src/vidalia/help/content/po/km/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/km/config.po b/src/vidalia/help/content/po/km/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/km/config.po
+++ b/src/vidalia/help/content/po/km/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/km/index.po b/src/vidalia/help/content/po/km/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/km/index.po
+++ b/src/vidalia/help/content/po/km/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/km/links.po b/src/vidalia/help/content/po/km/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/km/links.po
+++ b/src/vidalia/help/content/po/km/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/km/log.po b/src/vidalia/help/content/po/km/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/km/log.po
+++ b/src/vidalia/help/content/po/km/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/km/netview.po b/src/vidalia/help/content/po/km/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/km/netview.po
+++ b/src/vidalia/help/content/po/km/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/km/running.po b/src/vidalia/help/content/po/km/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/km/running.po
+++ b/src/vidalia/help/content/po/km/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/km/server.po b/src/vidalia/help/content/po/km/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/km/server.po
+++ b/src/vidalia/help/content/po/km/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/km/services.po b/src/vidalia/help/content/po/km/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/km/services.po
+++ b/src/vidalia/help/content/po/km/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/km/troubleshooting.po b/src/vidalia/help/content/po/km/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/km/troubleshooting.po
+++ b/src/vidalia/help/content/po/km/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/kn/config.po b/src/vidalia/help/content/po/kn/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/kn/config.po
+++ b/src/vidalia/help/content/po/kn/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/kn/index.po b/src/vidalia/help/content/po/kn/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/kn/index.po
+++ b/src/vidalia/help/content/po/kn/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/kn/links.po b/src/vidalia/help/content/po/kn/links.po
index 3d33249..23498b8 100644
--- a/src/vidalia/help/content/po/kn/links.po
+++ b/src/vidalia/help/content/po/kn/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/kn/log.po b/src/vidalia/help/content/po/kn/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/kn/log.po
+++ b/src/vidalia/help/content/po/kn/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/kn/netview.po b/src/vidalia/help/content/po/kn/netview.po
index 47f3d73..9fb7dd1 100644
--- a/src/vidalia/help/content/po/kn/netview.po
+++ b/src/vidalia/help/content/po/kn/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/kn/running.po b/src/vidalia/help/content/po/kn/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/kn/running.po
+++ b/src/vidalia/help/content/po/kn/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/kn/server.po b/src/vidalia/help/content/po/kn/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/kn/server.po
+++ b/src/vidalia/help/content/po/kn/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/kn/services.po b/src/vidalia/help/content/po/kn/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/kn/services.po
+++ b/src/vidalia/help/content/po/kn/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/kn/troubleshooting.po b/src/vidalia/help/content/po/kn/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/kn/troubleshooting.po
+++ b/src/vidalia/help/content/po/kn/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ko/bridges.po b/src/vidalia/help/content/po/ko/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/ko/bridges.po
+++ b/src/vidalia/help/content/po/ko/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/ko/config.po b/src/vidalia/help/content/po/ko/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ko/config.po
+++ b/src/vidalia/help/content/po/ko/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ko/index.po b/src/vidalia/help/content/po/ko/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ko/index.po
+++ b/src/vidalia/help/content/po/ko/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ko/links.po b/src/vidalia/help/content/po/ko/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/ko/links.po
+++ b/src/vidalia/help/content/po/ko/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ko/log.po b/src/vidalia/help/content/po/ko/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ko/log.po
+++ b/src/vidalia/help/content/po/ko/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ko/netview.po b/src/vidalia/help/content/po/ko/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/ko/netview.po
+++ b/src/vidalia/help/content/po/ko/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ko/running.po b/src/vidalia/help/content/po/ko/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ko/running.po
+++ b/src/vidalia/help/content/po/ko/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ko/server.po b/src/vidalia/help/content/po/ko/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ko/server.po
+++ b/src/vidalia/help/content/po/ko/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ko/services.po b/src/vidalia/help/content/po/ko/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ko/services.po
+++ b/src/vidalia/help/content/po/ko/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ko/troubleshooting.po b/src/vidalia/help/content/po/ko/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ko/troubleshooting.po
+++ b/src/vidalia/help/content/po/ko/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ku/bridges.po b/src/vidalia/help/content/po/ku/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/ku/bridges.po
+++ b/src/vidalia/help/content/po/ku/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/ku/config.po b/src/vidalia/help/content/po/ku/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ku/config.po
+++ b/src/vidalia/help/content/po/ku/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ku/index.po b/src/vidalia/help/content/po/ku/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ku/index.po
+++ b/src/vidalia/help/content/po/ku/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ku/links.po b/src/vidalia/help/content/po/ku/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/ku/links.po
+++ b/src/vidalia/help/content/po/ku/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ku/log.po b/src/vidalia/help/content/po/ku/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ku/log.po
+++ b/src/vidalia/help/content/po/ku/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ku/netview.po b/src/vidalia/help/content/po/ku/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/ku/netview.po
+++ b/src/vidalia/help/content/po/ku/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ku/running.po b/src/vidalia/help/content/po/ku/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ku/running.po
+++ b/src/vidalia/help/content/po/ku/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ku/server.po b/src/vidalia/help/content/po/ku/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ku/server.po
+++ b/src/vidalia/help/content/po/ku/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ku/services.po b/src/vidalia/help/content/po/ku/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ku/services.po
+++ b/src/vidalia/help/content/po/ku/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ku/troubleshooting.po b/src/vidalia/help/content/po/ku/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ku/troubleshooting.po
+++ b/src/vidalia/help/content/po/ku/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/kw/config.po b/src/vidalia/help/content/po/kw/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/kw/config.po
+++ b/src/vidalia/help/content/po/kw/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/kw/index.po b/src/vidalia/help/content/po/kw/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/kw/index.po
+++ b/src/vidalia/help/content/po/kw/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/kw/links.po b/src/vidalia/help/content/po/kw/links.po
index 3d33249..71cd9ae 100644
--- a/src/vidalia/help/content/po/kw/links.po
+++ b/src/vidalia/help/content/po/kw/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: kw\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : 3\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/kw/log.po b/src/vidalia/help/content/po/kw/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/kw/log.po
+++ b/src/vidalia/help/content/po/kw/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/kw/netview.po b/src/vidalia/help/content/po/kw/netview.po
index 47f3d73..3253e05 100644
--- a/src/vidalia/help/content/po/kw/netview.po
+++ b/src/vidalia/help/content/po/kw/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: kw\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : 3\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/kw/running.po b/src/vidalia/help/content/po/kw/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/kw/running.po
+++ b/src/vidalia/help/content/po/kw/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/kw/server.po b/src/vidalia/help/content/po/kw/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/kw/server.po
+++ b/src/vidalia/help/content/po/kw/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/kw/services.po b/src/vidalia/help/content/po/kw/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/kw/services.po
+++ b/src/vidalia/help/content/po/kw/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/kw/troubleshooting.po b/src/vidalia/help/content/po/kw/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/kw/troubleshooting.po
+++ b/src/vidalia/help/content/po/kw/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ky/bridges.po b/src/vidalia/help/content/po/ky/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/ky/bridges.po
+++ b/src/vidalia/help/content/po/ky/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/ky/config.po b/src/vidalia/help/content/po/ky/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ky/config.po
+++ b/src/vidalia/help/content/po/ky/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ky/index.po b/src/vidalia/help/content/po/ky/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ky/index.po
+++ b/src/vidalia/help/content/po/ky/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ky/links.po b/src/vidalia/help/content/po/ky/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/ky/links.po
+++ b/src/vidalia/help/content/po/ky/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ky/log.po b/src/vidalia/help/content/po/ky/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ky/log.po
+++ b/src/vidalia/help/content/po/ky/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ky/netview.po b/src/vidalia/help/content/po/ky/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/ky/netview.po
+++ b/src/vidalia/help/content/po/ky/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ky/running.po b/src/vidalia/help/content/po/ky/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ky/running.po
+++ b/src/vidalia/help/content/po/ky/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ky/server.po b/src/vidalia/help/content/po/ky/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ky/server.po
+++ b/src/vidalia/help/content/po/ky/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ky/services.po b/src/vidalia/help/content/po/ky/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ky/services.po
+++ b/src/vidalia/help/content/po/ky/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ky/troubleshooting.po b/src/vidalia/help/content/po/ky/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ky/troubleshooting.po
+++ b/src/vidalia/help/content/po/ky/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lb/config.po b/src/vidalia/help/content/po/lb/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/lb/config.po
+++ b/src/vidalia/help/content/po/lb/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lb/index.po b/src/vidalia/help/content/po/lb/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/lb/index.po
+++ b/src/vidalia/help/content/po/lb/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lb/links.po b/src/vidalia/help/content/po/lb/links.po
index 3d33249..91ab85a 100644
--- a/src/vidalia/help/content/po/lb/links.po
+++ b/src/vidalia/help/content/po/lb/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/lb/log.po b/src/vidalia/help/content/po/lb/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/lb/log.po
+++ b/src/vidalia/help/content/po/lb/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lb/netview.po b/src/vidalia/help/content/po/lb/netview.po
index 47f3d73..5b4167f 100644
--- a/src/vidalia/help/content/po/lb/netview.po
+++ b/src/vidalia/help/content/po/lb/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/lb/running.po b/src/vidalia/help/content/po/lb/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/lb/running.po
+++ b/src/vidalia/help/content/po/lb/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lb/server.po b/src/vidalia/help/content/po/lb/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/lb/server.po
+++ b/src/vidalia/help/content/po/lb/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lb/services.po b/src/vidalia/help/content/po/lb/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/lb/services.po
+++ b/src/vidalia/help/content/po/lb/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lb/troubleshooting.po b/src/vidalia/help/content/po/lb/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/lb/troubleshooting.po
+++ b/src/vidalia/help/content/po/lb/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lg/bridges.po b/src/vidalia/help/content/po/lg/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/lg/bridges.po
+++ b/src/vidalia/help/content/po/lg/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/lg/config.po b/src/vidalia/help/content/po/lg/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/lg/config.po
+++ b/src/vidalia/help/content/po/lg/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lg/index.po b/src/vidalia/help/content/po/lg/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/lg/index.po
+++ b/src/vidalia/help/content/po/lg/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lg/links.po b/src/vidalia/help/content/po/lg/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/lg/links.po
+++ b/src/vidalia/help/content/po/lg/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lg/log.po b/src/vidalia/help/content/po/lg/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/lg/log.po
+++ b/src/vidalia/help/content/po/lg/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lg/netview.po b/src/vidalia/help/content/po/lg/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/lg/netview.po
+++ b/src/vidalia/help/content/po/lg/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lg/running.po b/src/vidalia/help/content/po/lg/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/lg/running.po
+++ b/src/vidalia/help/content/po/lg/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lg/server.po b/src/vidalia/help/content/po/lg/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/lg/server.po
+++ b/src/vidalia/help/content/po/lg/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lg/services.po b/src/vidalia/help/content/po/lg/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/lg/services.po
+++ b/src/vidalia/help/content/po/lg/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lg/troubleshooting.po b/src/vidalia/help/content/po/lg/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/lg/troubleshooting.po
+++ b/src/vidalia/help/content/po/lg/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ln/config.po b/src/vidalia/help/content/po/ln/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ln/config.po
+++ b/src/vidalia/help/content/po/ln/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ln/index.po b/src/vidalia/help/content/po/ln/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ln/index.po
+++ b/src/vidalia/help/content/po/ln/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ln/links.po b/src/vidalia/help/content/po/ln/links.po
index 3d33249..52f2fef 100644
--- a/src/vidalia/help/content/po/ln/links.po
+++ b/src/vidalia/help/content/po/ln/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ln\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/ln/log.po b/src/vidalia/help/content/po/ln/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ln/log.po
+++ b/src/vidalia/help/content/po/ln/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ln/netview.po b/src/vidalia/help/content/po/ln/netview.po
index 47f3d73..44255cb 100644
--- a/src/vidalia/help/content/po/ln/netview.po
+++ b/src/vidalia/help/content/po/ln/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ln\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/ln/running.po b/src/vidalia/help/content/po/ln/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ln/running.po
+++ b/src/vidalia/help/content/po/ln/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ln/server.po b/src/vidalia/help/content/po/ln/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ln/server.po
+++ b/src/vidalia/help/content/po/ln/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ln/services.po b/src/vidalia/help/content/po/ln/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ln/services.po
+++ b/src/vidalia/help/content/po/ln/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ln/troubleshooting.po b/src/vidalia/help/content/po/ln/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ln/troubleshooting.po
+++ b/src/vidalia/help/content/po/ln/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lo/config.po b/src/vidalia/help/content/po/lo/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/lo/config.po
+++ b/src/vidalia/help/content/po/lo/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lo/index.po b/src/vidalia/help/content/po/lo/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/lo/index.po
+++ b/src/vidalia/help/content/po/lo/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lo/links.po b/src/vidalia/help/content/po/lo/links.po
index 3d33249..27e6464 100644
--- a/src/vidalia/help/content/po/lo/links.po
+++ b/src/vidalia/help/content/po/lo/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: lo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/lo/log.po b/src/vidalia/help/content/po/lo/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/lo/log.po
+++ b/src/vidalia/help/content/po/lo/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lo/netview.po b/src/vidalia/help/content/po/lo/netview.po
index 47f3d73..dec50df 100644
--- a/src/vidalia/help/content/po/lo/netview.po
+++ b/src/vidalia/help/content/po/lo/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: lo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/lo/running.po b/src/vidalia/help/content/po/lo/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/lo/running.po
+++ b/src/vidalia/help/content/po/lo/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lo/server.po b/src/vidalia/help/content/po/lo/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/lo/server.po
+++ b/src/vidalia/help/content/po/lo/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lo/services.po b/src/vidalia/help/content/po/lo/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/lo/services.po
+++ b/src/vidalia/help/content/po/lo/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lo/troubleshooting.po b/src/vidalia/help/content/po/lo/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/lo/troubleshooting.po
+++ b/src/vidalia/help/content/po/lo/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lt/config.po b/src/vidalia/help/content/po/lt/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/lt/config.po
+++ b/src/vidalia/help/content/po/lt/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lt/index.po b/src/vidalia/help/content/po/lt/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/lt/index.po
+++ b/src/vidalia/help/content/po/lt/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lt/links.po b/src/vidalia/help/content/po/lt/links.po
index 3d33249..c429e3e 100644
--- a/src/vidalia/help/content/po/lt/links.po
+++ b/src/vidalia/help/content/po/lt/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/lt/log.po b/src/vidalia/help/content/po/lt/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/lt/log.po
+++ b/src/vidalia/help/content/po/lt/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lt/netview.po b/src/vidalia/help/content/po/lt/netview.po
index 47f3d73..ca0b4ac 100644
--- a/src/vidalia/help/content/po/lt/netview.po
+++ b/src/vidalia/help/content/po/lt/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/lt/running.po b/src/vidalia/help/content/po/lt/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/lt/running.po
+++ b/src/vidalia/help/content/po/lt/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lt/server.po b/src/vidalia/help/content/po/lt/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/lt/server.po
+++ b/src/vidalia/help/content/po/lt/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lt/services.po b/src/vidalia/help/content/po/lt/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/lt/services.po
+++ b/src/vidalia/help/content/po/lt/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lt/troubleshooting.po b/src/vidalia/help/content/po/lt/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/lt/troubleshooting.po
+++ b/src/vidalia/help/content/po/lt/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lv/config.po b/src/vidalia/help/content/po/lv/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/lv/config.po
+++ b/src/vidalia/help/content/po/lv/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lv/index.po b/src/vidalia/help/content/po/lv/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/lv/index.po
+++ b/src/vidalia/help/content/po/lv/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lv/links.po b/src/vidalia/help/content/po/lv/links.po
index 3d33249..cbf6448 100644
--- a/src/vidalia/help/content/po/lv/links.po
+++ b/src/vidalia/help/content/po/lv/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/lv/log.po b/src/vidalia/help/content/po/lv/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/lv/log.po
+++ b/src/vidalia/help/content/po/lv/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lv/netview.po b/src/vidalia/help/content/po/lv/netview.po
index 47f3d73..4aab18d 100644
--- a/src/vidalia/help/content/po/lv/netview.po
+++ b/src/vidalia/help/content/po/lv/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/lv/running.po b/src/vidalia/help/content/po/lv/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/lv/running.po
+++ b/src/vidalia/help/content/po/lv/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lv/server.po b/src/vidalia/help/content/po/lv/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/lv/server.po
+++ b/src/vidalia/help/content/po/lv/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lv/services.po b/src/vidalia/help/content/po/lv/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/lv/services.po
+++ b/src/vidalia/help/content/po/lv/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/lv/troubleshooting.po b/src/vidalia/help/content/po/lv/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/lv/troubleshooting.po
+++ b/src/vidalia/help/content/po/lv/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mg/config.po b/src/vidalia/help/content/po/mg/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/mg/config.po
+++ b/src/vidalia/help/content/po/mg/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mg/index.po b/src/vidalia/help/content/po/mg/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/mg/index.po
+++ b/src/vidalia/help/content/po/mg/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mg/links.po b/src/vidalia/help/content/po/mg/links.po
index 3d33249..2824d9e 100644
--- a/src/vidalia/help/content/po/mg/links.po
+++ b/src/vidalia/help/content/po/mg/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: mg\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/mg/log.po b/src/vidalia/help/content/po/mg/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/mg/log.po
+++ b/src/vidalia/help/content/po/mg/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mg/netview.po b/src/vidalia/help/content/po/mg/netview.po
index 47f3d73..849cdf1 100644
--- a/src/vidalia/help/content/po/mg/netview.po
+++ b/src/vidalia/help/content/po/mg/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: mg\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/mg/running.po b/src/vidalia/help/content/po/mg/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/mg/running.po
+++ b/src/vidalia/help/content/po/mg/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mg/server.po b/src/vidalia/help/content/po/mg/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/mg/server.po
+++ b/src/vidalia/help/content/po/mg/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mg/services.po b/src/vidalia/help/content/po/mg/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/mg/services.po
+++ b/src/vidalia/help/content/po/mg/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mg/troubleshooting.po b/src/vidalia/help/content/po/mg/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/mg/troubleshooting.po
+++ b/src/vidalia/help/content/po/mg/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mi/config.po b/src/vidalia/help/content/po/mi/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/mi/config.po
+++ b/src/vidalia/help/content/po/mi/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mi/index.po b/src/vidalia/help/content/po/mi/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/mi/index.po
+++ b/src/vidalia/help/content/po/mi/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mi/links.po b/src/vidalia/help/content/po/mi/links.po
index 3d33249..1964adf 100644
--- a/src/vidalia/help/content/po/mi/links.po
+++ b/src/vidalia/help/content/po/mi/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: mi\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/mi/log.po b/src/vidalia/help/content/po/mi/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/mi/log.po
+++ b/src/vidalia/help/content/po/mi/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mi/netview.po b/src/vidalia/help/content/po/mi/netview.po
index 47f3d73..77d5231 100644
--- a/src/vidalia/help/content/po/mi/netview.po
+++ b/src/vidalia/help/content/po/mi/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: mi\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/mi/running.po b/src/vidalia/help/content/po/mi/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/mi/running.po
+++ b/src/vidalia/help/content/po/mi/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mi/server.po b/src/vidalia/help/content/po/mi/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/mi/server.po
+++ b/src/vidalia/help/content/po/mi/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mi/services.po b/src/vidalia/help/content/po/mi/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/mi/services.po
+++ b/src/vidalia/help/content/po/mi/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mi/troubleshooting.po b/src/vidalia/help/content/po/mi/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/mi/troubleshooting.po
+++ b/src/vidalia/help/content/po/mi/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mk/config.po b/src/vidalia/help/content/po/mk/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/mk/config.po
+++ b/src/vidalia/help/content/po/mk/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mk/index.po b/src/vidalia/help/content/po/mk/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/mk/index.po
+++ b/src/vidalia/help/content/po/mk/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mk/links.po b/src/vidalia/help/content/po/mk/links.po
index 3d33249..279072a 100644
--- a/src/vidalia/help/content/po/mk/links.po
+++ b/src/vidalia/help/content/po/mk/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/mk/log.po b/src/vidalia/help/content/po/mk/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/mk/log.po
+++ b/src/vidalia/help/content/po/mk/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mk/netview.po b/src/vidalia/help/content/po/mk/netview.po
index 47f3d73..6dbd9ee 100644
--- a/src/vidalia/help/content/po/mk/netview.po
+++ b/src/vidalia/help/content/po/mk/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/mk/running.po b/src/vidalia/help/content/po/mk/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/mk/running.po
+++ b/src/vidalia/help/content/po/mk/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mk/server.po b/src/vidalia/help/content/po/mk/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/mk/server.po
+++ b/src/vidalia/help/content/po/mk/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mk/services.po b/src/vidalia/help/content/po/mk/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/mk/services.po
+++ b/src/vidalia/help/content/po/mk/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mk/troubleshooting.po b/src/vidalia/help/content/po/mk/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/mk/troubleshooting.po
+++ b/src/vidalia/help/content/po/mk/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ml/config.po b/src/vidalia/help/content/po/ml/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ml/config.po
+++ b/src/vidalia/help/content/po/ml/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ml/index.po b/src/vidalia/help/content/po/ml/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ml/index.po
+++ b/src/vidalia/help/content/po/ml/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ml/links.po b/src/vidalia/help/content/po/ml/links.po
index 3d33249..12fd75e 100644
--- a/src/vidalia/help/content/po/ml/links.po
+++ b/src/vidalia/help/content/po/ml/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/ml/log.po b/src/vidalia/help/content/po/ml/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ml/log.po
+++ b/src/vidalia/help/content/po/ml/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ml/netview.po b/src/vidalia/help/content/po/ml/netview.po
index 47f3d73..ef9ffa6 100644
--- a/src/vidalia/help/content/po/ml/netview.po
+++ b/src/vidalia/help/content/po/ml/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/ml/running.po b/src/vidalia/help/content/po/ml/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ml/running.po
+++ b/src/vidalia/help/content/po/ml/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ml/server.po b/src/vidalia/help/content/po/ml/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ml/server.po
+++ b/src/vidalia/help/content/po/ml/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ml/services.po b/src/vidalia/help/content/po/ml/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ml/services.po
+++ b/src/vidalia/help/content/po/ml/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ml/troubleshooting.po b/src/vidalia/help/content/po/ml/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ml/troubleshooting.po
+++ b/src/vidalia/help/content/po/ml/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mn/config.po b/src/vidalia/help/content/po/mn/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/mn/config.po
+++ b/src/vidalia/help/content/po/mn/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mn/index.po b/src/vidalia/help/content/po/mn/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/mn/index.po
+++ b/src/vidalia/help/content/po/mn/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mn/links.po b/src/vidalia/help/content/po/mn/links.po
index 3d33249..bac14dd 100644
--- a/src/vidalia/help/content/po/mn/links.po
+++ b/src/vidalia/help/content/po/mn/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/mn/log.po b/src/vidalia/help/content/po/mn/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/mn/log.po
+++ b/src/vidalia/help/content/po/mn/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mn/netview.po b/src/vidalia/help/content/po/mn/netview.po
index 47f3d73..450c1ed 100644
--- a/src/vidalia/help/content/po/mn/netview.po
+++ b/src/vidalia/help/content/po/mn/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/mn/running.po b/src/vidalia/help/content/po/mn/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/mn/running.po
+++ b/src/vidalia/help/content/po/mn/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mn/server.po b/src/vidalia/help/content/po/mn/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/mn/server.po
+++ b/src/vidalia/help/content/po/mn/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mn/services.po b/src/vidalia/help/content/po/mn/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/mn/services.po
+++ b/src/vidalia/help/content/po/mn/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mn/troubleshooting.po b/src/vidalia/help/content/po/mn/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/mn/troubleshooting.po
+++ b/src/vidalia/help/content/po/mn/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mr/config.po b/src/vidalia/help/content/po/mr/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/mr/config.po
+++ b/src/vidalia/help/content/po/mr/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mr/index.po b/src/vidalia/help/content/po/mr/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/mr/index.po
+++ b/src/vidalia/help/content/po/mr/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mr/links.po b/src/vidalia/help/content/po/mr/links.po
index 3d33249..bbba452 100644
--- a/src/vidalia/help/content/po/mr/links.po
+++ b/src/vidalia/help/content/po/mr/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: mr\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/mr/log.po b/src/vidalia/help/content/po/mr/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/mr/log.po
+++ b/src/vidalia/help/content/po/mr/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mr/netview.po b/src/vidalia/help/content/po/mr/netview.po
index 47f3d73..f450fe0 100644
--- a/src/vidalia/help/content/po/mr/netview.po
+++ b/src/vidalia/help/content/po/mr/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: mr\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/mr/running.po b/src/vidalia/help/content/po/mr/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/mr/running.po
+++ b/src/vidalia/help/content/po/mr/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mr/server.po b/src/vidalia/help/content/po/mr/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/mr/server.po
+++ b/src/vidalia/help/content/po/mr/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mr/services.po b/src/vidalia/help/content/po/mr/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/mr/services.po
+++ b/src/vidalia/help/content/po/mr/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mr/troubleshooting.po b/src/vidalia/help/content/po/mr/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/mr/troubleshooting.po
+++ b/src/vidalia/help/content/po/mr/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ms/config.po b/src/vidalia/help/content/po/ms/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ms/config.po
+++ b/src/vidalia/help/content/po/ms/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ms/index.po b/src/vidalia/help/content/po/ms/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ms/index.po
+++ b/src/vidalia/help/content/po/ms/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ms/links.po b/src/vidalia/help/content/po/ms/links.po
index 3d33249..f32003d 100644
--- a/src/vidalia/help/content/po/ms/links.po
+++ b/src/vidalia/help/content/po/ms/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ms\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/ms/log.po b/src/vidalia/help/content/po/ms/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ms/log.po
+++ b/src/vidalia/help/content/po/ms/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ms/netview.po b/src/vidalia/help/content/po/ms/netview.po
index 47f3d73..e65713a 100644
--- a/src/vidalia/help/content/po/ms/netview.po
+++ b/src/vidalia/help/content/po/ms/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ms\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/ms/running.po b/src/vidalia/help/content/po/ms/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ms/running.po
+++ b/src/vidalia/help/content/po/ms/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ms/server.po b/src/vidalia/help/content/po/ms/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ms/server.po
+++ b/src/vidalia/help/content/po/ms/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ms/services.po b/src/vidalia/help/content/po/ms/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ms/services.po
+++ b/src/vidalia/help/content/po/ms/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ms/troubleshooting.po b/src/vidalia/help/content/po/ms/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ms/troubleshooting.po
+++ b/src/vidalia/help/content/po/ms/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mt/config.po b/src/vidalia/help/content/po/mt/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/mt/config.po
+++ b/src/vidalia/help/content/po/mt/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mt/index.po b/src/vidalia/help/content/po/mt/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/mt/index.po
+++ b/src/vidalia/help/content/po/mt/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mt/links.po b/src/vidalia/help/content/po/mt/links.po
index 3d33249..2953719 100644
--- a/src/vidalia/help/content/po/mt/links.po
+++ b/src/vidalia/help/content/po/mt/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: mt\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/mt/log.po b/src/vidalia/help/content/po/mt/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/mt/log.po
+++ b/src/vidalia/help/content/po/mt/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mt/netview.po b/src/vidalia/help/content/po/mt/netview.po
index 47f3d73..fc20730 100644
--- a/src/vidalia/help/content/po/mt/netview.po
+++ b/src/vidalia/help/content/po/mt/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: mt\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/mt/running.po b/src/vidalia/help/content/po/mt/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/mt/running.po
+++ b/src/vidalia/help/content/po/mt/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mt/server.po b/src/vidalia/help/content/po/mt/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/mt/server.po
+++ b/src/vidalia/help/content/po/mt/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mt/services.po b/src/vidalia/help/content/po/mt/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/mt/services.po
+++ b/src/vidalia/help/content/po/mt/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/mt/troubleshooting.po b/src/vidalia/help/content/po/mt/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/mt/troubleshooting.po
+++ b/src/vidalia/help/content/po/mt/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/my/config.po b/src/vidalia/help/content/po/my/config.po
index 0b9f703..5abc139 100644
--- a/src/vidalia/help/content/po/my/config.po
+++ b/src/vidalia/help/content/po/my/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/my/index.po b/src/vidalia/help/content/po/my/index.po
index 714d8a0..90e2591 100644
--- a/src/vidalia/help/content/po/my/index.po
+++ b/src/vidalia/help/content/po/my/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/my/links.po b/src/vidalia/help/content/po/my/links.po
index 5dd9d2d..31d2218 100644
--- a/src/vidalia/help/content/po/my/links.po
+++ b/src/vidalia/help/content/po/my/links.po
@@ -1,51 +1,40 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr "အသံုးဝင္ေသာ Links မ်ား"
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr "Vidalia"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr " "
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr "မူလစာမ်က္ႏွာ"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
@@ -54,71 +43,38 @@ msgstr ""
"https://www.torproject.org/vidalia/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr "Wiki"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> http://trac.vidalia-"
-"project.net/wiki</a>"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr "Bugtracker"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/report\"> http://trac.vidalia-"
-"project.net/report</a>"
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr "Tor"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr "ေမးေနက်ေမးခြန္းမ်ား"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
-msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
diff --git a/src/vidalia/help/content/po/my/log.po b/src/vidalia/help/content/po/my/log.po
index d8b9ae5..a1ad413 100644
--- a/src/vidalia/help/content/po/my/log.po
+++ b/src/vidalia/help/content/po/my/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/my/netview.po b/src/vidalia/help/content/po/my/netview.po
index 02b38fd..a412447 100644
--- a/src/vidalia/help/content/po/my/netview.po
+++ b/src/vidalia/help/content/po/my/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/my/running.po b/src/vidalia/help/content/po/my/running.po
index 7876f87..ebc24ce 100644
--- a/src/vidalia/help/content/po/my/running.po
+++ b/src/vidalia/help/content/po/my/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/my/server.po b/src/vidalia/help/content/po/my/server.po
index 0d546b8..2af52d7 100644
--- a/src/vidalia/help/content/po/my/server.po
+++ b/src/vidalia/help/content/po/my/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/my/services.po b/src/vidalia/help/content/po/my/services.po
index 406ae23..c46fe5e 100644
--- a/src/vidalia/help/content/po/my/services.po
+++ b/src/vidalia/help/content/po/my/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/my/troubleshooting.po b/src/vidalia/help/content/po/my/troubleshooting.po
index 119aba0..25679c1 100644
--- a/src/vidalia/help/content/po/my/troubleshooting.po
+++ b/src/vidalia/help/content/po/my/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nah/bridges.po b/src/vidalia/help/content/po/nah/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/nah/bridges.po
+++ b/src/vidalia/help/content/po/nah/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/nah/config.po b/src/vidalia/help/content/po/nah/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/nah/config.po
+++ b/src/vidalia/help/content/po/nah/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nah/index.po b/src/vidalia/help/content/po/nah/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/nah/index.po
+++ b/src/vidalia/help/content/po/nah/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nah/links.po b/src/vidalia/help/content/po/nah/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/nah/links.po
+++ b/src/vidalia/help/content/po/nah/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nah/log.po b/src/vidalia/help/content/po/nah/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/nah/log.po
+++ b/src/vidalia/help/content/po/nah/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nah/netview.po b/src/vidalia/help/content/po/nah/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/nah/netview.po
+++ b/src/vidalia/help/content/po/nah/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nah/running.po b/src/vidalia/help/content/po/nah/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/nah/running.po
+++ b/src/vidalia/help/content/po/nah/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nah/server.po b/src/vidalia/help/content/po/nah/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/nah/server.po
+++ b/src/vidalia/help/content/po/nah/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nah/services.po b/src/vidalia/help/content/po/nah/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/nah/services.po
+++ b/src/vidalia/help/content/po/nah/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nah/troubleshooting.po b/src/vidalia/help/content/po/nah/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/nah/troubleshooting.po
+++ b/src/vidalia/help/content/po/nah/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nap/config.po b/src/vidalia/help/content/po/nap/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/nap/config.po
+++ b/src/vidalia/help/content/po/nap/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nap/index.po b/src/vidalia/help/content/po/nap/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/nap/index.po
+++ b/src/vidalia/help/content/po/nap/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nap/links.po b/src/vidalia/help/content/po/nap/links.po
index 3d33249..7890133 100644
--- a/src/vidalia/help/content/po/nap/links.po
+++ b/src/vidalia/help/content/po/nap/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: nap\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/nap/log.po b/src/vidalia/help/content/po/nap/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/nap/log.po
+++ b/src/vidalia/help/content/po/nap/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nap/netview.po b/src/vidalia/help/content/po/nap/netview.po
index 47f3d73..3130bf3 100644
--- a/src/vidalia/help/content/po/nap/netview.po
+++ b/src/vidalia/help/content/po/nap/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: nap\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/nap/running.po b/src/vidalia/help/content/po/nap/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/nap/running.po
+++ b/src/vidalia/help/content/po/nap/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nap/server.po b/src/vidalia/help/content/po/nap/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/nap/server.po
+++ b/src/vidalia/help/content/po/nap/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nap/services.po b/src/vidalia/help/content/po/nap/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/nap/services.po
+++ b/src/vidalia/help/content/po/nap/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nap/troubleshooting.po b/src/vidalia/help/content/po/nap/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/nap/troubleshooting.po
+++ b/src/vidalia/help/content/po/nap/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nb/config.po b/src/vidalia/help/content/po/nb/config.po
index 633b48c..e9450b3 100644
--- a/src/vidalia/help/content/po/nb/config.po
+++ b/src/vidalia/help/content/po/nb/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nb/index.po b/src/vidalia/help/content/po/nb/index.po
index 9b5c30e..b4a7941 100644
--- a/src/vidalia/help/content/po/nb/index.po
+++ b/src/vidalia/help/content/po/nb/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nb/links.po b/src/vidalia/help/content/po/nb/links.po
index b0a4119..fceb3ae 100644
--- a/src/vidalia/help/content/po/nb/links.po
+++ b/src/vidalia/help/content/po/nb/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"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"
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/nb/log.po b/src/vidalia/help/content/po/nb/log.po
index 8141fba..7e226bc 100644
--- a/src/vidalia/help/content/po/nb/log.po
+++ b/src/vidalia/help/content/po/nb/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nb/netview.po b/src/vidalia/help/content/po/nb/netview.po
index 15de0c5..267c31f 100644
--- a/src/vidalia/help/content/po/nb/netview.po
+++ b/src/vidalia/help/content/po/nb/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/nb/running.po b/src/vidalia/help/content/po/nb/running.po
index 43bbb4e..b503af0 100644
--- a/src/vidalia/help/content/po/nb/running.po
+++ b/src/vidalia/help/content/po/nb/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nb/server.po b/src/vidalia/help/content/po/nb/server.po
index 09da128..3cb445f 100644
--- a/src/vidalia/help/content/po/nb/server.po
+++ b/src/vidalia/help/content/po/nb/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nb/services.po b/src/vidalia/help/content/po/nb/services.po
index db5f9fe..73d206c 100644
--- a/src/vidalia/help/content/po/nb/services.po
+++ b/src/vidalia/help/content/po/nb/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nb/troubleshooting.po b/src/vidalia/help/content/po/nb/troubleshooting.po
index f74392b..b495396 100644
--- a/src/vidalia/help/content/po/nb/troubleshooting.po
+++ b/src/vidalia/help/content/po/nb/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ne/config.po b/src/vidalia/help/content/po/ne/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ne/config.po
+++ b/src/vidalia/help/content/po/ne/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ne/index.po b/src/vidalia/help/content/po/ne/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ne/index.po
+++ b/src/vidalia/help/content/po/ne/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ne/links.po b/src/vidalia/help/content/po/ne/links.po
index 3d33249..76efb24 100644
--- a/src/vidalia/help/content/po/ne/links.po
+++ b/src/vidalia/help/content/po/ne/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/ne/log.po b/src/vidalia/help/content/po/ne/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ne/log.po
+++ b/src/vidalia/help/content/po/ne/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ne/netview.po b/src/vidalia/help/content/po/ne/netview.po
index 47f3d73..1203d67 100644
--- a/src/vidalia/help/content/po/ne/netview.po
+++ b/src/vidalia/help/content/po/ne/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/ne/running.po b/src/vidalia/help/content/po/ne/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ne/running.po
+++ b/src/vidalia/help/content/po/ne/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ne/server.po b/src/vidalia/help/content/po/ne/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ne/server.po
+++ b/src/vidalia/help/content/po/ne/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ne/services.po b/src/vidalia/help/content/po/ne/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ne/services.po
+++ b/src/vidalia/help/content/po/ne/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ne/troubleshooting.po b/src/vidalia/help/content/po/ne/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ne/troubleshooting.po
+++ b/src/vidalia/help/content/po/ne/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nl/config.po b/src/vidalia/help/content/po/nl/config.po
index f00de70..c733f14 100644
--- a/src/vidalia/help/content/po/nl/config.po
+++ b/src/vidalia/help/content/po/nl/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nl/index.po b/src/vidalia/help/content/po/nl/index.po
index 22d5a88..5138a21 100644
--- a/src/vidalia/help/content/po/nl/index.po
+++ b/src/vidalia/help/content/po/nl/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nl/links.po b/src/vidalia/help/content/po/nl/links.po
index 421bcfb..e793d8e 100644
--- a/src/vidalia/help/content/po/nl/links.po
+++ b/src/vidalia/help/content/po/nl/links.po
@@ -1,52 +1,40 @@
#
-# $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.
-#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: 2010-08-29 23:21+0200\n"
-"Last-Translator: Roconda <tim.slot at gmail.com>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: nl\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 2.0.5\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr "Leerzame Links"
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr "Vidalia"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr " "
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr "Beginpagina"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
@@ -55,71 +43,38 @@ msgstr ""
"https://www.torproject.org/vidalia/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr "Wiki"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> http://trac.vidalia-"
-"project.net/wiki</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr "Bugtracker"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/report\"> http://trac.vidalia-"
-"project.net/report</a>"
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr "Tor"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr "Veel gestelde vragen"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
diff --git a/src/vidalia/help/content/po/nl/log.po b/src/vidalia/help/content/po/nl/log.po
index aaef3ff..828c09c 100644
--- a/src/vidalia/help/content/po/nl/log.po
+++ b/src/vidalia/help/content/po/nl/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nl/netview.po b/src/vidalia/help/content/po/nl/netview.po
index 47f3d73..a66393d 100644
--- a/src/vidalia/help/content/po/nl/netview.po
+++ b/src/vidalia/help/content/po/nl/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/nl/running.po b/src/vidalia/help/content/po/nl/running.po
index 282c7b9..3f50dcb 100644
--- a/src/vidalia/help/content/po/nl/running.po
+++ b/src/vidalia/help/content/po/nl/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nl/server.po b/src/vidalia/help/content/po/nl/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/nl/server.po
+++ b/src/vidalia/help/content/po/nl/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nl/services.po b/src/vidalia/help/content/po/nl/services.po
index 4091435..3ea2d7d 100644
--- a/src/vidalia/help/content/po/nl/services.po
+++ b/src/vidalia/help/content/po/nl/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nl/troubleshooting.po b/src/vidalia/help/content/po/nl/troubleshooting.po
index cf0c2e7..6011ec5 100644
--- a/src/vidalia/help/content/po/nl/troubleshooting.po
+++ b/src/vidalia/help/content/po/nl/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nn/config.po b/src/vidalia/help/content/po/nn/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/nn/config.po
+++ b/src/vidalia/help/content/po/nn/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nn/index.po b/src/vidalia/help/content/po/nn/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/nn/index.po
+++ b/src/vidalia/help/content/po/nn/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nn/links.po b/src/vidalia/help/content/po/nn/links.po
index 3d33249..ce7e347 100644
--- a/src/vidalia/help/content/po/nn/links.po
+++ b/src/vidalia/help/content/po/nn/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/nn/log.po b/src/vidalia/help/content/po/nn/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/nn/log.po
+++ b/src/vidalia/help/content/po/nn/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nn/netview.po b/src/vidalia/help/content/po/nn/netview.po
index 47f3d73..6dec764 100644
--- a/src/vidalia/help/content/po/nn/netview.po
+++ b/src/vidalia/help/content/po/nn/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/nn/running.po b/src/vidalia/help/content/po/nn/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/nn/running.po
+++ b/src/vidalia/help/content/po/nn/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nn/server.po b/src/vidalia/help/content/po/nn/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/nn/server.po
+++ b/src/vidalia/help/content/po/nn/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nn/services.po b/src/vidalia/help/content/po/nn/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/nn/services.po
+++ b/src/vidalia/help/content/po/nn/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nn/troubleshooting.po b/src/vidalia/help/content/po/nn/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/nn/troubleshooting.po
+++ b/src/vidalia/help/content/po/nn/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nso/config.po b/src/vidalia/help/content/po/nso/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/nso/config.po
+++ b/src/vidalia/help/content/po/nso/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nso/index.po b/src/vidalia/help/content/po/nso/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/nso/index.po
+++ b/src/vidalia/help/content/po/nso/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nso/links.po b/src/vidalia/help/content/po/nso/links.po
index 3d33249..c6e9224 100644
--- a/src/vidalia/help/content/po/nso/links.po
+++ b/src/vidalia/help/content/po/nso/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: nso\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/nso/log.po b/src/vidalia/help/content/po/nso/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/nso/log.po
+++ b/src/vidalia/help/content/po/nso/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nso/netview.po b/src/vidalia/help/content/po/nso/netview.po
index 47f3d73..30d29e9 100644
--- a/src/vidalia/help/content/po/nso/netview.po
+++ b/src/vidalia/help/content/po/nso/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: nso\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/nso/running.po b/src/vidalia/help/content/po/nso/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/nso/running.po
+++ b/src/vidalia/help/content/po/nso/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nso/server.po b/src/vidalia/help/content/po/nso/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/nso/server.po
+++ b/src/vidalia/help/content/po/nso/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nso/services.po b/src/vidalia/help/content/po/nso/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/nso/services.po
+++ b/src/vidalia/help/content/po/nso/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/nso/troubleshooting.po b/src/vidalia/help/content/po/nso/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/nso/troubleshooting.po
+++ b/src/vidalia/help/content/po/nso/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/oc/config.po b/src/vidalia/help/content/po/oc/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/oc/config.po
+++ b/src/vidalia/help/content/po/oc/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/oc/index.po b/src/vidalia/help/content/po/oc/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/oc/index.po
+++ b/src/vidalia/help/content/po/oc/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/oc/links.po b/src/vidalia/help/content/po/oc/links.po
index 3d33249..4ddb723 100644
--- a/src/vidalia/help/content/po/oc/links.po
+++ b/src/vidalia/help/content/po/oc/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/oc/log.po b/src/vidalia/help/content/po/oc/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/oc/log.po
+++ b/src/vidalia/help/content/po/oc/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/oc/netview.po b/src/vidalia/help/content/po/oc/netview.po
index 47f3d73..611816a 100644
--- a/src/vidalia/help/content/po/oc/netview.po
+++ b/src/vidalia/help/content/po/oc/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/oc/running.po b/src/vidalia/help/content/po/oc/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/oc/running.po
+++ b/src/vidalia/help/content/po/oc/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/oc/server.po b/src/vidalia/help/content/po/oc/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/oc/server.po
+++ b/src/vidalia/help/content/po/oc/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/oc/services.po b/src/vidalia/help/content/po/oc/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/oc/services.po
+++ b/src/vidalia/help/content/po/oc/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/oc/troubleshooting.po b/src/vidalia/help/content/po/oc/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/oc/troubleshooting.po
+++ b/src/vidalia/help/content/po/oc/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/or/bridges.po b/src/vidalia/help/content/po/or/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/or/bridges.po
+++ b/src/vidalia/help/content/po/or/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/or/config.po b/src/vidalia/help/content/po/or/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/or/config.po
+++ b/src/vidalia/help/content/po/or/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/or/index.po b/src/vidalia/help/content/po/or/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/or/index.po
+++ b/src/vidalia/help/content/po/or/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/or/links.po b/src/vidalia/help/content/po/or/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/or/links.po
+++ b/src/vidalia/help/content/po/or/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/or/log.po b/src/vidalia/help/content/po/or/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/or/log.po
+++ b/src/vidalia/help/content/po/or/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/or/netview.po b/src/vidalia/help/content/po/or/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/or/netview.po
+++ b/src/vidalia/help/content/po/or/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/or/running.po b/src/vidalia/help/content/po/or/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/or/running.po
+++ b/src/vidalia/help/content/po/or/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/or/server.po b/src/vidalia/help/content/po/or/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/or/server.po
+++ b/src/vidalia/help/content/po/or/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/or/services.po b/src/vidalia/help/content/po/or/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/or/services.po
+++ b/src/vidalia/help/content/po/or/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/or/troubleshooting.po b/src/vidalia/help/content/po/or/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/or/troubleshooting.po
+++ b/src/vidalia/help/content/po/or/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pa/config.po b/src/vidalia/help/content/po/pa/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/pa/config.po
+++ b/src/vidalia/help/content/po/pa/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pa/index.po b/src/vidalia/help/content/po/pa/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/pa/index.po
+++ b/src/vidalia/help/content/po/pa/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pa/links.po b/src/vidalia/help/content/po/pa/links.po
index 3d33249..558a035 100644
--- a/src/vidalia/help/content/po/pa/links.po
+++ b/src/vidalia/help/content/po/pa/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/pa/log.po b/src/vidalia/help/content/po/pa/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/pa/log.po
+++ b/src/vidalia/help/content/po/pa/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pa/netview.po b/src/vidalia/help/content/po/pa/netview.po
index 47f3d73..a4cda00 100644
--- a/src/vidalia/help/content/po/pa/netview.po
+++ b/src/vidalia/help/content/po/pa/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/pa/running.po b/src/vidalia/help/content/po/pa/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/pa/running.po
+++ b/src/vidalia/help/content/po/pa/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pa/server.po b/src/vidalia/help/content/po/pa/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/pa/server.po
+++ b/src/vidalia/help/content/po/pa/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pa/services.po b/src/vidalia/help/content/po/pa/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/pa/services.po
+++ b/src/vidalia/help/content/po/pa/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pa/troubleshooting.po b/src/vidalia/help/content/po/pa/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/pa/troubleshooting.po
+++ b/src/vidalia/help/content/po/pa/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pap/config.po b/src/vidalia/help/content/po/pap/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/pap/config.po
+++ b/src/vidalia/help/content/po/pap/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pap/index.po b/src/vidalia/help/content/po/pap/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/pap/index.po
+++ b/src/vidalia/help/content/po/pap/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pap/links.po b/src/vidalia/help/content/po/pap/links.po
index 3d33249..628cdb1 100644
--- a/src/vidalia/help/content/po/pap/links.po
+++ b/src/vidalia/help/content/po/pap/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pap\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/pap/log.po b/src/vidalia/help/content/po/pap/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/pap/log.po
+++ b/src/vidalia/help/content/po/pap/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pap/netview.po b/src/vidalia/help/content/po/pap/netview.po
index 47f3d73..32e0745 100644
--- a/src/vidalia/help/content/po/pap/netview.po
+++ b/src/vidalia/help/content/po/pap/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pap\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/pap/running.po b/src/vidalia/help/content/po/pap/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/pap/running.po
+++ b/src/vidalia/help/content/po/pap/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pap/server.po b/src/vidalia/help/content/po/pap/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/pap/server.po
+++ b/src/vidalia/help/content/po/pap/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pap/services.po b/src/vidalia/help/content/po/pap/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/pap/services.po
+++ b/src/vidalia/help/content/po/pap/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pap/troubleshooting.po b/src/vidalia/help/content/po/pap/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/pap/troubleshooting.po
+++ b/src/vidalia/help/content/po/pap/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pl/config.po b/src/vidalia/help/content/po/pl/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/pl/config.po
+++ b/src/vidalia/help/content/po/pl/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pl/index.po b/src/vidalia/help/content/po/pl/index.po
index 8f94bbc..3470bd8 100644
--- a/src/vidalia/help/content/po/pl/index.po
+++ b/src/vidalia/help/content/po/pl/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pl/links.po b/src/vidalia/help/content/po/pl/links.po
index 8d49d61..1c624da 100644
--- a/src/vidalia/help/content/po/pl/links.po
+++ b/src/vidalia/help/content/po/pl/links.po
@@ -1,53 +1,40 @@
#
-# $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.
-#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: 2010-08-25 22:09+0200\n"
-"Last-Translator: Balrogos <hardstell at gmail.com>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: pl\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 2.0.5\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr "Pomocne Linki"
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr "Vidalia"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr " "
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr "Strona Główna"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
@@ -56,71 +43,38 @@ msgstr ""
"https://www.torproject.org/vidalia/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr "Wiki"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> http://trac.vidalia-"
-"project.net/wiki</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr "Bugtracker"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/report\"> http://trac.vidalia-"
-"project.net/report</a>"
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr "Tor"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr "FAQ"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
diff --git a/src/vidalia/help/content/po/pl/log.po b/src/vidalia/help/content/po/pl/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/pl/log.po
+++ b/src/vidalia/help/content/po/pl/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pl/netview.po b/src/vidalia/help/content/po/pl/netview.po
index 47f3d73..5c43864 100644
--- a/src/vidalia/help/content/po/pl/netview.po
+++ b/src/vidalia/help/content/po/pl/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/pl/running.po b/src/vidalia/help/content/po/pl/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/pl/running.po
+++ b/src/vidalia/help/content/po/pl/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pl/server.po b/src/vidalia/help/content/po/pl/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/pl/server.po
+++ b/src/vidalia/help/content/po/pl/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pl/services.po b/src/vidalia/help/content/po/pl/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/pl/services.po
+++ b/src/vidalia/help/content/po/pl/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pl/troubleshooting.po b/src/vidalia/help/content/po/pl/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/pl/troubleshooting.po
+++ b/src/vidalia/help/content/po/pl/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pms/config.po b/src/vidalia/help/content/po/pms/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/pms/config.po
+++ b/src/vidalia/help/content/po/pms/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pms/index.po b/src/vidalia/help/content/po/pms/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/pms/index.po
+++ b/src/vidalia/help/content/po/pms/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pms/links.po b/src/vidalia/help/content/po/pms/links.po
index 3d33249..22d109d 100644
--- a/src/vidalia/help/content/po/pms/links.po
+++ b/src/vidalia/help/content/po/pms/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pms\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/pms/log.po b/src/vidalia/help/content/po/pms/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/pms/log.po
+++ b/src/vidalia/help/content/po/pms/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pms/netview.po b/src/vidalia/help/content/po/pms/netview.po
index 47f3d73..0fd0845 100644
--- a/src/vidalia/help/content/po/pms/netview.po
+++ b/src/vidalia/help/content/po/pms/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pms\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/pms/running.po b/src/vidalia/help/content/po/pms/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/pms/running.po
+++ b/src/vidalia/help/content/po/pms/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pms/server.po b/src/vidalia/help/content/po/pms/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/pms/server.po
+++ b/src/vidalia/help/content/po/pms/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pms/services.po b/src/vidalia/help/content/po/pms/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/pms/services.po
+++ b/src/vidalia/help/content/po/pms/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pms/troubleshooting.po b/src/vidalia/help/content/po/pms/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/pms/troubleshooting.po
+++ b/src/vidalia/help/content/po/pms/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ps/config.po b/src/vidalia/help/content/po/ps/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ps/config.po
+++ b/src/vidalia/help/content/po/ps/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ps/index.po b/src/vidalia/help/content/po/ps/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ps/index.po
+++ b/src/vidalia/help/content/po/ps/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ps/links.po b/src/vidalia/help/content/po/ps/links.po
index 3d33249..e470919 100644
--- a/src/vidalia/help/content/po/ps/links.po
+++ b/src/vidalia/help/content/po/ps/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ps\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/ps/log.po b/src/vidalia/help/content/po/ps/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ps/log.po
+++ b/src/vidalia/help/content/po/ps/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ps/netview.po b/src/vidalia/help/content/po/ps/netview.po
index 47f3d73..9b4ee0f 100644
--- a/src/vidalia/help/content/po/ps/netview.po
+++ b/src/vidalia/help/content/po/ps/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ps\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/ps/running.po b/src/vidalia/help/content/po/ps/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ps/running.po
+++ b/src/vidalia/help/content/po/ps/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ps/server.po b/src/vidalia/help/content/po/ps/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ps/server.po
+++ b/src/vidalia/help/content/po/ps/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ps/services.po b/src/vidalia/help/content/po/ps/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ps/services.po
+++ b/src/vidalia/help/content/po/ps/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ps/troubleshooting.po b/src/vidalia/help/content/po/ps/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ps/troubleshooting.po
+++ b/src/vidalia/help/content/po/ps/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pt/config.po b/src/vidalia/help/content/po/pt/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/pt/config.po
+++ b/src/vidalia/help/content/po/pt/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pt/index.po b/src/vidalia/help/content/po/pt/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/pt/index.po
+++ b/src/vidalia/help/content/po/pt/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pt/links.po b/src/vidalia/help/content/po/pt/links.po
index 3d33249..8b8818f 100644
--- a/src/vidalia/help/content/po/pt/links.po
+++ b/src/vidalia/help/content/po/pt/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/pt/log.po b/src/vidalia/help/content/po/pt/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/pt/log.po
+++ b/src/vidalia/help/content/po/pt/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pt/netview.po b/src/vidalia/help/content/po/pt/netview.po
index 47f3d73..3e5919f 100644
--- a/src/vidalia/help/content/po/pt/netview.po
+++ b/src/vidalia/help/content/po/pt/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/pt/running.po b/src/vidalia/help/content/po/pt/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/pt/running.po
+++ b/src/vidalia/help/content/po/pt/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pt/server.po b/src/vidalia/help/content/po/pt/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/pt/server.po
+++ b/src/vidalia/help/content/po/pt/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pt/services.po b/src/vidalia/help/content/po/pt/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/pt/services.po
+++ b/src/vidalia/help/content/po/pt/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pt/troubleshooting.po b/src/vidalia/help/content/po/pt/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/pt/troubleshooting.po
+++ b/src/vidalia/help/content/po/pt/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pt_BR/config.po b/src/vidalia/help/content/po/pt_BR/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/pt_BR/config.po
+++ b/src/vidalia/help/content/po/pt_BR/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pt_BR/index.po b/src/vidalia/help/content/po/pt_BR/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/pt_BR/index.po
+++ b/src/vidalia/help/content/po/pt_BR/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pt_BR/links.po b/src/vidalia/help/content/po/pt_BR/links.po
index 3d33249..b3ce1d1 100644
--- a/src/vidalia/help/content/po/pt_BR/links.po
+++ b/src/vidalia/help/content/po/pt_BR/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/pt_BR/log.po b/src/vidalia/help/content/po/pt_BR/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/pt_BR/log.po
+++ b/src/vidalia/help/content/po/pt_BR/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pt_BR/netview.po b/src/vidalia/help/content/po/pt_BR/netview.po
index 47f3d73..8ab192c 100644
--- a/src/vidalia/help/content/po/pt_BR/netview.po
+++ b/src/vidalia/help/content/po/pt_BR/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/pt_BR/running.po b/src/vidalia/help/content/po/pt_BR/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/pt_BR/running.po
+++ b/src/vidalia/help/content/po/pt_BR/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pt_BR/server.po b/src/vidalia/help/content/po/pt_BR/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/pt_BR/server.po
+++ b/src/vidalia/help/content/po/pt_BR/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pt_BR/services.po b/src/vidalia/help/content/po/pt_BR/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/pt_BR/services.po
+++ b/src/vidalia/help/content/po/pt_BR/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/pt_BR/troubleshooting.po b/src/vidalia/help/content/po/pt_BR/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/pt_BR/troubleshooting.po
+++ b/src/vidalia/help/content/po/pt_BR/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ro/config.po b/src/vidalia/help/content/po/ro/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ro/config.po
+++ b/src/vidalia/help/content/po/ro/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ro/index.po b/src/vidalia/help/content/po/ro/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ro/index.po
+++ b/src/vidalia/help/content/po/ro/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ro/links.po b/src/vidalia/help/content/po/ro/links.po
index 3d33249..77a5a70 100644
--- a/src/vidalia/help/content/po/ro/links.po
+++ b/src/vidalia/help/content/po/ro/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/ro/log.po b/src/vidalia/help/content/po/ro/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ro/log.po
+++ b/src/vidalia/help/content/po/ro/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ro/netview.po b/src/vidalia/help/content/po/ro/netview.po
index 47f3d73..a9d79de 100644
--- a/src/vidalia/help/content/po/ro/netview.po
+++ b/src/vidalia/help/content/po/ro/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/ro/running.po b/src/vidalia/help/content/po/ro/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ro/running.po
+++ b/src/vidalia/help/content/po/ro/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ro/server.po b/src/vidalia/help/content/po/ro/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ro/server.po
+++ b/src/vidalia/help/content/po/ro/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ro/services.po b/src/vidalia/help/content/po/ro/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ro/services.po
+++ b/src/vidalia/help/content/po/ro/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ro/troubleshooting.po b/src/vidalia/help/content/po/ro/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ro/troubleshooting.po
+++ b/src/vidalia/help/content/po/ro/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ru/config.po b/src/vidalia/help/content/po/ru/config.po
index dfbc753..9d25433 100644
--- a/src/vidalia/help/content/po/ru/config.po
+++ b/src/vidalia/help/content/po/ru/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ru/index.po b/src/vidalia/help/content/po/ru/index.po
index 551a8ae..fe5c186 100644
--- a/src/vidalia/help/content/po/ru/index.po
+++ b/src/vidalia/help/content/po/ru/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ru/links.po b/src/vidalia/help/content/po/ru/links.po
index f2c7887..ee15e7f 100644
--- a/src/vidalia/help/content/po/ru/links.po
+++ b/src/vidalia/help/content/po/ru/links.po
@@ -1,53 +1,40 @@
#
-# $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.
-#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: 2010-08-02 21:55+0200\n"
-"Last-Translator: achu <alex at chumakov.ru>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ru\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr "Полезные ссылки"
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr "Vidalia"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr " "
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr "Домашняя страница"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
@@ -56,71 +43,38 @@ msgstr ""
"https://www.torproject.org/vidalia/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr "Wiki"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> http://trac.vidalia-"
-"project.net/wiki</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr "Трекер"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/report\"> http://trac.vidalia-"
-"project.net/report</a>"
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr "Tor"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr "FAQ"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
diff --git a/src/vidalia/help/content/po/ru/log.po b/src/vidalia/help/content/po/ru/log.po
index 4340250..48612dc 100644
--- a/src/vidalia/help/content/po/ru/log.po
+++ b/src/vidalia/help/content/po/ru/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ru/netview.po b/src/vidalia/help/content/po/ru/netview.po
index b2f7ba2..81470cb 100644
--- a/src/vidalia/help/content/po/ru/netview.po
+++ b/src/vidalia/help/content/po/ru/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ru/running.po b/src/vidalia/help/content/po/ru/running.po
index 7b4529d..6a386e4 100644
--- a/src/vidalia/help/content/po/ru/running.po
+++ b/src/vidalia/help/content/po/ru/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ru/server.po b/src/vidalia/help/content/po/ru/server.po
index 509c8a6..72d6527 100644
--- a/src/vidalia/help/content/po/ru/server.po
+++ b/src/vidalia/help/content/po/ru/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ru/services.po b/src/vidalia/help/content/po/ru/services.po
index 88aac04..b6f478e 100644
--- a/src/vidalia/help/content/po/ru/services.po
+++ b/src/vidalia/help/content/po/ru/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ru/troubleshooting.po b/src/vidalia/help/content/po/ru/troubleshooting.po
index 743f5d6..cc642a2 100644
--- a/src/vidalia/help/content/po/ru/troubleshooting.po
+++ b/src/vidalia/help/content/po/ru/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sco/config.po b/src/vidalia/help/content/po/sco/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/sco/config.po
+++ b/src/vidalia/help/content/po/sco/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sco/index.po b/src/vidalia/help/content/po/sco/index.po
index 8309490..49d7627 100644
--- a/src/vidalia/help/content/po/sco/index.po
+++ b/src/vidalia/help/content/po/sco/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sco/links.po b/src/vidalia/help/content/po/sco/links.po
index 3d33249..67d180f 100644
--- a/src/vidalia/help/content/po/sco/links.po
+++ b/src/vidalia/help/content/po/sco/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: sco\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/sco/log.po b/src/vidalia/help/content/po/sco/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/sco/log.po
+++ b/src/vidalia/help/content/po/sco/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sco/netview.po b/src/vidalia/help/content/po/sco/netview.po
index 47f3d73..8c98164 100644
--- a/src/vidalia/help/content/po/sco/netview.po
+++ b/src/vidalia/help/content/po/sco/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: sco\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/sco/running.po b/src/vidalia/help/content/po/sco/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/sco/running.po
+++ b/src/vidalia/help/content/po/sco/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sco/server.po b/src/vidalia/help/content/po/sco/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/sco/server.po
+++ b/src/vidalia/help/content/po/sco/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sco/services.po b/src/vidalia/help/content/po/sco/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/sco/services.po
+++ b/src/vidalia/help/content/po/sco/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sco/troubleshooting.po b/src/vidalia/help/content/po/sco/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/sco/troubleshooting.po
+++ b/src/vidalia/help/content/po/sco/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sk/bridges.po b/src/vidalia/help/content/po/sk/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/sk/bridges.po
+++ b/src/vidalia/help/content/po/sk/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/sk/config.po b/src/vidalia/help/content/po/sk/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/sk/config.po
+++ b/src/vidalia/help/content/po/sk/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sk/index.po b/src/vidalia/help/content/po/sk/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/sk/index.po
+++ b/src/vidalia/help/content/po/sk/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sk/links.po b/src/vidalia/help/content/po/sk/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/sk/links.po
+++ b/src/vidalia/help/content/po/sk/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sk/log.po b/src/vidalia/help/content/po/sk/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/sk/log.po
+++ b/src/vidalia/help/content/po/sk/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sk/netview.po b/src/vidalia/help/content/po/sk/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/sk/netview.po
+++ b/src/vidalia/help/content/po/sk/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sk/running.po b/src/vidalia/help/content/po/sk/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/sk/running.po
+++ b/src/vidalia/help/content/po/sk/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sk/server.po b/src/vidalia/help/content/po/sk/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/sk/server.po
+++ b/src/vidalia/help/content/po/sk/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sk/services.po b/src/vidalia/help/content/po/sk/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/sk/services.po
+++ b/src/vidalia/help/content/po/sk/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sk/troubleshooting.po b/src/vidalia/help/content/po/sk/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/sk/troubleshooting.po
+++ b/src/vidalia/help/content/po/sk/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sl/bridges.po b/src/vidalia/help/content/po/sl/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/sl/bridges.po
+++ b/src/vidalia/help/content/po/sl/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/sl/config.po b/src/vidalia/help/content/po/sl/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/sl/config.po
+++ b/src/vidalia/help/content/po/sl/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sl/index.po b/src/vidalia/help/content/po/sl/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/sl/index.po
+++ b/src/vidalia/help/content/po/sl/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sl/links.po b/src/vidalia/help/content/po/sl/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/sl/links.po
+++ b/src/vidalia/help/content/po/sl/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sl/log.po b/src/vidalia/help/content/po/sl/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/sl/log.po
+++ b/src/vidalia/help/content/po/sl/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sl/netview.po b/src/vidalia/help/content/po/sl/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/sl/netview.po
+++ b/src/vidalia/help/content/po/sl/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sl/running.po b/src/vidalia/help/content/po/sl/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/sl/running.po
+++ b/src/vidalia/help/content/po/sl/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sl/server.po b/src/vidalia/help/content/po/sl/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/sl/server.po
+++ b/src/vidalia/help/content/po/sl/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sl/services.po b/src/vidalia/help/content/po/sl/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/sl/services.po
+++ b/src/vidalia/help/content/po/sl/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sl/troubleshooting.po b/src/vidalia/help/content/po/sl/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/sl/troubleshooting.po
+++ b/src/vidalia/help/content/po/sl/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/so/bridges.po b/src/vidalia/help/content/po/so/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/so/bridges.po
+++ b/src/vidalia/help/content/po/so/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/so/config.po b/src/vidalia/help/content/po/so/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/so/config.po
+++ b/src/vidalia/help/content/po/so/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/so/index.po b/src/vidalia/help/content/po/so/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/so/index.po
+++ b/src/vidalia/help/content/po/so/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/so/links.po b/src/vidalia/help/content/po/so/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/so/links.po
+++ b/src/vidalia/help/content/po/so/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/so/log.po b/src/vidalia/help/content/po/so/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/so/log.po
+++ b/src/vidalia/help/content/po/so/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/so/netview.po b/src/vidalia/help/content/po/so/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/so/netview.po
+++ b/src/vidalia/help/content/po/so/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/so/running.po b/src/vidalia/help/content/po/so/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/so/running.po
+++ b/src/vidalia/help/content/po/so/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/so/server.po b/src/vidalia/help/content/po/so/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/so/server.po
+++ b/src/vidalia/help/content/po/so/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/so/services.po b/src/vidalia/help/content/po/so/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/so/services.po
+++ b/src/vidalia/help/content/po/so/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/so/troubleshooting.po b/src/vidalia/help/content/po/so/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/so/troubleshooting.po
+++ b/src/vidalia/help/content/po/so/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/son/config.po b/src/vidalia/help/content/po/son/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/son/config.po
+++ b/src/vidalia/help/content/po/son/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/son/index.po b/src/vidalia/help/content/po/son/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/son/index.po
+++ b/src/vidalia/help/content/po/son/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/son/links.po b/src/vidalia/help/content/po/son/links.po
index 3d33249..1cdfa93 100644
--- a/src/vidalia/help/content/po/son/links.po
+++ b/src/vidalia/help/content/po/son/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: son\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/son/log.po b/src/vidalia/help/content/po/son/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/son/log.po
+++ b/src/vidalia/help/content/po/son/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/son/netview.po b/src/vidalia/help/content/po/son/netview.po
index 47f3d73..a9fd80d 100644
--- a/src/vidalia/help/content/po/son/netview.po
+++ b/src/vidalia/help/content/po/son/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: son\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/son/running.po b/src/vidalia/help/content/po/son/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/son/running.po
+++ b/src/vidalia/help/content/po/son/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/son/server.po b/src/vidalia/help/content/po/son/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/son/server.po
+++ b/src/vidalia/help/content/po/son/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/son/services.po b/src/vidalia/help/content/po/son/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/son/services.po
+++ b/src/vidalia/help/content/po/son/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/son/troubleshooting.po b/src/vidalia/help/content/po/son/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/son/troubleshooting.po
+++ b/src/vidalia/help/content/po/son/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sq/bridges.po b/src/vidalia/help/content/po/sq/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/sq/bridges.po
+++ b/src/vidalia/help/content/po/sq/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/sq/config.po b/src/vidalia/help/content/po/sq/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/sq/config.po
+++ b/src/vidalia/help/content/po/sq/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sq/index.po b/src/vidalia/help/content/po/sq/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/sq/index.po
+++ b/src/vidalia/help/content/po/sq/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sq/links.po b/src/vidalia/help/content/po/sq/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/sq/links.po
+++ b/src/vidalia/help/content/po/sq/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sq/log.po b/src/vidalia/help/content/po/sq/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/sq/log.po
+++ b/src/vidalia/help/content/po/sq/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sq/netview.po b/src/vidalia/help/content/po/sq/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/sq/netview.po
+++ b/src/vidalia/help/content/po/sq/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sq/running.po b/src/vidalia/help/content/po/sq/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/sq/running.po
+++ b/src/vidalia/help/content/po/sq/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sq/server.po b/src/vidalia/help/content/po/sq/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/sq/server.po
+++ b/src/vidalia/help/content/po/sq/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sq/services.po b/src/vidalia/help/content/po/sq/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/sq/services.po
+++ b/src/vidalia/help/content/po/sq/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sq/troubleshooting.po b/src/vidalia/help/content/po/sq/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/sq/troubleshooting.po
+++ b/src/vidalia/help/content/po/sq/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sr/bridges.po b/src/vidalia/help/content/po/sr/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/sr/bridges.po
+++ b/src/vidalia/help/content/po/sr/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/sr/config.po b/src/vidalia/help/content/po/sr/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/sr/config.po
+++ b/src/vidalia/help/content/po/sr/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sr/index.po b/src/vidalia/help/content/po/sr/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/sr/index.po
+++ b/src/vidalia/help/content/po/sr/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sr/links.po b/src/vidalia/help/content/po/sr/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/sr/links.po
+++ b/src/vidalia/help/content/po/sr/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sr/log.po b/src/vidalia/help/content/po/sr/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/sr/log.po
+++ b/src/vidalia/help/content/po/sr/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sr/netview.po b/src/vidalia/help/content/po/sr/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/sr/netview.po
+++ b/src/vidalia/help/content/po/sr/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sr/running.po b/src/vidalia/help/content/po/sr/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/sr/running.po
+++ b/src/vidalia/help/content/po/sr/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sr/server.po b/src/vidalia/help/content/po/sr/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/sr/server.po
+++ b/src/vidalia/help/content/po/sr/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sr/services.po b/src/vidalia/help/content/po/sr/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/sr/services.po
+++ b/src/vidalia/help/content/po/sr/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sr/troubleshooting.po b/src/vidalia/help/content/po/sr/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/sr/troubleshooting.po
+++ b/src/vidalia/help/content/po/sr/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/st/bridges.po b/src/vidalia/help/content/po/st/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/st/bridges.po
+++ b/src/vidalia/help/content/po/st/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/st/config.po b/src/vidalia/help/content/po/st/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/st/config.po
+++ b/src/vidalia/help/content/po/st/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/st/index.po b/src/vidalia/help/content/po/st/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/st/index.po
+++ b/src/vidalia/help/content/po/st/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/st/links.po b/src/vidalia/help/content/po/st/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/st/links.po
+++ b/src/vidalia/help/content/po/st/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/st/log.po b/src/vidalia/help/content/po/st/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/st/log.po
+++ b/src/vidalia/help/content/po/st/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/st/netview.po b/src/vidalia/help/content/po/st/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/st/netview.po
+++ b/src/vidalia/help/content/po/st/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/st/running.po b/src/vidalia/help/content/po/st/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/st/running.po
+++ b/src/vidalia/help/content/po/st/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/st/server.po b/src/vidalia/help/content/po/st/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/st/server.po
+++ b/src/vidalia/help/content/po/st/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/st/services.po b/src/vidalia/help/content/po/st/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/st/services.po
+++ b/src/vidalia/help/content/po/st/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/st/troubleshooting.po b/src/vidalia/help/content/po/st/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/st/troubleshooting.po
+++ b/src/vidalia/help/content/po/st/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/su/config.po b/src/vidalia/help/content/po/su/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/su/config.po
+++ b/src/vidalia/help/content/po/su/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/su/index.po b/src/vidalia/help/content/po/su/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/su/index.po
+++ b/src/vidalia/help/content/po/su/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/su/links.po b/src/vidalia/help/content/po/su/links.po
index 3d33249..7e491d0 100644
--- a/src/vidalia/help/content/po/su/links.po
+++ b/src/vidalia/help/content/po/su/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: su\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/su/log.po b/src/vidalia/help/content/po/su/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/su/log.po
+++ b/src/vidalia/help/content/po/su/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/su/netview.po b/src/vidalia/help/content/po/su/netview.po
index 47f3d73..5263b4f 100644
--- a/src/vidalia/help/content/po/su/netview.po
+++ b/src/vidalia/help/content/po/su/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: su\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/su/running.po b/src/vidalia/help/content/po/su/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/su/running.po
+++ b/src/vidalia/help/content/po/su/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/su/server.po b/src/vidalia/help/content/po/su/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/su/server.po
+++ b/src/vidalia/help/content/po/su/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/su/services.po b/src/vidalia/help/content/po/su/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/su/services.po
+++ b/src/vidalia/help/content/po/su/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/su/troubleshooting.po b/src/vidalia/help/content/po/su/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/su/troubleshooting.po
+++ b/src/vidalia/help/content/po/su/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sv/bridges.po b/src/vidalia/help/content/po/sv/bridges.po
index 11982c8..a3181cb 100644
--- a/src/vidalia/help/content/po/sv/bridges.po
+++ b/src/vidalia/help/content/po/sv/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/sv/config.po b/src/vidalia/help/content/po/sv/config.po
index 633b48c..e9450b3 100644
--- a/src/vidalia/help/content/po/sv/config.po
+++ b/src/vidalia/help/content/po/sv/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sv/index.po b/src/vidalia/help/content/po/sv/index.po
index 9b5c30e..b4a7941 100644
--- a/src/vidalia/help/content/po/sv/index.po
+++ b/src/vidalia/help/content/po/sv/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sv/links.po b/src/vidalia/help/content/po/sv/links.po
index d5510f0..0c43d47 100644
--- a/src/vidalia/help/content/po/sv/links.po
+++ b/src/vidalia/help/content/po/sv/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sv/log.po b/src/vidalia/help/content/po/sv/log.po
index 8141fba..7e226bc 100644
--- a/src/vidalia/help/content/po/sv/log.po
+++ b/src/vidalia/help/content/po/sv/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sv/netview.po b/src/vidalia/help/content/po/sv/netview.po
index 15de0c5..3ab66ec 100644
--- a/src/vidalia/help/content/po/sv/netview.po
+++ b/src/vidalia/help/content/po/sv/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sv/running.po b/src/vidalia/help/content/po/sv/running.po
index 43bbb4e..b503af0 100644
--- a/src/vidalia/help/content/po/sv/running.po
+++ b/src/vidalia/help/content/po/sv/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sv/server.po b/src/vidalia/help/content/po/sv/server.po
index 09da128..3cb445f 100644
--- a/src/vidalia/help/content/po/sv/server.po
+++ b/src/vidalia/help/content/po/sv/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sv/services.po b/src/vidalia/help/content/po/sv/services.po
index db5f9fe..73d206c 100644
--- a/src/vidalia/help/content/po/sv/services.po
+++ b/src/vidalia/help/content/po/sv/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sv/troubleshooting.po b/src/vidalia/help/content/po/sv/troubleshooting.po
index f74392b..b495396 100644
--- a/src/vidalia/help/content/po/sv/troubleshooting.po
+++ b/src/vidalia/help/content/po/sv/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sw/config.po b/src/vidalia/help/content/po/sw/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/sw/config.po
+++ b/src/vidalia/help/content/po/sw/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sw/index.po b/src/vidalia/help/content/po/sw/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/sw/index.po
+++ b/src/vidalia/help/content/po/sw/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sw/links.po b/src/vidalia/help/content/po/sw/links.po
index 3d33249..30eda45 100644
--- a/src/vidalia/help/content/po/sw/links.po
+++ b/src/vidalia/help/content/po/sw/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/sw/log.po b/src/vidalia/help/content/po/sw/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/sw/log.po
+++ b/src/vidalia/help/content/po/sw/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sw/netview.po b/src/vidalia/help/content/po/sw/netview.po
index 47f3d73..e3748e6 100644
--- a/src/vidalia/help/content/po/sw/netview.po
+++ b/src/vidalia/help/content/po/sw/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/sw/running.po b/src/vidalia/help/content/po/sw/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/sw/running.po
+++ b/src/vidalia/help/content/po/sw/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sw/server.po b/src/vidalia/help/content/po/sw/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/sw/server.po
+++ b/src/vidalia/help/content/po/sw/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sw/services.po b/src/vidalia/help/content/po/sw/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/sw/services.po
+++ b/src/vidalia/help/content/po/sw/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/sw/troubleshooting.po b/src/vidalia/help/content/po/sw/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/sw/troubleshooting.po
+++ b/src/vidalia/help/content/po/sw/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ta/config.po b/src/vidalia/help/content/po/ta/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ta/config.po
+++ b/src/vidalia/help/content/po/ta/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ta/index.po b/src/vidalia/help/content/po/ta/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ta/index.po
+++ b/src/vidalia/help/content/po/ta/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ta/links.po b/src/vidalia/help/content/po/ta/links.po
index 3d33249..a293f32 100644
--- a/src/vidalia/help/content/po/ta/links.po
+++ b/src/vidalia/help/content/po/ta/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/ta/log.po b/src/vidalia/help/content/po/ta/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ta/log.po
+++ b/src/vidalia/help/content/po/ta/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ta/netview.po b/src/vidalia/help/content/po/ta/netview.po
index 47f3d73..48786fb 100644
--- a/src/vidalia/help/content/po/ta/netview.po
+++ b/src/vidalia/help/content/po/ta/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/ta/running.po b/src/vidalia/help/content/po/ta/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ta/running.po
+++ b/src/vidalia/help/content/po/ta/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ta/server.po b/src/vidalia/help/content/po/ta/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ta/server.po
+++ b/src/vidalia/help/content/po/ta/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ta/services.po b/src/vidalia/help/content/po/ta/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ta/services.po
+++ b/src/vidalia/help/content/po/ta/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ta/troubleshooting.po b/src/vidalia/help/content/po/ta/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ta/troubleshooting.po
+++ b/src/vidalia/help/content/po/ta/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/te/config.po b/src/vidalia/help/content/po/te/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/te/config.po
+++ b/src/vidalia/help/content/po/te/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/te/index.po b/src/vidalia/help/content/po/te/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/te/index.po
+++ b/src/vidalia/help/content/po/te/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/te/links.po b/src/vidalia/help/content/po/te/links.po
index 3d33249..4f28afc 100644
--- a/src/vidalia/help/content/po/te/links.po
+++ b/src/vidalia/help/content/po/te/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/te/log.po b/src/vidalia/help/content/po/te/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/te/log.po
+++ b/src/vidalia/help/content/po/te/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/te/netview.po b/src/vidalia/help/content/po/te/netview.po
index 47f3d73..9b16a10 100644
--- a/src/vidalia/help/content/po/te/netview.po
+++ b/src/vidalia/help/content/po/te/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/te/running.po b/src/vidalia/help/content/po/te/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/te/running.po
+++ b/src/vidalia/help/content/po/te/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/te/server.po b/src/vidalia/help/content/po/te/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/te/server.po
+++ b/src/vidalia/help/content/po/te/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/te/services.po b/src/vidalia/help/content/po/te/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/te/services.po
+++ b/src/vidalia/help/content/po/te/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/te/troubleshooting.po b/src/vidalia/help/content/po/te/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/te/troubleshooting.po
+++ b/src/vidalia/help/content/po/te/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/templates/links.pot b/src/vidalia/help/content/po/templates/links.pot
index c9580ad..a1d0a8d 100644
--- a/src/vidalia/help/content/po/templates/links.pot
+++ b/src/vidalia/help/content/po/templates/links.pot
@@ -5,8 +5,8 @@
## the LICENSE file, found in the top level directory of this
## distribution. If you did not receive the LICENSE file with this
## file, you may obtain it from the Vidalia source package distributed
-## by the Vidalia Project at http://www.vidalia-project.net/. No part
-## of Vidalia, including this file, may be copied, modified,
+## by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+## No part of Vidalia, including this file, may be copied, modified,
## propagated, or distributed except according to the terms described
## in the LICENSE file.
##
@@ -14,97 +14,75 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\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"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/tg/config.po b/src/vidalia/help/content/po/tg/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/tg/config.po
+++ b/src/vidalia/help/content/po/tg/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tg/index.po b/src/vidalia/help/content/po/tg/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/tg/index.po
+++ b/src/vidalia/help/content/po/tg/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tg/links.po b/src/vidalia/help/content/po/tg/links.po
index 3d33249..39a9a54 100644
--- a/src/vidalia/help/content/po/tg/links.po
+++ b/src/vidalia/help/content/po/tg/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: tg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/tg/log.po b/src/vidalia/help/content/po/tg/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/tg/log.po
+++ b/src/vidalia/help/content/po/tg/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tg/netview.po b/src/vidalia/help/content/po/tg/netview.po
index 47f3d73..333df5d 100644
--- a/src/vidalia/help/content/po/tg/netview.po
+++ b/src/vidalia/help/content/po/tg/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: tg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/tg/running.po b/src/vidalia/help/content/po/tg/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/tg/running.po
+++ b/src/vidalia/help/content/po/tg/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tg/server.po b/src/vidalia/help/content/po/tg/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/tg/server.po
+++ b/src/vidalia/help/content/po/tg/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tg/services.po b/src/vidalia/help/content/po/tg/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/tg/services.po
+++ b/src/vidalia/help/content/po/tg/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tg/troubleshooting.po b/src/vidalia/help/content/po/tg/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/tg/troubleshooting.po
+++ b/src/vidalia/help/content/po/tg/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/th/config.po b/src/vidalia/help/content/po/th/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/th/config.po
+++ b/src/vidalia/help/content/po/th/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/th/index.po b/src/vidalia/help/content/po/th/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/th/index.po
+++ b/src/vidalia/help/content/po/th/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/th/links.po b/src/vidalia/help/content/po/th/links.po
index 3d33249..d30ce09 100644
--- a/src/vidalia/help/content/po/th/links.po
+++ b/src/vidalia/help/content/po/th/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/th/log.po b/src/vidalia/help/content/po/th/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/th/log.po
+++ b/src/vidalia/help/content/po/th/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/th/netview.po b/src/vidalia/help/content/po/th/netview.po
index 47f3d73..6f90155 100644
--- a/src/vidalia/help/content/po/th/netview.po
+++ b/src/vidalia/help/content/po/th/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/th/running.po b/src/vidalia/help/content/po/th/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/th/running.po
+++ b/src/vidalia/help/content/po/th/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/th/server.po b/src/vidalia/help/content/po/th/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/th/server.po
+++ b/src/vidalia/help/content/po/th/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/th/services.po b/src/vidalia/help/content/po/th/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/th/services.po
+++ b/src/vidalia/help/content/po/th/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/th/troubleshooting.po b/src/vidalia/help/content/po/th/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/th/troubleshooting.po
+++ b/src/vidalia/help/content/po/th/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ti/config.po b/src/vidalia/help/content/po/ti/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ti/config.po
+++ b/src/vidalia/help/content/po/ti/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ti/index.po b/src/vidalia/help/content/po/ti/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ti/index.po
+++ b/src/vidalia/help/content/po/ti/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ti/links.po b/src/vidalia/help/content/po/ti/links.po
index 3d33249..b830658 100644
--- a/src/vidalia/help/content/po/ti/links.po
+++ b/src/vidalia/help/content/po/ti/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ti\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/ti/log.po b/src/vidalia/help/content/po/ti/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ti/log.po
+++ b/src/vidalia/help/content/po/ti/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ti/netview.po b/src/vidalia/help/content/po/ti/netview.po
index 47f3d73..7719a04 100644
--- a/src/vidalia/help/content/po/ti/netview.po
+++ b/src/vidalia/help/content/po/ti/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ti\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/ti/running.po b/src/vidalia/help/content/po/ti/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ti/running.po
+++ b/src/vidalia/help/content/po/ti/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ti/server.po b/src/vidalia/help/content/po/ti/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ti/server.po
+++ b/src/vidalia/help/content/po/ti/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ti/services.po b/src/vidalia/help/content/po/ti/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ti/services.po
+++ b/src/vidalia/help/content/po/ti/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ti/troubleshooting.po b/src/vidalia/help/content/po/ti/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ti/troubleshooting.po
+++ b/src/vidalia/help/content/po/ti/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tk/config.po b/src/vidalia/help/content/po/tk/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/tk/config.po
+++ b/src/vidalia/help/content/po/tk/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tk/index.po b/src/vidalia/help/content/po/tk/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/tk/index.po
+++ b/src/vidalia/help/content/po/tk/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tk/links.po b/src/vidalia/help/content/po/tk/links.po
index 3d33249..3253f25 100644
--- a/src/vidalia/help/content/po/tk/links.po
+++ b/src/vidalia/help/content/po/tk/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: tk\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/tk/log.po b/src/vidalia/help/content/po/tk/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/tk/log.po
+++ b/src/vidalia/help/content/po/tk/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tk/netview.po b/src/vidalia/help/content/po/tk/netview.po
index 47f3d73..1cd01b8 100644
--- a/src/vidalia/help/content/po/tk/netview.po
+++ b/src/vidalia/help/content/po/tk/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: tk\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/tk/running.po b/src/vidalia/help/content/po/tk/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/tk/running.po
+++ b/src/vidalia/help/content/po/tk/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tk/server.po b/src/vidalia/help/content/po/tk/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/tk/server.po
+++ b/src/vidalia/help/content/po/tk/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tk/services.po b/src/vidalia/help/content/po/tk/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/tk/services.po
+++ b/src/vidalia/help/content/po/tk/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tk/troubleshooting.po b/src/vidalia/help/content/po/tk/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/tk/troubleshooting.po
+++ b/src/vidalia/help/content/po/tk/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tr/config.po b/src/vidalia/help/content/po/tr/config.po
index 92f675c..7613a9a 100644
--- a/src/vidalia/help/content/po/tr/config.po
+++ b/src/vidalia/help/content/po/tr/config.po
@@ -1,33 +1,22 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:31+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: tr_TR\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
#: en/config.html:16
msgid "Configuring Vidalia and Tor"
-msgstr ""
+msgstr "Vidalia ve Tor'u yapılandırıyor"
#. type: Content of: <html><body><p>
#: en/config.html:20
@@ -40,25 +29,26 @@ msgstr ""
#. type: Content of: <html><body>
#: en/config.html:26
msgid "<a name=\"general\"/>"
-msgstr ""
+msgstr "<a name=\"genel\"/>"
#. type: Content of: <html><body><h3>
#: en/config.html:27
msgid "General Settings"
-msgstr ""
+msgstr "Genel Ayarlar"
#. type: Content of: <html><body><p>
#: en/config.html:29
-msgid "Settings on the <i>General</i> page are the most commonly modified settings."
+msgid ""
+"Settings on the <i>General</i> page are the most commonly modified settings."
msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/config.html:32
msgid ""
-"<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 "
+"<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."
msgstr ""
@@ -73,18 +63,18 @@ msgstr ""
#. type: Content of: <html><body>
#: en/config.html:46
msgid "<a name=\"network\"/>"
-msgstr ""
+msgstr "<a name=\"Ağ\"/>"
#. type: Content of: <html><body><h3>
#: en/config.html:47
msgid "Network Settings"
-msgstr ""
+msgstr "Ağ Ayarları"
#. type: Content of: <html><body><p>
#: en/config.html:49
msgid ""
-"The <i>Network</i> settings page lets you change how Tor connects to the Tor "
-"network."
+"The <i>Network</i> settings page lets you change how Tor connects to the Tor"
+" network."
msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -106,8 +96,8 @@ msgid ""
"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>)"
+"list of ports permitted by your firewall or proxy, separated by commas. "
+"(<i>Example: 80,443,8080</i>)"
msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -117,8 +107,8 @@ msgid ""
"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."
+"or newer only). You can add bridge relays by specifying either their address"
+" and port number, or their address, port number, and fingerprint."
msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -129,27 +119,27 @@ msgstr ""
#. type: Content of: <html><body><ul><li><ul><li>
#: en/config.html:80
msgid "128.213.48.13:8080"
-msgstr ""
+msgstr "128.213.48.13:8080"
#. type: Content of: <html><body><ul><li><ul><li>
#: en/config.html:83
msgid "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73"
-msgstr ""
+msgstr "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73"
#. type: Content of: <html><body><ul><li><ul><li>
#: en/config.html:86
msgid "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
-msgstr ""
+msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
#. type: Content of: <html><body><ul><li>
#: en/config.html:89
msgid ""
"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 "
+"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."
msgstr ""
@@ -167,19 +157,19 @@ msgstr ""
#. type: Content of: <html><body><p>
#: en/config.html:103
msgid ""
-"<i> See <a href=\"server.html\">this help topic</a> for detailed information "
-"about setting up and managing a Tor relay. </i>"
+"<i> See <a href=\"server.html\">this help topic</a> for detailed information"
+" about setting up and managing a Tor relay. </i>"
msgstr ""
#. type: Content of: <html><body>
#: en/config.html:109
msgid "<a name=\"appearance\"/>"
-msgstr ""
+msgstr "<a name=\"görünüm\"/>"
#. type: Content of: <html><body><h3>
#: en/config.html:110
msgid "Appearance Settings"
-msgstr ""
+msgstr "Görünüm Ayarları"
#. type: Content of: <html><body><p>
#: en/config.html:112
@@ -191,12 +181,12 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/config.html:116
msgid ""
-"<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."
+"<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."
msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -210,12 +200,12 @@ msgstr ""
#. type: Content of: <html><body>
#: en/config.html:131
msgid "<a name=\"advanced\"/>"
-msgstr ""
+msgstr "<a name=\"gelişmiş\"/>"
#. type: Content of: <html><body><h3>
#: en/config.html:132
msgid "Advanced Settings"
-msgstr ""
+msgstr "Gelişmiş Ayarlar"
#. type: Content of: <html><body><p>
#: en/config.html:134
@@ -227,8 +217,8 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/config.html:138
msgid ""
-"<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 "
+"<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."
msgstr ""
@@ -255,15 +245,15 @@ msgid ""
"<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."
+"Vidalia randomly generate a new password each time it starts Tor by checking"
+" the <i>Randomly Generate</i> checkbox."
msgstr ""
#. type: Content of: <html><body><ul><li><ul><li>
#: en/config.html:162
msgid ""
-"<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 "
+"<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."
msgstr ""
@@ -289,25 +279,25 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/config.html:181
msgid ""
-"<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 "
+"<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."
msgstr ""
#. type: Content of: <html><body>
#: en/config.html:189
msgid "<a name=\"services\"/>"
-msgstr ""
+msgstr "<a name=\"hizmetler\"/>"
#. type: Content of: <html><body><h3>
#: en/config.html:190
msgid "Hidden Service Settings"
-msgstr ""
+msgstr "Gizlenmiş Hizmet Ayarları"
#. type: Content of: <html><body><p>
#: en/config.html:192
msgid ""
-"Hidden services allow you to provide any kind of TCP-based service, e.g. an "
-"HTTP service, to others without revealing your IP address."
+"Hidden services allow you to provide any kind of TCP-based service, e.g. an"
+" HTTP service, to others without revealing your IP address."
msgstr ""
diff --git a/src/vidalia/help/content/po/tr/index.po b/src/vidalia/help/content/po/tr/index.po
index 711a3c6..66d86cd 100644
--- a/src/vidalia/help/content/po/tr/index.po
+++ b/src/vidalia/help/content/po/tr/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tr/links.po b/src/vidalia/help/content/po/tr/links.po
index 0b57eb2..f37982e 100644
--- a/src/vidalia/help/content/po/tr/links.po
+++ b/src/vidalia/help/content/po/tr/links.po
@@ -1,51 +1,40 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr "Yararlı Bağlantılar"
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr "Vidalia"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr " "
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr "Ev sayfası"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
@@ -54,71 +43,38 @@ msgstr ""
"https://www.torproject.org/vidalia/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr "Wiki"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> http://trac.vidalia-"
-"project.net/wiki</a>"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr "Hata Takip Sistemi"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/report\"> http://trac.vidalia-"
-"project.net/report</a>"
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr "Tor"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr "S.S.S."
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
-msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
diff --git a/src/vidalia/help/content/po/tr/log.po b/src/vidalia/help/content/po/tr/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/tr/log.po
+++ b/src/vidalia/help/content/po/tr/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tr/netview.po b/src/vidalia/help/content/po/tr/netview.po
index 47f3d73..79e248b 100644
--- a/src/vidalia/help/content/po/tr/netview.po
+++ b/src/vidalia/help/content/po/tr/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/tr/running.po b/src/vidalia/help/content/po/tr/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/tr/running.po
+++ b/src/vidalia/help/content/po/tr/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tr/server.po b/src/vidalia/help/content/po/tr/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/tr/server.po
+++ b/src/vidalia/help/content/po/tr/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tr/services.po b/src/vidalia/help/content/po/tr/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/tr/services.po
+++ b/src/vidalia/help/content/po/tr/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/tr/troubleshooting.po b/src/vidalia/help/content/po/tr/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/tr/troubleshooting.po
+++ b/src/vidalia/help/content/po/tr/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/uk/config.po b/src/vidalia/help/content/po/uk/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/uk/config.po
+++ b/src/vidalia/help/content/po/uk/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/uk/index.po b/src/vidalia/help/content/po/uk/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/uk/index.po
+++ b/src/vidalia/help/content/po/uk/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/uk/links.po b/src/vidalia/help/content/po/uk/links.po
index 3d33249..617f50e 100644
--- a/src/vidalia/help/content/po/uk/links.po
+++ b/src/vidalia/help/content/po/uk/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/uk/log.po b/src/vidalia/help/content/po/uk/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/uk/log.po
+++ b/src/vidalia/help/content/po/uk/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/uk/netview.po b/src/vidalia/help/content/po/uk/netview.po
index 47f3d73..6a03b77 100644
--- a/src/vidalia/help/content/po/uk/netview.po
+++ b/src/vidalia/help/content/po/uk/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/uk/running.po b/src/vidalia/help/content/po/uk/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/uk/running.po
+++ b/src/vidalia/help/content/po/uk/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/uk/server.po b/src/vidalia/help/content/po/uk/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/uk/server.po
+++ b/src/vidalia/help/content/po/uk/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/uk/services.po b/src/vidalia/help/content/po/uk/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/uk/services.po
+++ b/src/vidalia/help/content/po/uk/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/uk/troubleshooting.po b/src/vidalia/help/content/po/uk/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/uk/troubleshooting.po
+++ b/src/vidalia/help/content/po/uk/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ur/config.po b/src/vidalia/help/content/po/ur/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ur/config.po
+++ b/src/vidalia/help/content/po/ur/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ur/index.po b/src/vidalia/help/content/po/ur/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ur/index.po
+++ b/src/vidalia/help/content/po/ur/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ur/links.po b/src/vidalia/help/content/po/ur/links.po
index 3d33249..98fd7eb 100644
--- a/src/vidalia/help/content/po/ur/links.po
+++ b/src/vidalia/help/content/po/ur/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/ur/log.po b/src/vidalia/help/content/po/ur/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ur/log.po
+++ b/src/vidalia/help/content/po/ur/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ur/netview.po b/src/vidalia/help/content/po/ur/netview.po
index 47f3d73..95e3b63 100644
--- a/src/vidalia/help/content/po/ur/netview.po
+++ b/src/vidalia/help/content/po/ur/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/ur/running.po b/src/vidalia/help/content/po/ur/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ur/running.po
+++ b/src/vidalia/help/content/po/ur/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ur/server.po b/src/vidalia/help/content/po/ur/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ur/server.po
+++ b/src/vidalia/help/content/po/ur/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ur/services.po b/src/vidalia/help/content/po/ur/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ur/services.po
+++ b/src/vidalia/help/content/po/ur/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ur/troubleshooting.po b/src/vidalia/help/content/po/ur/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ur/troubleshooting.po
+++ b/src/vidalia/help/content/po/ur/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ve/config.po b/src/vidalia/help/content/po/ve/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/ve/config.po
+++ b/src/vidalia/help/content/po/ve/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ve/index.po b/src/vidalia/help/content/po/ve/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/ve/index.po
+++ b/src/vidalia/help/content/po/ve/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ve/links.po b/src/vidalia/help/content/po/ve/links.po
index 3d33249..a0157f5 100644
--- a/src/vidalia/help/content/po/ve/links.po
+++ b/src/vidalia/help/content/po/ve/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ve\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/ve/log.po b/src/vidalia/help/content/po/ve/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/ve/log.po
+++ b/src/vidalia/help/content/po/ve/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ve/netview.po b/src/vidalia/help/content/po/ve/netview.po
index 47f3d73..8b0aa3d 100644
--- a/src/vidalia/help/content/po/ve/netview.po
+++ b/src/vidalia/help/content/po/ve/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ve\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/ve/running.po b/src/vidalia/help/content/po/ve/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/ve/running.po
+++ b/src/vidalia/help/content/po/ve/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ve/server.po b/src/vidalia/help/content/po/ve/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/ve/server.po
+++ b/src/vidalia/help/content/po/ve/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ve/services.po b/src/vidalia/help/content/po/ve/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/ve/services.po
+++ b/src/vidalia/help/content/po/ve/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/ve/troubleshooting.po b/src/vidalia/help/content/po/ve/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/ve/troubleshooting.po
+++ b/src/vidalia/help/content/po/ve/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/vi/config.po b/src/vidalia/help/content/po/vi/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/vi/config.po
+++ b/src/vidalia/help/content/po/vi/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/vi/index.po b/src/vidalia/help/content/po/vi/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/vi/index.po
+++ b/src/vidalia/help/content/po/vi/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/vi/links.po b/src/vidalia/help/content/po/vi/links.po
index 3d33249..253c7b9 100644
--- a/src/vidalia/help/content/po/vi/links.po
+++ b/src/vidalia/help/content/po/vi/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/vi/log.po b/src/vidalia/help/content/po/vi/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/vi/log.po
+++ b/src/vidalia/help/content/po/vi/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/vi/netview.po b/src/vidalia/help/content/po/vi/netview.po
index 47f3d73..74ff807 100644
--- a/src/vidalia/help/content/po/vi/netview.po
+++ b/src/vidalia/help/content/po/vi/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/vi/running.po b/src/vidalia/help/content/po/vi/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/vi/running.po
+++ b/src/vidalia/help/content/po/vi/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/vi/server.po b/src/vidalia/help/content/po/vi/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/vi/server.po
+++ b/src/vidalia/help/content/po/vi/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/vi/services.po b/src/vidalia/help/content/po/vi/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/vi/services.po
+++ b/src/vidalia/help/content/po/vi/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/vi/troubleshooting.po b/src/vidalia/help/content/po/vi/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/vi/troubleshooting.po
+++ b/src/vidalia/help/content/po/vi/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/wa/config.po b/src/vidalia/help/content/po/wa/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/wa/config.po
+++ b/src/vidalia/help/content/po/wa/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/wa/index.po b/src/vidalia/help/content/po/wa/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/wa/index.po
+++ b/src/vidalia/help/content/po/wa/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/wa/links.po b/src/vidalia/help/content/po/wa/links.po
index 3d33249..01014a2 100644
--- a/src/vidalia/help/content/po/wa/links.po
+++ b/src/vidalia/help/content/po/wa/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: wa\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/wa/log.po b/src/vidalia/help/content/po/wa/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/wa/log.po
+++ b/src/vidalia/help/content/po/wa/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/wa/netview.po b/src/vidalia/help/content/po/wa/netview.po
index 47f3d73..503a27d 100644
--- a/src/vidalia/help/content/po/wa/netview.po
+++ b/src/vidalia/help/content/po/wa/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: wa\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/wa/running.po b/src/vidalia/help/content/po/wa/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/wa/running.po
+++ b/src/vidalia/help/content/po/wa/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/wa/server.po b/src/vidalia/help/content/po/wa/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/wa/server.po
+++ b/src/vidalia/help/content/po/wa/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/wa/services.po b/src/vidalia/help/content/po/wa/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/wa/services.po
+++ b/src/vidalia/help/content/po/wa/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/wa/troubleshooting.po b/src/vidalia/help/content/po/wa/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/wa/troubleshooting.po
+++ b/src/vidalia/help/content/po/wa/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/wo/bridges.po b/src/vidalia/help/content/po/wo/bridges.po
index 7483735..7e87e97 100644
--- a/src/vidalia/help/content/po/wo/bridges.po
+++ b/src/vidalia/help/content/po/wo/bridges.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed by
-# the Vidalia Project at http://www.vidalia-project.net/. No part of
-# Vidalia, including this file, may be copied, modified, propagated, or
+# the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified, propagated, or
# distributed except according to the terms described in the LICENSE
# file.
#
diff --git a/src/vidalia/help/content/po/wo/config.po b/src/vidalia/help/content/po/wo/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/wo/config.po
+++ b/src/vidalia/help/content/po/wo/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/wo/index.po b/src/vidalia/help/content/po/wo/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/wo/index.po
+++ b/src/vidalia/help/content/po/wo/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/wo/links.po b/src/vidalia/help/content/po/wo/links.po
index 3d33249..979d89d 100644
--- a/src/vidalia/help/content/po/wo/links.po
+++ b/src/vidalia/help/content/po/wo/links.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/wo/log.po b/src/vidalia/help/content/po/wo/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/wo/log.po
+++ b/src/vidalia/help/content/po/wo/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/wo/netview.po b/src/vidalia/help/content/po/wo/netview.po
index 47f3d73..133164f 100644
--- a/src/vidalia/help/content/po/wo/netview.po
+++ b/src/vidalia/help/content/po/wo/netview.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/wo/running.po b/src/vidalia/help/content/po/wo/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/wo/running.po
+++ b/src/vidalia/help/content/po/wo/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/wo/server.po b/src/vidalia/help/content/po/wo/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/wo/server.po
+++ b/src/vidalia/help/content/po/wo/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/wo/services.po b/src/vidalia/help/content/po/wo/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/wo/services.po
+++ b/src/vidalia/help/content/po/wo/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/wo/troubleshooting.po b/src/vidalia/help/content/po/wo/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/wo/troubleshooting.po
+++ b/src/vidalia/help/content/po/wo/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_CN/config.po b/src/vidalia/help/content/po/zh_CN/config.po
index 94dd6aa..4415b33 100644
--- a/src/vidalia/help/content/po/zh_CN/config.po
+++ b/src/vidalia/help/content/po/zh_CN/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_CN/index.po b/src/vidalia/help/content/po/zh_CN/index.po
index a134b39..b94bac8 100644
--- a/src/vidalia/help/content/po/zh_CN/index.po
+++ b/src/vidalia/help/content/po/zh_CN/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_CN/links.po b/src/vidalia/help/content/po/zh_CN/links.po
index 9072f74..859b4a5 100644
--- a/src/vidalia/help/content/po/zh_CN/links.po
+++ b/src/vidalia/help/content/po/zh_CN/links.po
@@ -1,52 +1,40 @@
#
-# $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.
-#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: 2010-10-05 05:00+0200\n"
-"Last-Translator: qysnn <qysnn1 at gmail.com>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: zh_CN\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 2.0.5\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr "帮助链接"
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr "Vidalia"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr " "
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr "主页"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
@@ -55,71 +43,38 @@ msgstr ""
"https://www.torproject.org/vidalia/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr "维基"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> http://trac.vidalia-"
-"project.net/wiki</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr "Bug追踪系统"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"http://trac.vidalia-project.net/report\"> http://trac.vidalia-"
-"project.net/report</a>"
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr "Tor"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr "常见问题"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
diff --git a/src/vidalia/help/content/po/zh_CN/log.po b/src/vidalia/help/content/po/zh_CN/log.po
index a4f2831..0a62a83 100644
--- a/src/vidalia/help/content/po/zh_CN/log.po
+++ b/src/vidalia/help/content/po/zh_CN/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_CN/netview.po b/src/vidalia/help/content/po/zh_CN/netview.po
index da54615..8e4e7d5 100644
--- a/src/vidalia/help/content/po/zh_CN/netview.po
+++ b/src/vidalia/help/content/po/zh_CN/netview.po
@@ -1,57 +1,42 @@
#
-# $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.
-#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-11-14 07:13+0200\n"
-"Last-Translator: jonchil <abcd666 at gmail.com>\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: zh_CN\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 2.0.5\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
msgid "Network Viewer"
-msgstr "网络查看器"
+msgstr ""
#. type: Content of: <html><body><p>
#: en/netview.html:20
msgid ""
"The network viewer lets you see relays in the Tor network and where your "
"traffic is going."
-msgstr "网络查看器使您可以查看 Tor 网络的中继和您经由的位置。"
+msgstr ""
#. type: Content of: <html><body>
#: en/netview.html:25
msgid "<a name=\"overview\"/>"
-msgstr "<a name=\"overview\"/>"
+msgstr ""
#. type: Content of: <html><body><h3>
#: en/netview.html:26
msgid "Overview"
-msgstr "概述"
+msgstr ""
-# multiply streams不知如何翻译，专业术语
-# by Jonchil
#. type: Content of: <html><body><p>
#: en/netview.html:28
-#, fuzzy
msgid ""
"When you want to communicate anonymously through Tor (say, connecting to a "
"website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections "
@@ -59,28 +44,25 @@ msgid ""
"then sent as a <i>stream</i> through that circuit. For efficiency, multiple "
"streams may share the same circuit."
msgstr ""
-"当您想要通过 Tor 和匿名者交流时（说话，连接到网站），Tor 通过网络中继创建一个加密了连接的通路，或<i>回路</i>。您的应用程序是通过该回路作"
-"为<i>流</i>来发送的。为了提高效率，多媒体流也可能会共享同一个回路。"
#. type: Content of: <html><body>
#: en/netview.html:35
msgid "<a name=\"netmap\"/>"
-msgstr "<a name=\"netmap\"/>"
+msgstr ""
#. type: Content of: <html><body><h3>
#: en/netview.html:36
msgid "Network Map"
-msgstr "网络地图"
+msgstr ""
#. type: Content of: <html><body><p>
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
-"网络地图是由世界地图，和红点指明的 Tor 网络地图上中继的地理位置组成的。绿色线条连接中继用以指明 Tor 客户端通过 Tor 网络创建回路的路径。"
#. type: Content of: <html><body><p>
#: en/netview.html:44
@@ -89,7 +71,7 @@ msgid ""
"<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."
-msgstr "您可以通过点击工具栏上的<b>缩小</b>和<b>放大</b>按钮来放缩地图。您也可以通过点击地图并且拖拽到您想要移动的目标上。"
+msgstr ""
#. type: Content of: <html><body><p>
#: en/netview.html:50
@@ -98,37 +80,29 @@ msgid ""
"address of the relay in a GeoIP database, created by MaxMind and located at "
"geoip.vidalia-project.net."
msgstr ""
-"Tor 中继的地理位置决定于 GeoIP 数据库中中继的 IP 地址，由 MaxMind 创建并位于geoip.vidalia-project.net。"
-# 最后一句，翻译不通顺
-# by Jonchil
#. type: Content of: <html><body><p>
#: en/netview.html:55
-#, fuzzy
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
-"在对话框中间，位于网络地图下方的位置，您可以看到一个当前回路列表，任何应用程序也直接经由该回路。当网络地图第一次载入时，您应当可以看到一个到geoip"
-".vidalia-project.net的连接，该连接发生在当 Vidalia 为 Tor "
-"中继列表搜索地理位置信息的时候。很重要需要您注意的一点是该请求是通过 Tor 完成的，所以您的位置不会透露给 GeoIP "
-"中继。该搜索结果将会在本地捕捉以求降低载入到 Vidalia GeoIP 中继。"
#. type: Content of: <html><body>
#: en/netview.html:66
msgid "<a name=\"relaylist\"/>"
-msgstr "<a name=\"relaylist\"/>"
+msgstr ""
#. type: Content of: <html><body><h3>
#: en/netview.html:67
msgid "Relay Status"
-msgstr "中继状态"
+msgstr ""
#. type: Content of: <html><body><p>
#: en/netview.html:69
@@ -136,119 +110,111 @@ msgid ""
"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:"
-msgstr "在网络查看器的左边，您将会看到一个在 Tor 网络中的中继列表。每个中继下面是一个指示中继状态的图标。下面的表格总结了中继状态图标。"
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:78
msgid "The relay is offline or simply not responding."
-msgstr "中继离线或未回应。"
+msgstr ""
-# hibernating不好翻译，本意是休眠之意，这里暂时取字面意思
-# by Jonchil
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:84
-#, fuzzy
msgid ""
"The relay is <i>hibernating</i>, meaning it is online, but has used up as "
"much bandwidth as the operator is willing to allow for a given time period."
-msgstr "中继<i>正在休眠</i>，意思是中继在线，但已经用尽宽带，因为操作员希望允许在指定时间段内运行。"
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:92
msgid "The relay is online, but has shown only minimal throughput."
-msgstr "中继在线，但显示了很小的数据流量。"
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:98
msgid "The relay is online and has shown a throughput >= 20 KB/s."
-msgstr "中继在线并且显示流量>= 20 KB/s。"
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:104
msgid "The relay is online and has shown a throughput >= 60 KB/s."
-msgstr "中继在线并且显示流量>= 60 KB/s。"
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:110
msgid "The relay is online and has shown a throughput >= 400 KB/s."
-msgstr "中继在线并且显示流量>= 400 KB/s。"
+msgstr ""
-# 第二行over后不知如何连接翻译
-# by Jonchil
#. type: Content of: <html><body><p>
#: en/netview.html:116
-#, fuzzy
msgid ""
"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."
-msgstr "所有的宽带值都是基于最小或最大宽带的输入输出值"
+msgstr ""
#. type: Content of: <html><body>
#: en/netview.html:122
msgid "<a name=\"details\"/>"
-msgstr "<a name=\"details\"/>"
+msgstr ""
#. type: Content of: <html><body><h3>
#: en/netview.html:123
msgid "Relay Details"
-msgstr "中继细节"
+msgstr ""
#. type: Content of: <html><body><p>
#: en/netview.html:125
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
-"在屏幕右边的终极细节面板向您提供了关于中继或当前在<a href=\"#relaylist\">中继列表</a>中选择的细节。如果您在当前回路或流中选择了一"
-"个回路或流，该面板将会向您展示关于每个通过回路发送信息的细节。"
#. type: Content of: <html><body><p>
#: en/netview.html:132
msgid ""
"The fields that you may see in the panel are as follows (<i>Note</i>: not "
"all of these fields will always be present):"
-msgstr "面板中您能看的项目如下（<i>注意</i>：不是所有的项目都会显示出来的）："
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:138
msgid "<b>Location</b>"
-msgstr "<b>位置</b>"
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:139
msgid "The geographic location of this Tor relay."
-msgstr "Tor 中继的地理位置。"
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:142
msgid "<b>IP Address</b>"
-msgstr "<b>IP 地址</b>"
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:143
msgid "IP address at which this Tor relay can be reached."
-msgstr "该 Tor 中继可能连接到的 IP 地址。"
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:146
msgid "<b>Platform</b>"
-msgstr "<b>平台</b>"
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:148
msgid ""
"Operating system information and Tor version on which this relay is "
"currently running."
-msgstr "当前正在运行中继平台的操作系统信息和 Tor 版本。"
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:153
msgid "<b>Bandwidth</b>"
-msgstr "<b>宽带</b>"
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:155
@@ -260,21 +226,21 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:160
msgid "<b>Uptime</b>"
-msgstr "<b>运行时间</b>"
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:162
msgid ""
"Length of time this relay has been available, which can be used to help "
"estimate this relay's stability."
-msgstr "宽带已经运行的时间，可以帮助评估该中继的稳定性。"
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:167
msgid "<b>Last Updated</b>"
-msgstr "<b>最后更新</b>"
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
#: en/netview.html:168
msgid "Date this relay's information was last updated."
-msgstr "该中继的信息最后更新的日期。"
+msgstr ""
diff --git a/src/vidalia/help/content/po/zh_CN/running.po b/src/vidalia/help/content/po/zh_CN/running.po
index 0a1c7a0..66b90cf 100644
--- a/src/vidalia/help/content/po/zh_CN/running.po
+++ b/src/vidalia/help/content/po/zh_CN/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_CN/server.po b/src/vidalia/help/content/po/zh_CN/server.po
index 09da128..3cb445f 100644
--- a/src/vidalia/help/content/po/zh_CN/server.po
+++ b/src/vidalia/help/content/po/zh_CN/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_CN/services.po b/src/vidalia/help/content/po/zh_CN/services.po
index db5f9fe..73d206c 100644
--- a/src/vidalia/help/content/po/zh_CN/services.po
+++ b/src/vidalia/help/content/po/zh_CN/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_CN/troubleshooting.po b/src/vidalia/help/content/po/zh_CN/troubleshooting.po
index 53f153f..92dddad 100644
--- a/src/vidalia/help/content/po/zh_CN/troubleshooting.po
+++ b/src/vidalia/help/content/po/zh_CN/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_HK/config.po b/src/vidalia/help/content/po/zh_HK/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/zh_HK/config.po
+++ b/src/vidalia/help/content/po/zh_HK/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_HK/index.po b/src/vidalia/help/content/po/zh_HK/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/zh_HK/index.po
+++ b/src/vidalia/help/content/po/zh_HK/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_HK/links.po b/src/vidalia/help/content/po/zh_HK/links.po
index 3d33249..077a112 100644
--- a/src/vidalia/help/content/po/zh_HK/links.po
+++ b/src/vidalia/help/content/po/zh_HK/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: zh_HK\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/zh_HK/log.po b/src/vidalia/help/content/po/zh_HK/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/zh_HK/log.po
+++ b/src/vidalia/help/content/po/zh_HK/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_HK/netview.po b/src/vidalia/help/content/po/zh_HK/netview.po
index 47f3d73..835d3e1 100644
--- a/src/vidalia/help/content/po/zh_HK/netview.po
+++ b/src/vidalia/help/content/po/zh_HK/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: zh_HK\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/zh_HK/running.po b/src/vidalia/help/content/po/zh_HK/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/zh_HK/running.po
+++ b/src/vidalia/help/content/po/zh_HK/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_HK/server.po b/src/vidalia/help/content/po/zh_HK/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/zh_HK/server.po
+++ b/src/vidalia/help/content/po/zh_HK/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_HK/services.po b/src/vidalia/help/content/po/zh_HK/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/zh_HK/services.po
+++ b/src/vidalia/help/content/po/zh_HK/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_HK/troubleshooting.po b/src/vidalia/help/content/po/zh_HK/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/zh_HK/troubleshooting.po
+++ b/src/vidalia/help/content/po/zh_HK/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_TW/config.po b/src/vidalia/help/content/po/zh_TW/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/zh_TW/config.po
+++ b/src/vidalia/help/content/po/zh_TW/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_TW/index.po b/src/vidalia/help/content/po/zh_TW/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/zh_TW/index.po
+++ b/src/vidalia/help/content/po/zh_TW/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_TW/links.po b/src/vidalia/help/content/po/zh_TW/links.po
index 3d33249..4ae668f 100644
--- a/src/vidalia/help/content/po/zh_TW/links.po
+++ b/src/vidalia/help/content/po/zh_TW/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:33+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/zh_TW/log.po b/src/vidalia/help/content/po/zh_TW/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/zh_TW/log.po
+++ b/src/vidalia/help/content/po/zh_TW/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_TW/netview.po b/src/vidalia/help/content/po/zh_TW/netview.po
index 47f3d73..6332f41 100644
--- a/src/vidalia/help/content/po/zh_TW/netview.po
+++ b/src/vidalia/help/content/po/zh_TW/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/zh_TW/running.po b/src/vidalia/help/content/po/zh_TW/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/zh_TW/running.po
+++ b/src/vidalia/help/content/po/zh_TW/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_TW/server.po b/src/vidalia/help/content/po/zh_TW/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/zh_TW/server.po
+++ b/src/vidalia/help/content/po/zh_TW/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_TW/services.po b/src/vidalia/help/content/po/zh_TW/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/zh_TW/services.po
+++ b/src/vidalia/help/content/po/zh_TW/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zh_TW/troubleshooting.po b/src/vidalia/help/content/po/zh_TW/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/zh_TW/troubleshooting.po
+++ b/src/vidalia/help/content/po/zh_TW/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zu/config.po b/src/vidalia/help/content/po/zu/config.po
index 92f675c..537a346 100644
--- a/src/vidalia/help/content/po/zu/config.po
+++ b/src/vidalia/help/content/po/zu/config.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zu/index.po b/src/vidalia/help/content/po/zu/index.po
index 069f01e..45d25be 100644
--- a/src/vidalia/help/content/po/zu/index.po
+++ b/src/vidalia/help/content/po/zu/index.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zu/links.po b/src/vidalia/help/content/po/zu/links.po
index 3d33249..a998a77 100644
--- a/src/vidalia/help/content/po/zu/links.po
+++ b/src/vidalia/help/content/po/zu/links.po
@@ -1,112 +1,78 @@
#
-# $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.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-05-06 19:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: zu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
msgid "Helpful Links"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
msgid "Vidalia"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
msgid " "
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
msgid "Homepage"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
msgid ""
"<a href=\"https://www.torproject.org/vidalia/\"> "
"https://www.torproject.org/vidalia/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/wiki\"> "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\"> "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
msgid "Tor"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
msgid "FAQ"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\"> "
+"https://www.torproject.org/docs/faq.html</a>"
msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\"> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\"> "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"
msgstr ""
diff --git a/src/vidalia/help/content/po/zu/log.po b/src/vidalia/help/content/po/zu/log.po
index e222391..b5d3761 100644
--- a/src/vidalia/help/content/po/zu/log.po
+++ b/src/vidalia/help/content/po/zu/log.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zu/netview.po b/src/vidalia/help/content/po/zu/netview.po
index 47f3d73..607e743 100644
--- a/src/vidalia/help/content/po/zu/netview.po
+++ b/src/vidalia/help/content/po/zu/netview.po
@@ -1,28 +1,17 @@
#
-# $Id$
-#
-# This file is part of Vidalia, and is subject to the license terms in
-# the LICENSE file, found in the top level directory of this
-# distribution. If you did not receive the LICENSE file with this
-# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
-# propagated, or distributed except according to the terms described
-# in the LICENSE file.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: zu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
#: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
#: en/netview.html:38
msgid ""
"The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
"client has created through the Tor network."
msgstr ""
@@ -96,12 +85,12 @@ msgstr ""
#: en/netview.html:55
msgid ""
"In the middle of the dialog, below the network map, you will see a list of "
-"your current circuits, as well as any application traffic currently on those "
-"circuits. When the network map first loads, you will probably see a "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
"looking up geographic information for the list of Tor relays. It is "
-"important to note that this request is done through Tor, so your location is "
-"not revealed to the GeoIP relay. The results of the lookups will be cached "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
"locally in order to reduce load on Vidalia's GeoIP relays."
msgstr ""
@@ -178,8 +167,8 @@ msgstr ""
msgid ""
"The relay details panel at the right side of the screen gives you details "
"about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
"details about each relay through which your traffic is currently being sent."
msgstr ""
diff --git a/src/vidalia/help/content/po/zu/running.po b/src/vidalia/help/content/po/zu/running.po
index 6efb482..e28fa1b 100644
--- a/src/vidalia/help/content/po/zu/running.po
+++ b/src/vidalia/help/content/po/zu/running.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zu/server.po b/src/vidalia/help/content/po/zu/server.po
index b1d2c57..bbd257f 100644
--- a/src/vidalia/help/content/po/zu/server.po
+++ b/src/vidalia/help/content/po/zu/server.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zu/services.po b/src/vidalia/help/content/po/zu/services.po
index e4c3cc1..1090190 100644
--- a/src/vidalia/help/content/po/zu/services.po
+++ b/src/vidalia/help/content/po/zu/services.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po/zu/troubleshooting.po b/src/vidalia/help/content/po/zu/troubleshooting.po
index 128dce8..5214888 100644
--- a/src/vidalia/help/content/po/zu/troubleshooting.po
+++ b/src/vidalia/help/content/po/zu/troubleshooting.po
@@ -5,8 +5,8 @@
# the LICENSE file, found in the top level directory of this
# distribution. If you did not receive the LICENSE file with this
# file, you may obtain it from the Vidalia source package distributed
-# by the Vidalia Project at http://www.vidalia-project.net/. No part
-# of Vidalia, including this file, may be copied, modified,
+# by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
+# No part of Vidalia, including this file, may be copied, modified,
# propagated, or distributed except according to the terms described
# in the LICENSE file.
#
diff --git a/src/vidalia/help/content/po2html.sh b/src/vidalia/help/content/po2html.sh
index ca6f01d..b94ee77 100755
--- a/src/vidalia/help/content/po2html.sh
+++ b/src/vidalia/help/content/po2html.sh
@@ -12,11 +12,11 @@
### Start config ###
# Location of the translated po files. Do not add the trailing slash.
-translated="/home/runa/tor/vidaliahelp/po"
+translated="/home/runa/tor/vidalia/src/vidalia/help/content/po"
# Location of the original and translated html files. Do not add the
# trailing slash.
-html="/home/runa/tor/vidaliahelp/"
+html="/home/runa/tor/vidalia/src/vidalia/help/content"
### End config ###
diff --git a/src/vidalia/help/content/pt_BR/bridges.html b/src/vidalia/help/content/pt_BR/bridges.html
index e9bd65a..a09ff9b 100644
--- a/src/vidalia/help/content/pt_BR/bridges.html
+++ b/src/vidalia/help/content/pt_BR/bridges.html
@@ -1,15 +1,15 @@
<!--
-** $Id: bridges.html 3007 2008-08-22 00:12:08Z edmanm $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ru/bridges.html b/src/vidalia/help/content/ru/bridges.html
index 2d34421..550f6fa 100644
--- a/src/vidalia/help/content/ru/bridges.html
+++ b/src/vidalia/help/content/ru/bridges.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ru/config.html b/src/vidalia/help/content/ru/config.html
index 0f5921f..fff08a1 100644
--- a/src/vidalia/help/content/ru/config.html
+++ b/src/vidalia/help/content/ru/config.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ru/index.html b/src/vidalia/help/content/ru/index.html
index 1247453..17aec54 100644
--- a/src/vidalia/help/content/ru/index.html
+++ b/src/vidalia/help/content/ru/index.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ru/links.html b/src/vidalia/help/content/ru/links.html
index fd0b216..12926b4 100644
--- a/src/vidalia/help/content/ru/links.html
+++ b/src/vidalia/help/content/ru/links.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ru/log.html b/src/vidalia/help/content/ru/log.html
index a84201f..d44904c 100644
--- a/src/vidalia/help/content/ru/log.html
+++ b/src/vidalia/help/content/ru/log.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ru/netview.html b/src/vidalia/help/content/ru/netview.html
index 214f01b..3c7c3e0 100644
--- a/src/vidalia/help/content/ru/netview.html
+++ b/src/vidalia/help/content/ru/netview.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ru/running.html b/src/vidalia/help/content/ru/running.html
index 867a636..5544447 100644
--- a/src/vidalia/help/content/ru/running.html
+++ b/src/vidalia/help/content/ru/running.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ru/server.html b/src/vidalia/help/content/ru/server.html
index 83cff3f..57d23dd 100644
--- a/src/vidalia/help/content/ru/server.html
+++ b/src/vidalia/help/content/ru/server.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ru/services.html b/src/vidalia/help/content/ru/services.html
index 971101d..ce80bcc 100644
--- a/src/vidalia/help/content/ru/services.html
+++ b/src/vidalia/help/content/ru/services.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/ru/troubleshooting.html b/src/vidalia/help/content/ru/troubleshooting.html
index 8feb976..33284bb 100644
--- a/src/vidalia/help/content/ru/troubleshooting.html
+++ b/src/vidalia/help/content/ru/troubleshooting.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/sv/bridges.html b/src/vidalia/help/content/sv/bridges.html
index 99f20cb..f04b99e 100644
--- a/src/vidalia/help/content/sv/bridges.html
+++ b/src/vidalia/help/content/sv/bridges.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/sv/config.html b/src/vidalia/help/content/sv/config.html
index 6caf6d0..7124058 100644
--- a/src/vidalia/help/content/sv/config.html
+++ b/src/vidalia/help/content/sv/config.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/sv/index.html b/src/vidalia/help/content/sv/index.html
index be2b53b..d9adb3f 100644
--- a/src/vidalia/help/content/sv/index.html
+++ b/src/vidalia/help/content/sv/index.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/sv/links.html b/src/vidalia/help/content/sv/links.html
index 42d23f9..1a1ecf6 100644
--- a/src/vidalia/help/content/sv/links.html
+++ b/src/vidalia/help/content/sv/links.html
@@ -1,15 +1,15 @@
<!--
-** $Id: links.html 4323 2010-06-26 15:46:44Z runa $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/sv/log.html b/src/vidalia/help/content/sv/log.html
index eefe508..2ecf5b0 100644
--- a/src/vidalia/help/content/sv/log.html
+++ b/src/vidalia/help/content/sv/log.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/sv/netview.html b/src/vidalia/help/content/sv/netview.html
index 737b064..98f337c 100644
--- a/src/vidalia/help/content/sv/netview.html
+++ b/src/vidalia/help/content/sv/netview.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/sv/running.html b/src/vidalia/help/content/sv/running.html
index fbda086..dc1f21d 100644
--- a/src/vidalia/help/content/sv/running.html
+++ b/src/vidalia/help/content/sv/running.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/sv/server.html b/src/vidalia/help/content/sv/server.html
index fc4a252..e487601 100644
--- a/src/vidalia/help/content/sv/server.html
+++ b/src/vidalia/help/content/sv/server.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/sv/services.html b/src/vidalia/help/content/sv/services.html
index 11f5a95..ef3aaf8 100644
--- a/src/vidalia/help/content/sv/services.html
+++ b/src/vidalia/help/content/sv/services.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/sv/troubleshooting.html b/src/vidalia/help/content/sv/troubleshooting.html
index c56a2bf..f1bd43b 100644
--- a/src/vidalia/help/content/sv/troubleshooting.html
+++ b/src/vidalia/help/content/sv/troubleshooting.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/tr/links.html b/src/vidalia/help/content/tr/links.html
index 12a0e9f..b785f22 100644
--- a/src/vidalia/help/content/tr/links.html
+++ b/src/vidalia/help/content/tr/links.html
@@ -1,15 +1,15 @@
<!--
-** $Id: links.html 4323 2010-06-26 15:46:44Z runa $
+** $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.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/zh_CN/bridges.html b/src/vidalia/help/content/zh_CN/bridges.html
index 87e683c..fa17ecc 100644
--- a/src/vidalia/help/content/zh_CN/bridges.html
+++ b/src/vidalia/help/content/zh_CN/bridges.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/zh_CN/config.html b/src/vidalia/help/content/zh_CN/config.html
index 95eea5f..bab870d 100644
--- a/src/vidalia/help/content/zh_CN/config.html
+++ b/src/vidalia/help/content/zh_CN/config.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/zh_CN/index.html b/src/vidalia/help/content/zh_CN/index.html
index 62ac9c8..ba76667 100644
--- a/src/vidalia/help/content/zh_CN/index.html
+++ b/src/vidalia/help/content/zh_CN/index.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/zh_CN/links.html b/src/vidalia/help/content/zh_CN/links.html
index 7f1472f..bae5d99 100644
--- a/src/vidalia/help/content/zh_CN/links.html
+++ b/src/vidalia/help/content/zh_CN/links.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/zh_CN/log.html b/src/vidalia/help/content/zh_CN/log.html
index 83a4ac1..3febf66 100644
--- a/src/vidalia/help/content/zh_CN/log.html
+++ b/src/vidalia/help/content/zh_CN/log.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/zh_CN/netview.html b/src/vidalia/help/content/zh_CN/netview.html
index 3cabda1..2641fa7 100644
--- a/src/vidalia/help/content/zh_CN/netview.html
+++ b/src/vidalia/help/content/zh_CN/netview.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/zh_CN/running.html b/src/vidalia/help/content/zh_CN/running.html
index d1ac3af..0b7dd70 100644
--- a/src/vidalia/help/content/zh_CN/running.html
+++ b/src/vidalia/help/content/zh_CN/running.html
@@ -7,9 +7,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
<body>
diff --git a/src/vidalia/help/content/zh_CN/server.html b/src/vidalia/help/content/zh_CN/server.html
index 2c06f43..b7f33f6 100644
--- a/src/vidalia/help/content/zh_CN/server.html
+++ b/src/vidalia/help/content/zh_CN/server.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/help/content/zh_CN/troubleshooting.html b/src/vidalia/help/content/zh_CN/troubleshooting.html
index 928cc65..577737e 100644
--- a/src/vidalia/help/content/zh_CN/troubleshooting.html
+++ b/src/vidalia/help/content/zh_CN/troubleshooting.html
@@ -5,9 +5,9 @@
** LICENSE file, found in the top level directory of this distribution. If
** you did not receive the LICENSE file with this file, you may obtain it
** from the Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to
-** the terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
-->
<html>
diff --git a/src/vidalia/i18n/CMakeLists.txt b/src/vidalia/i18n/CMakeLists.txt
index e0e1647..7ec3bda 100644
--- a/src/vidalia/i18n/CMakeLists.txt
+++ b/src/vidalia/i18n/CMakeLists.txt
@@ -5,9 +5,9 @@
## LICENSE file, found in the top level directory of this distribution. If
## you did not receive the LICENSE file with this file, you may obtain it
## from the Vidalia source package distributed by the Vidalia Project at
-## http://www.vidalia-project.net/. No part of Vidalia, including this file,
-## may be copied, modified, propagated, or distributed except according to
-## the terms described in the LICENSE file.
+## http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+## including this file, may be copied, modified, propagated, or distributed
+## except according to the terms described in the LICENSE file.
##
diff --git a/src/vidalia/i18n/po/.tx/config b/src/vidalia/i18n/po/.tx/config
index 80bc4e6..d129db7 100644
--- a/src/vidalia/i18n/po/.tx/config
+++ b/src/vidalia/i18n/po/.tx/config
@@ -1,129 +1,4 @@
-[main]
-host = https://www.transifex.net
-
-[torproject.vidalia-qt-pot]
-source_file = templates/qt.pot
-source_lang = en
-trans.af = af/qt_af.po
-trans.ak = ak/qt_ak.po
-trans.am = am/qt_am.po
-trans.ar = ar/qt_ar.po
-trans.arn = arn/qt_arn.po
-trans.ast = ast/qt_ast.po
-trans.az = az/qt_az.po
-trans.be = be/qt_be.po
-trans.bg = bg/qt_bg.po
-trans.bn = bn/qt_bn.po
-trans.bn_IN = bn_IN/qt_bn_IN.po
-trans.bo = bo/qt_bo.po
-trans.br = br/qt_br.po
-trans.bs = bs/qt_bs.po
-trans.ca = ca/qt_ca.po
-trans.cs = cs/qt_cs.po
-trans.csb = csb/qt_csb.po
-trans.cy = cy/qt_cy.po
-trans.da = da/qt_da.po
-trans.de = de/qt_de.po
-trans.de_CH = de_CH/qt_de_CH.po
-trans.de_DE = de_DE/qt_de_DE.po
-trans.dz = dz/qt_dz.po
-trans.el = el/qt_el.po
-trans.eo = eo/qt_eo.po
-trans.es = es/qt_es.po
-trans.et = et/qt_et.po
-trans.eu = eu/qt_eu.po
-trans.fa = fa/qt_fa.po
-trans.fi = fi/qt_fi.po
-trans.fil = fil/qt_fil.po
-trans.fo = fo/qt_fo.po
-trans.fr = fr/qt_fr.po
-trans.fur = fur/qt_fur.po
-trans.fy = fy/qt_fy.po
-trans.ga = ga/qt_ga.po
-trans.gl = gl/qt_gl.po
-trans.gu = gu/qt_gu.po
-trans.gun = gun/qt_gun.po
-trans.ha = ha/qt_ha.po
-trans.he = he/qt_he.po
-trans.hi = hi/qt_hi.po
-trans.hr = hr/qt_hr.po
-trans.ht = ht/qt_ht.po
-trans.hu = hu/qt_hu.po
-trans.hy = hy/qt_hy.po
-trans.id = id/qt_id.po
-trans.is = is/qt_is.po
-trans.it = it/qt_it.po
-trans.ja = ja/qt_ja.po
-trans.jv = jv/qt_jv.po
-trans.ka = ka/qt_ka.po
-trans.km = km/qt_km.po
-trans.kn = kn/qt_kn.po
-trans.ko = ko/qt_ko.po
-trans.ku = ku/qt_ku.po
-trans.kw = kw/qt_kw.po
-trans.ky = ky/qt_ky.po
-trans.lb = lb/qt_lb.po
-trans.ln = ln/qt_ln.po
-trans.lo = lo/qt_lo.po
-trans.lt = lt/qt_lt.po
-trans.lv = lv/qt_lv.po
-trans.mg = mg/qt_mg.po
-trans.mi = mi/qt_mi.po
-trans.mk = mk/qt_mk.po
-trans.ml = ml/qt_ml.po
-trans.mn = mn/qt_mn.po
-trans.mr = mr/qt_mr.po
-trans.ms = ms/qt_ms.po
-trans.mt = mt/qt_mt.po
-trans.my = my/qt_my.po
-trans.nah = nah/qt_nah.po
-trans.nap = nap/qt_nap.po
-trans.nb = nb/qt_nb.po
-trans.ne = ne/qt_ne.po
-trans.nl = nl/qt_nl.po
-trans.nn = nn/qt_nn.po
-trans.nso = nso/qt_nso.po
-trans.oc = oc/qt_oc.po
-trans.or = or/qt_or.po
-trans.pa = pa/qt_pa.po
-trans.pap = pap/qt_pap.po
-trans.pl = pl/qt_pl.po
-trans.pms = pms/qt_pms.po
-trans.ps = ps/qt_ps.po
-trans.pt = pt/qt_pt.po
-trans.pt_BR = pt_BR/qt_pt_BR.po
-trans.ro = ro/qt_ro.po
-trans.ru = ru/qt_ru.po
-trans.sco = sco/qt_sco.po
-trans.sk = sk/qt_sk.po
-trans.sl = sl/qt_sl.po
-trans.so = so/qt_so.po
-trans.son = son/qt_son.po
-trans.sq = sq/qt_sq.po
-trans.sr = sr/qt_sr.po
-trans.st = st/qt_st.po
-trans.su = su/qt_su.po
-trans.sv = sv/qt_sv.po
-trans.sw = sw/qt_sw.po
-trans.ta = ta/qt_ta.po
-trans.te = te/qt_te.po
-trans.tg = tg/qt_tg.po
-trans.th = th/qt_th.po
-trans.ti = ti/qt_ti.po
-trans.tk = tk/qt_tk.po
-trans.tr = tr/qt_tr.po
-trans.uk = uk/qt_uk.po
-trans.ur = ur/qt_ur.po
-trans.ve = ve/qt_ve.po
-trans.vi = vi/qt_vi.po
-trans.wa = wa/qt_wa.po
-trans.wo = wo/qt_wo.po
-trans.zh_CN = zh_CN/qt_zh_CN.po
-trans.zh_HK = zh_HK/qt_zh_HK.po
-trans.zh_TW = zh_TW/qt_zh_TW.po
-trans.zu = zu/qt_zu.po
-
-[torproject.vidalia-vidalia-pot]
+[torproject.3-vidalia-alpha-vidalia-pot]
source_file = templates/vidalia.pot
source_lang = en
trans.af = af/vidalia_af.po
@@ -247,3 +122,5 @@ trans.zh_HK = zh_HK/vidalia_zh_HK.po
trans.zh_TW = zh_TW/vidalia_zh_TW.po
trans.zu = zu/vidalia_zu.po
+[main]
+host = https://www.transifex.net
diff --git a/src/vidalia/i18n/po/af/vidalia_af.po b/src/vidalia/i18n/po/af/vidalia_af.po
index f145615..6b31647 100755
--- a/src/vidalia/i18n/po/af/vidalia_af.po
+++ b/src/vidalia/i18n/po/af/vidalia_af.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:11+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/ak/vidalia_ak.po b/src/vidalia/i18n/po/ak/vidalia_ak.po
index 6871db8..020ac5e 100644
--- a/src/vidalia/i18n/po/ak/vidalia_ak.po
+++ b/src/vidalia/i18n/po/ak/vidalia_ak.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:12+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/am/vidalia_am.po b/src/vidalia/i18n/po/am/vidalia_am.po
index 6ff8d44..2f64a87 100644
--- a/src/vidalia/i18n/po/am/vidalia_am.po
+++ b/src/vidalia/i18n/po/am/vidalia_am.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:15+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/ar/vidalia_ar.po b/src/vidalia/i18n/po/ar/vidalia_ar.po
index bce29a0..7c9d2a7 100644
--- a/src/vidalia/i18n/po/ar/vidalia_ar.po
+++ b/src/vidalia/i18n/po/ar/vidalia_ar.po
@@ -3,9 +3,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-13 19:45+0000\n"
-"Last-Translator: OsamaK <osamak at gnu.org>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:26+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -211,11 +211,11 @@ msgstr "اختر اللغة المستخدمة في ڤيداليا"
msgctxt "AppearancePage"
msgid "Style"
-msgstr "السمة"
+msgstr "النمط"
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
-msgstr "اختر سمة واجهة ڤيداليا"
+msgstr "اختر نمط واجهة ڤيداليا"
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
@@ -234,10 +234,6 @@ msgid "Show Settings"
msgstr "أظهر الإعدادات"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "استخدام تور لعرض النطاق"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "أعد الضبط"
@@ -255,7 +251,7 @@ msgstr "دائما في المقدمة"
msgctxt "BandwidthGraph"
msgid "Style"
-msgstr "السمة"
+msgstr "النمط"
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
@@ -277,6 +273,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "ألغِ"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "بدء طلب جسر HTTPS..."
@@ -363,7 +363,7 @@ msgstr "الحالة"
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
-msgstr "إقترب إلى الدائرة"
+msgstr "قرّب إلى الدائرة"
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
@@ -430,19 +430,27 @@ msgid "Control socket is not connected."
msgstr "مقبس التحكم غير متصل."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "كلمة السر مطلوبة"
+msgid "Problem connecting to Tor"
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "تذكر كلمة السر"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"اتصل ڤيداليا بعملية تور جارية تتطلب كلمة سر. يرجى أن تدخل كلمة سر التحكم:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1158,7 +1166,7 @@ msgstr "زيمبابوي"
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr ""
+msgstr "Zaire"
msgctxt "CountryInfo"
msgid "Albania"
@@ -1262,7 +1270,7 @@ msgstr "بلّغ عن الانهيار"
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr ""
+msgstr "واجه فيداليا خطأ ويحتاج إلى الإغلاق"
msgctxt "CrashReportDialog"
msgid ""
@@ -1276,15 +1284,15 @@ msgctxt "CrashReportDialog"
msgid ""
"Please also describe what you were doing before the application crashed "
"(optional):"
-msgstr ""
+msgstr "ويرجى أيضا وصف ما كنت تفعل قبل إنهيار التطبيق (إجتياري):"
msgctxt "CrashReportDialog"
msgid "Send my crash report to the Vidalia developers"
-msgstr ""
+msgstr "إرسال تقريري إنهيار إلى المطورين فيداليا"
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr ""
+msgstr "إعادة تشغيل فيداليا"
msgctxt "CrashReportDialog"
msgid "Don't Restart"
@@ -1292,13 +1300,13 @@ msgstr "لا تعد التشغيل"
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr ""
+msgstr "غير قادر على إعادة تشغيل فيداليا"
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
-msgstr ""
+msgstr "لم نتمكن من إعادة تشغيل فيداليا تلقائيا. الرجاء إعادة تشغيله يدويا."
msgctxt "CrashReportUploader"
msgid "Connecting..."
@@ -1337,10 +1345,6 @@ msgid "Browse"
msgstr "تصفّح"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "ابدأ عمل برمجية تور مع بدء تشغيل ڤيداليا"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "تور"
@@ -1368,6 +1372,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "التمس الآن"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 ك.ب/ثا"
@@ -1654,34 +1662,6 @@ msgid "New Identity"
msgstr "هوية جديدة"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "تور"
@@ -1690,10 +1670,6 @@ msgid "View"
msgstr "اعرض"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "مساعدة ڤيداليا"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "خطأ في إطلاق متصفح الإنترنت"
@@ -1806,10 +1782,6 @@ msgid "Tor is shutting down"
msgstr "جارٍ إغلاق تور"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "أوقف تور الآن"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "أوقف تور"
@@ -1898,18 +1870,6 @@ 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 "يتوفر تحديث لتور"
@@ -1952,85 +1912,11 @@ msgid "Status"
msgstr "الحالة"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "اختصارات ڤيداليا"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "إعداد التحويل"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "أعدّ تحويلة وساعد الشبكة على النمو"
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "اعرض الشبكة"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "شاهد خريطة شبكة تور"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "استخدم هوية جديدة"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "اجعل الاتصالات اللاحقة تبدو كأنها جديدة"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "اعرض مدى استخدام عرض الحزمة مؤخراً"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "اعرض تاريخ سجل الرسائل"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "اعرض وثائق المساعدة"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "اضبط ڤيداليا"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "استعرض معلومات الإصدار والرخصة"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "أغلق ڤيداليا"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "أظهر هذه النافذة عند بدء تشغيل الجهاز"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "أخفِ"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "أخفِ هذه النافذة"
-
-msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "فشل إعادة ضبط كلمة السر"
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-"حاول ڤيداليا إعادة ضبط كلمة سر التحكم بتور ولكنه لم يكن قادراً على إعادة "
-"تشغيل برنامج تور. يرجى التحقق من مدير المهام الخاص بك للتأكد من عدم وجود "
-"عمليات تور أخرى جارية."
-
-msgctxt "MainWindow"
-msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr "النسخة المنصبة حالياً من تور قديمة أو لا يوصى بها بعد الآن."
@@ -2090,16 +1976,32 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "فشل (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
-"جار إيقاف تحويلتك.\n"
-"يرجى النقر على \"إيقاف\" مرة أخرى لتوقف تحويلتك الآن."
msgctxt "MainWindow"
msgid ""
@@ -2122,6 +2024,16 @@ msgstr ""
"يرجى التحقق من سجل الرسائل لتحذيرات أو رسائل خطأ حديثة."
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "فشل (%1)"
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr "، غالباً Telnet، "
@@ -2129,6 +2041,22 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr "، غالباً عميل بريد إلكتروني، "
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+"جار إيقاف تحويلتك.\n"
+"يرجى النقر على \"إيقاف\" مرة أخرى لتوقف تحويلتك الآن."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "عُطل في ضبط المُرشِّح"
@@ -2382,22 +2310,14 @@ msgid "Automatically save new log messages to a file"
msgstr "احفظ رسائل السجِّل الجديدة في ملف تلقائيًا"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "حالة تور"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "متقدم"
-
-msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr "احفظ رسائل السِّجل الجديدة دائما"
msgctxt "MessageLog"
+msgid "toolbar"
+msgstr ""
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2452,10 +2372,6 @@ msgstr ""
"%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "خريطة شبكة تور"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "تحديث"
@@ -2555,6 +2471,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "جسر عاطل"
@@ -2888,10 +2820,6 @@ msgid "Run as a client only"
msgstr "تشغيل كعميل فقط."
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "تمرير تدفقات شبكة تور"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "مدخل التحويلة:"
@@ -3143,6 +3071,14 @@ msgstr ""
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
+msgstr "انشر عنوان الجسر الخاص بي تلقائيا"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
msgctxt "ServerPage"
@@ -3194,10 +3130,6 @@ msgid "Directory already in use by another service."
msgstr "الدليل مستعمل بشكل مسبق في خدمة أخرى"
msgctxt "ServicePage"
-msgid "Form"
-msgstr "استمارة"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "الخدمات الموفرة المخفية"
@@ -3365,7 +3297,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr ""
+msgstr "اسم الوجهة غير صالح"
msgctxt "StatusEventWidget"
msgid ""
@@ -3376,7 +3308,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr ""
+msgstr "تغير عنوان الآيبي الخارجي"
msgctxt "StatusEventWidget"
msgid ""
@@ -3477,7 +3409,7 @@ msgstr ""
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr ""
+msgstr "اتصال مرحل على الإنترنت"
msgctxt "StatusEventWidget"
msgid ""
@@ -3487,6 +3419,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "جديد"
@@ -3523,6 +3471,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "غير معروف"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "تعذَّر إيقاف العملية %1. [%2]"
@@ -3601,6 +3555,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "نجاح"
@@ -3735,11 +3713,11 @@ msgstr "إصدار"
msgctxt "UploadProgressDialog"
msgid "Uploading Crash Report"
-msgstr ""
+msgstr "إرسال تقرير إنهيار"
msgctxt "UploadProgressDialog"
msgid "Unable to send report: %1"
-msgstr ""
+msgstr "لا يمكن ارسال تقرير إنهيار: %1"
msgctxt "VMessageBox"
msgid "OK"
diff --git a/src/vidalia/i18n/po/arn/vidalia_arn.po b/src/vidalia/i18n/po/arn/vidalia_arn.po
index 3e4d9df..5e975be 100644
--- a/src/vidalia/i18n/po/arn/vidalia_arn.po
+++ b/src/vidalia/i18n/po/arn/vidalia_arn.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:16+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/ast/vidalia_ast.po b/src/vidalia/i18n/po/ast/vidalia_ast.po
index a00f312..b93bc21 100644
--- a/src/vidalia/i18n/po/ast/vidalia_ast.po
+++ b/src/vidalia/i18n/po/ast/vidalia_ast.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:50+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/az/vidalia_az.po b/src/vidalia/i18n/po/az/vidalia_az.po
index 84f68c4..f1a9ee6 100644
--- a/src/vidalia/i18n/po/az/vidalia_az.po
+++ b/src/vidalia/i18n/po/az/vidalia_az.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:16+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/bg/vidalia_bg.po b/src/vidalia/i18n/po/bg/vidalia_bg.po
index 956f12f..b2b5120 100644
--- a/src/vidalia/i18n/po/bg/vidalia_bg.po
+++ b/src/vidalia/i18n/po/bg/vidalia_bg.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:00+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr "Покажи опции"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Използван трафик от Тор"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Ресет"
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Отказ"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr "Разлистване"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Тор"
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 КБ/с"
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr "Нова самоличност"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Тор"
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr "Изглед"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Видалиа Помощ"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1886,18 +1859,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1938,82 +1899,11 @@ msgid "Status"
msgstr "Статистика"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -2073,13 +1963,31 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2097,6 +2005,16 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ""
@@ -2104,6 +2022,20 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ""
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Грешка при прилагане на филтър"
@@ -2357,19 +2289,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2412,10 +2336,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Опресни"
@@ -2515,6 +2435,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2840,10 +2776,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Предавай трафик за Тор мрежата"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3088,6 +3020,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3132,10 +3072,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3424,6 +3360,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "Нов"
@@ -3460,6 +3412,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Неизвестно"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Процес %1 не успя да спре. [%2]"
@@ -3538,6 +3496,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po b/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po
index 9be59a1..8e4e29f 100644
--- a/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po
+++ b/src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:16+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/ca/vidalia_ca.po b/src/vidalia/i18n/po/ca/vidalia_ca.po
index f646aae..fd1a754 100755
--- a/src/vidalia/i18n/po/ca/vidalia_ca.po
+++ b/src/vidalia/i18n/po/ca/vidalia_ca.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:10+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:43+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/cs/vidalia_cs.po b/src/vidalia/i18n/po/cs/vidalia_cs.po
index 567fad0..d2a271c 100644
--- a/src/vidalia/i18n/po/cs/vidalia_cs.po
+++ b/src/vidalia/i18n/po/cs/vidalia_cs.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 19:55+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr "Zobrazit Nastavení"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Resetovat"
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Zrušit"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr "Kontrolni socket neni detekovan"
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Heslo je povinné"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr "Prohlizej"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr "Nova identita"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr "Nahled"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Napoveda Vidalia"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr "Tor se vypina"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1886,18 +1859,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1938,82 +1899,11 @@ 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 ""
@@ -2073,13 +1963,31 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2097,6 +2005,16 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ""
@@ -2104,6 +2022,20 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ""
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Chyba Nastaveni Filtru"
@@ -2357,22 +2289,14 @@ msgid "Automatically save new log messages to a file"
msgstr "Automaticky uloz nove oznameni do souboru"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "Vzdy Ukladat Nove Oznameni"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Vzdy Ukladat Nove Oznameni"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2412,10 +2336,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Aktualizace"
@@ -2515,6 +2435,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2840,10 +2776,6 @@ 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 ""
@@ -3094,6 +3026,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3138,10 +3078,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3430,6 +3366,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "Nove"
@@ -3466,6 +3418,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Nezname"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Zastaveni procesu %1 selhalo. [%2]"
@@ -3544,6 +3502,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/csb/vidalia_csb.po b/src/vidalia/i18n/po/csb/vidalia_csb.po
index f4f0f90..0b40a42 100644
--- a/src/vidalia/i18n/po/csb/vidalia_csb.po
+++ b/src/vidalia/i18n/po/csb/vidalia_csb.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:50+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/cy/vidalia_cy.po b/src/vidalia/i18n/po/cy/vidalia_cy.po
index 3b83adc..eecb6cd 100644
--- a/src/vidalia/i18n/po/cy/vidalia_cy.po
+++ b/src/vidalia/i18n/po/cy/vidalia_cy.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:10+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/de/vidalia_de.po b/src/vidalia/i18n/po/de/vidalia_de.po
index 8ff5b27..a50ab61 100644
--- a/src/vidalia/i18n/po/de/vidalia_de.po
+++ b/src/vidalia/i18n/po/de/vidalia_de.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 19:58+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -142,59 +142,65 @@ msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Control"
-msgstr ""
+msgstr "Tor Control"
msgctxt "AdvancedPage"
msgid "Use TCP connection (ControlPort)"
-msgstr ""
+msgstr "Verwende TCP-Verbindung (ControlPort)"
msgctxt "AdvancedPage"
msgid "Path:"
-msgstr ""
+msgstr "Pfad:"
msgctxt "AdvancedPage"
msgid "Use Unix domain socket (ControlSocket)"
-msgstr ""
+msgstr "Verwende Unix-Domain-Socket (ControlSocket)"
msgctxt "AdvancedPage"
msgid "Edit current torrc"
-msgstr ""
+msgstr "Bearbeite aktuellen torrc"
msgctxt "AdvancedPage"
msgid "NOTE: this will edit the currently loaded torrc"
-msgstr ""
+msgstr "Hinweis: Damit bearbeiten Sie den aktuell geladenen torrc"
msgctxt "AdvancedPage"
msgid "ControlSocket path doesn't exist."
-msgstr ""
+msgstr "ControlSocket Pfad existiert nicht."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor configuration file location contains characters that "
"cannot be represented in your system's current 8-bit character encoding."
msgstr ""
+"Der angegebene Speicherort für die Tor-Konfigurationdatei enthält Zeichen, "
+"die in Ihrem System - nämlich zurzeit 8-Bit Zeichencodierung - nicht "
+"dargestellt werden können."
msgctxt "AdvancedPage"
msgid ""
"The specified Tor data directory location contains characters that cannot be"
" represented in your system's current 8-bit character encoding."
msgstr ""
+"Der angegebene Speicherort für die Tor-Konfigurationdatei enthält Zeichen, "
+"die in Ihrem System - nämlich zurzeit 8-Bit Zeichencodierung - nicht "
+"dargestellt werden können."
msgctxt "AdvancedPage"
msgid "Warning"
-msgstr ""
+msgstr "Warnung"
msgctxt "AdvancedPage"
msgid "You changed torrc path, would you like to restart Tor?"
-msgstr ""
+msgstr "Sie haben den torrc-Pfad verändert, wollen Sie Tor neu starten?"
msgctxt "AdvancedPage"
msgid "Tor Configuration File (torrc);;All Files (*)"
-msgstr ""
+msgstr "Tor Konfigurationsdatei (torrc);;Alle Dateien (*)"
msgctxt "AdvancedPage"
msgid "Select a file to use for Tor socket path"
-msgstr ""
+msgstr "Wählen Sie eine Datei für die Verwendung von Tor Socket Pfad"
msgctxt "AdvancedPage"
msgid ""
@@ -239,10 +245,6 @@ msgid "Show Settings"
msgstr "Zeige Einstellungen"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Bandbreitennutzung von Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Zurücksetzen"
@@ -282,6 +284,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Abbrechen"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Starte HTTPS-Anfrage..."
@@ -436,20 +442,27 @@ msgid "Control socket is not connected."
msgstr "Kontrollsocket ist nicht verbunden."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Password wird benötigt"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Mein Passwort speichern"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"Vidalia 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."
@@ -1165,7 +1178,7 @@ msgstr "Simbabwe"
msgctxt "CountryInfo"
msgid "Zaire"
-msgstr ""
+msgstr "Kongo"
msgctxt "CountryInfo"
msgid "Albania"
@@ -1265,11 +1278,11 @@ msgstr "Taiwan"
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
-msgstr ""
+msgstr "Absturzbericht senden"
msgctxt "CrashReportDialog"
msgid "Vidalia encountered an error and needed to close"
-msgstr ""
+msgstr "Vidalia hat einen Fehler entdeckt und muss geschlossen werden."
msgctxt "CrashReportDialog"
msgid ""
@@ -1278,46 +1291,55 @@ msgid ""
"report does not contain any personally identifying information, but your "
"connection to the crash reporting server may not be anonymous."
msgstr ""
+"Ein Fehlerbericht wurde erstellt. Sie können diesen automatisch an die "
+"Vidalia-Entwickler senden und damit zur Identifizierung und zur Lösung des "
+"Problems beitragen. Der Bericht enthält keine persönlichen "
+"Identifizierungsinformationen, nur die Verbindung zum Fehlerreport-Server "
+"könnte nicht anonym sein."
msgctxt "CrashReportDialog"
msgid ""
"Please also describe what you were doing before the application crashed "
"(optional):"
msgstr ""
+"Bitte beschreiben Sie auch was passiert ist, bevor das Programm abgestürzt "
+"ist (optional):"
msgctxt "CrashReportDialog"
msgid "Send my crash report to the Vidalia developers"
-msgstr ""
+msgstr "Sende meinen Fehlerbericht an die Vidalia-Entwickler"
msgctxt "CrashReportDialog"
msgid "Restart Vidalia"
-msgstr ""
+msgstr "Vidalia neu starten"
msgctxt "CrashReportDialog"
msgid "Don't Restart"
-msgstr ""
+msgstr "Nicht neu starten"
msgctxt "CrashReportDialog"
msgid "Unable to restart Vidalia"
-msgstr ""
+msgstr "Vidalia kann nicht neu gestartet werden"
msgctxt "CrashReportDialog"
msgid ""
"We were unable to automatically restart Vidalia. Please restart Vidalia "
"manually."
msgstr ""
+"Leider konnte Vidalia nicht automatisch neu gestartet werden. Bitte starten "
+"Sie Vidalia händisch neu."
msgctxt "CrashReportUploader"
msgid "Connecting..."
-msgstr ""
+msgstr "Verbinde..."
msgctxt "CrashReportUploader"
msgid "Sending crash report..."
-msgstr ""
+msgstr "Sende Fehlerbericht..."
msgctxt "CrashReportUploader"
msgid "Receiving response..."
-msgstr ""
+msgstr "Empfange Antwort..."
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
@@ -1344,10 +1366,6 @@ msgid "Browse"
msgstr "Durchsuchen"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Tor starten, wenn Vidalia startet"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1375,6 +1393,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Jetzt prüfen"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1599,27 +1621,27 @@ msgstr "Unbekannt"
msgctxt "LogTreeItem"
msgid "Debug"
-msgstr ""
+msgstr "Debug"
msgctxt "LogTreeItem"
msgid "Info"
-msgstr ""
+msgstr "Info"
msgctxt "LogTreeItem"
msgid "Notice"
-msgstr ""
+msgstr "Hinweis"
msgctxt "LogTreeItem"
msgid "Warning"
-msgstr ""
+msgstr "Warnung"
msgctxt "LogTreeItem"
msgid "Error"
-msgstr ""
+msgstr "Fehler"
msgctxt "LogTreeItem"
msgid "Unknown"
-msgstr ""
+msgstr "Unbekannt"
msgctxt "MainWindow"
msgid "Start Tor"
@@ -1662,34 +1684,6 @@ msgid "New Identity"
msgstr "Neue Identität"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Strg+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Strg+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Strg+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Strg+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Strg+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Strg+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Strg+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1698,10 +1692,6 @@ msgid "View"
msgstr "Ansicht"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia-Hilfe"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Fehler beim Starten des Webbrowsers"
@@ -1814,10 +1804,6 @@ msgid "Tor is shutting down"
msgstr "Tor wird beendet"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Tor jetzt stoppen"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Tor stoppen"
@@ -1907,21 +1893,6 @@ msgstr ""
"Vidalias Funktionen könnten nicht verfügbar sein."
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Authentifizierungsfehler"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-"Vidalia konnte keine Authentifizierung gegenüber der Tor-Software "
-"durchführen. (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-"Bitte überprüfen Sie die Authentifikationseinstellungen des Kontroll-Ports."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Tor-Update verfügbar"
@@ -1966,85 +1937,11 @@ msgid "Status"
msgstr "Status"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Vidalia Schnellzugriff"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Weiterleitung einrichten"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Richten Sie ein Relay ein und helfen Sie dem Netzwerk zu wachsen."
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Netzwerk betrachten"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Die Tor Netzwerk-Landkarte betrachten"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Eine neue Identität verwenden"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Spätere Verbindungen als neu erscheinen lassen"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Betrachte kürzlich genutzte Bandbreite"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Logbuch betrachten"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Hilfe anzeigen"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Vidalia konfigurieren"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Version und Lizenzinformationen anzeigen"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Vidalia beenden"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Dieses Fenster beim Start anzeigen"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Verstecken"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Dieses Fenster verstecken"
-
-msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Zurücksetzen des Passworts fehlgeschlagen"
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-"Vidalia versuchte das Tor Kontroll-Passwort zurückzusetzen, konnte die Tor "
-"Software aber nicht neu starten. Bitte überprüfen Sie im Task Manager, ob "
-"nicht andere Tor Prozesse laufen."
-
-msgctxt "MainWindow"
-msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -2101,6 +1998,8 @@ msgid ""
"One of your applications%1appears to be making a potentially unencrypted and"
" unsafe connection to port %2."
msgstr ""
+"Eines Ihrer Programme%1a scheint eine potenziell unverschlüsselte und "
+"unsichere Verbindung zu Port %2 herzustellen."
msgctxt "MainWindow"
msgid ""
@@ -2108,18 +2007,37 @@ msgid ""
"application's configuration and use only encrypted protocols, such as SSL, "
"if possible."
msgstr ""
+"Alles, was über diese Verbindung gesendet wird, sollte beobachtet werden. "
+"Bitte überprüfen Sie die Konfiguration Ihres Programmes und verwenden Sie "
+"wenn möglich nur verschlüsselte Protokolle wie SSL. "
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "fehlgeschlagen (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
-"Ihr Relais wird beendet.\n"
-"Klicken Sie erneut auf \"Stop\" um das Relais sofort zu beenden."
msgctxt "MainWindow"
msgid ""
@@ -2142,6 +2060,16 @@ msgstr ""
"Bitte überprüfen Sie das Nachrichtenprotoll auf Fehler und Warnungen."
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "fehlgeschlagen (%1)"
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ", wahrscheinlich Telnet,"
@@ -2149,6 +2077,22 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", wahrscheinlich ein E-Mail-Programm,"
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+"Ihr Relais wird beendet.\n"
+"Klicken Sie erneut auf \"Stop\" um das Relais sofort zu beenden."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Fehler beim Setzen des Filters"
@@ -2404,22 +2348,14 @@ msgid "Automatically save new log messages to a file"
msgstr "Alle neuen Nachrichten automatisch in einer Datei speichern"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "Nachrichten immer speichern"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Nachrichten immer speichern"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2472,10 +2408,6 @@ msgstr ""
"%2"
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor-Netzwerk-Karte"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Aktualisieren"
@@ -2575,6 +2507,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Strg+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Ungültige Brücke"
@@ -2711,31 +2659,31 @@ msgstr ""
msgctxt "NetworkPage"
msgid "Address:"
-msgstr ""
+msgstr "Adresse:"
msgctxt "NetworkPage"
msgid "Type:"
-msgstr ""
+msgstr "Typ:"
msgctxt "NetworkPage"
msgid "You must select the proxy type."
-msgstr ""
+msgstr "Sie müssen den Proxy-Typ auswählen."
msgctxt "NetworkPage"
msgid "SOCKS 4"
-msgstr ""
+msgstr "SOCKS 4"
msgctxt "NetworkPage"
msgid "SOCKS 5"
-msgstr ""
+msgstr "SOCKS 5"
msgctxt "NetworkPage"
msgid "HTTP"
-msgstr ""
+msgstr "HTTP"
msgctxt "NetworkPage"
msgid "HTTP / HTTPS"
-msgstr ""
+msgstr "HTTP / HTTPS"
msgctxt "Policy"
msgid "accept"
@@ -2847,7 +2795,7 @@ msgstr "Zuletzt aktualisiert:"
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Stichwort"
+msgstr "Identifikator"
msgctxt "RouterListItem"
msgid "Offline"
@@ -2918,10 +2866,6 @@ msgid "Run as a client only"
msgstr "Benutze Tor nur als Client"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Verkehr für das Tor-Netzwerk weiterleiten"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Verteiler-Port:"
@@ -3177,14 +3121,22 @@ msgstr ""
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>"
+msgstr "<a href=\"#bridgeUsage\">Wer hat meine Brücke genuzt?</a>"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
-msgstr ""
+msgstr "<a href=\"#bridgeHelp\">Was ist das?</a>"
msgctxt "ServerPage"
msgid "Automatically distribute my bridge address"
+msgstr "Meine Bridge-Adresse automatisch verteilen"
+
+msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
msgstr ""
msgctxt "ServerPage"
@@ -3239,10 +3191,6 @@ msgid "Directory already in use by another service."
msgstr "Das Verzeichnis wird bereits von einem anderen Dienst benutzt."
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Formular"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Versteckte Dienste"
@@ -3289,19 +3237,19 @@ msgstr "Erstellt von Tor"
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
-msgstr ""
+msgstr "In den Zwischenspeicher kopieren"
msgctxt "StatusEventWidget"
msgid "The Tor Software is Running"
-msgstr ""
+msgstr "Tor Software läuft"
msgctxt "StatusEventWidget"
msgid "You are currently running version \"%1\" of the Tor software."
-msgstr ""
+msgstr "Sie verwenden aktuell Version \"%1\" der Tor-Software. "
msgctxt "StatusEventWidget"
msgid "The Tor Software is not Running"
-msgstr ""
+msgstr "Die Tor-Software läuft nicht."
msgctxt "StatusEventWidget"
msgid ""
@@ -3309,6 +3257,9 @@ msgid ""
"software. If Tor exited unexpectedly, select the \"Advanced\" tab above for "
"details about any errors encountered."
msgstr ""
+"Klicken Sie auf \"Tor starten\" in der Vidalia Systemsteuerung um Tor "
+"neuzustarten. Falls Tor unerwartet beendet wurde, klicken Sie auf die "
+"Registerkarte \"Erweitert\" für weitere Einzelheiten zu etwaigen Fehlern."
msgctxt "StatusEventWidget"
msgid ""
@@ -3317,6 +3268,10 @@ msgid ""
"software, which may contain important security, reliability and performance "
"fixes."
msgstr ""
+"Sie verwenden zur Zeit Version \"%1\" der Tor-Software. Diese wird nicht "
+"mehr empfohlen. Bitte aktualisieren Sie auf die aktuellste Version der "
+"Software, da diese wichtige Verbesserungen hinsichtlich Sicherheit, "
+"Stabilität und Performance enthalten kann."
msgctxt "StatusEventWidget"
msgid ""
@@ -3325,30 +3280,39 @@ msgid ""
"version of the software, which may contain important security, reliability "
"and performance fixes."
msgstr ""
+"Sie verwenden zur Zeit Version \"%1\" der Tor-Software, diese funktioniert "
+"evt. nicht mehr mit dem aktuellen Tor-Netzwerk. Bitte aktualisieren Sie auf "
+"die aktuellste Version der Software, da diese wichtige Verbesserungen "
+"hinsichtlich Sicherheit, Stabilität und Performance enthalten kann."
msgctxt "StatusEventWidget"
msgid "Your Tor Software is Out-of-date"
-msgstr ""
+msgstr "Ihre Tor-Software ist veraltet"
msgctxt "StatusEventWidget"
msgid "Connected to the Tor Network"
-msgstr ""
+msgstr "Verbinde mit dem Tor-Netzwerk"
msgctxt "StatusEventWidget"
msgid ""
"We were able to successfully establish a connection to the Tor network. You "
"can now configure your applications to use the Internet anonymously."
msgstr ""
+"Es wurde eine Verbindung zum Tor-Netzwerk erfolgreich hergestellt. Sie "
+"können jetzt Ihre Programme konfigurieren um das Internet anonym zu nützen."
msgctxt "StatusEventWidget"
msgid "Tor Software Error"
-msgstr ""
+msgstr "Tor-Software Fehler"
msgctxt "StatusEventWidget"
msgid ""
"The Tor software encountered an internal bug. Please report the following "
"error message to the Tor developers at bugs.torproject.org: \"%1\""
msgstr ""
+"Die Tor-Software hat einen internen Fehler entdeckt. Bitte informieren Sie "
+"die Tor-Entwickler über die folgendene Fehlermeldung via "
+"bugs.torproject.org: \"%1\""
msgctxt "StatusEventWidget"
msgid ""
@@ -3357,6 +3321,10 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
+"Tor hat festgestellt, dass Ihre Computer-Uhrzeit wahrscheinlich %1 Sekunden "
+"zurückgeht verglichen mit der Quelle \"%2\" . Wenn Ihre Uhr nicht richtig "
+"eingestellt ist, funktioniert Tor nicht. Bitte stellen Sie sicher, dass Ihr "
+"Computer die richtige Zeit verwendet. "
msgctxt "StatusEventWidget"
msgid ""
@@ -3365,10 +3333,14 @@ msgid ""
"will not be able to function. Please verify your computer displays the "
"correct time."
msgstr ""
+"Tor hat festgestellt, dass Ihre Computer-Uhrzeit wahrscheinlich %1 Sekunden "
+"vorgeht verglichen mit der Quelle \"%2\" . Wenn Ihre Uhr nicht richtig "
+"eingestellt ist, funktioniert Tor nicht. Bitte stellen Sie sicher, dass Ihr "
+"Computer die richtige Zeit verwendet. "
msgctxt "StatusEventWidget"
msgid "Your Computer's Clock is Potentially Incorrect"
-msgstr ""
+msgstr "Ihre Computer-Uhrzeit ist möglicherweise falsch"
msgctxt "StatusEventWidget"
msgid ""
@@ -3377,6 +3349,10 @@ msgid ""
"information over the Tor network is dangerous and not recommended. For your "
"protection, Tor has automatically closed this connection."
msgstr ""
+"One of the applications on your computer may have attempted to make an "
+"unencrypted connection through Tor to port %1. Sending unencrypted "
+"information over the Tor network is dangerous and not recommended. For your "
+"protection, Tor has automatically closed this connection."
msgctxt "StatusEventWidget"
msgid ""
@@ -3384,10 +3360,13 @@ msgid ""
"unencrypted connection through Tor to port %1. Sending unencrypted "
"information over the Tor network is dangerous and not recommended."
msgstr ""
+"Eines Ihrer Programme auf Ihrem Computer hat wahrscheinlich versucht eine "
+"unverschlüsselte Verbindung durch Tor zu Port %1 herzustellen. Das Senden "
+"von unverschlüsselten Informationen ist gefährlich und nicht empfehlenswert."
msgctxt "StatusEventWidget"
msgid "Potentially Dangerous Connection!"
-msgstr ""
+msgstr "Potenziell gefährliche Verbindung!"
msgctxt "StatusEventWidget"
msgid ""
@@ -3396,10 +3375,14 @@ msgid ""
"ensure you configure your applications to use only SOCKS4a or SOCKS5 with "
"remote hostname resolution."
msgstr ""
+"Eines Ihrer Programme hat eine Verbindung durch Tor zu \"%1\" hergestellt. "
+"Es verwendet ein Protokoll, welches Informationen über Ihr Ziel preisgeben "
+"könnte. Bitte stellen Sie sicher Ihre Programme so zu konfiguriren, dass "
+"diese nur SOCKS4a oder SOCKS5 mit \"Remote\" Hostnamen-Auflösung verwenden."
msgctxt "StatusEventWidget"
msgid "Unknown SOCKS Protocol"
-msgstr ""
+msgstr "Unbekanntes SOCKS-Protokoll"
msgctxt "StatusEventWidget"
msgid ""
@@ -3407,10 +3390,14 @@ msgid ""
" protocol that Tor does not understand. Please ensure you configure your "
"applications to use only SOCKS4a or SOCKS5 with remote hostname resolution."
msgstr ""
+"Eines Ihrer Programme hat versucht mit einem für Tor unbekannten Protokoll "
+"eine Verbindung durch Tor herzustellen. Bitte stellen Sie sicher Ihre "
+"Programme so zu konfiguriren, dass diese nur SOCKS4a oder SOCKS5 mit "
+"\"Remote\" Hostnamen-Auflösung verwenden."
msgctxt "StatusEventWidget"
msgid "Invalid Destination Hostname"
-msgstr ""
+msgstr "Ungültiger Ziel-Hostname"
msgctxt "StatusEventWidget"
msgid ""
@@ -3418,10 +3405,13 @@ msgid ""
"\"%1\", which Tor does not recognize as a valid hostname. Please check your "
"application's configuration."
msgstr ""
+"Eines Ihrer Programme hat versucht eine Verbindung durch Tor zu %1 "
+"herzustellen, was Tor nicht als gültigen Hostnamen erkannt hat. Bitte "
+"überprüfen Sie die Konfiguration Ihres Programms."
msgctxt "StatusEventWidget"
msgid "External IP Address Changed"
-msgstr ""
+msgstr "Externe IP Adresse hat sich geändert"
msgctxt "StatusEventWidget"
msgid ""
@@ -3429,10 +3419,13 @@ msgid ""
" is not correct, please consider setting the 'Address' option in your "
"relay's configuration."
msgstr ""
+"Tor hat festgestellt, dass die öffentliche IP Adresse Ihres Relays momentan "
+"%1%2 ist. Falls dies nicht korrekt ist, erwägen Sie die \"Adress\"-Option in"
+" Ihrer Relay-Konfiguration zu setzten."
msgctxt "StatusEventWidget"
msgid "DNS Hijacking Detected"
-msgstr ""
+msgstr "DNS Hijacking festgestellt"
msgctxt "StatusEventWidget"
msgid ""
@@ -3440,6 +3433,10 @@ msgid ""
" that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are "
"known to do this in order to display their own search or advertising pages."
msgstr ""
+"Tor hat entdeckt, dass Ihr DNS-Provider falsche Antworten für nicht "
+"existierende Domains liefert. Einige ISPs und DNS-Provider, wie z.B. "
+"OpenDNS, sind dafür bekannt dies zu tun um ihre eigenen Such- oder Werbe- "
+"seiten anzuzeigen."
msgctxt "StatusEventWidget"
msgid ""
@@ -3447,10 +3444,13 @@ msgid ""
"known domains. Since clients rely on Tor network relays to provide accurate "
"DNS repsonses, your relay will not be configured as an exit relay."
msgstr ""
+"Tor hat entdeckt, dass Ihr DNS-Provider falsche Antworten für wohlbekannte "
+"Domains liefert. Da Tor auf akkurate DNS Antworten angewiesen ist, wird Ihr "
+"Relay nicht als Exit verwendet."
msgctxt "StatusEventWidget"
msgid "Checking Server Port Reachability"
-msgstr ""
+msgstr "Prüfe Server Port Erreichbarkeit"
msgctxt "StatusEventWidget"
msgid ""
@@ -3458,18 +3458,21 @@ msgid ""
" Tor network by connecting to itself at %1:%2. This test could take several "
"minutes."
msgstr ""
+"Tor versucht festzustellen, ob Ihr Relay-Server Port durch das Tor-Netzwerk "
+"erreichbar ist, indem es sich selbst mit %1:%2 verbindet. Dies könnte einige"
+" Minuten dauern."
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Successful!"
-msgstr ""
+msgstr "Server Port Erreichbarkeitstest erfolgreich!"
msgctxt "StatusEventWidget"
msgid "Your relay's server port is reachable from the Tor network!"
-msgstr ""
+msgstr "Ihr Relay-Server Port ist aus dem Tor-Netzwerk erreichbar!"
msgctxt "StatusEventWidget"
msgid "Server Port Reachability Test Failed"
-msgstr ""
+msgstr "Server Port Erreichbarkeitstest fehlgeschlagen"
msgctxt "StatusEventWidget"
msgid ""
@@ -3478,10 +3481,15 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and server port, "
"please check your relay's configuration."
msgstr ""
+"Ihr Relay-Server Port ist für andere Tor-Clients nicht erreichbar. Dies kann"
+" passieren, wenn Sie hinter einem Router und/oder einer Firewall sind. Dies "
+"erfordert \"Port-Forwarding\" in der Konfiguration Ihres Routers bzw. Ihrer "
+"Firewall. Falls %1:%2 nicht Ihre korrekte IP-Adresse und Ihr Server Port "
+"sind, überprüfen Sie bitte die Konfiguration Ihres Relays"
msgctxt "StatusEventWidget"
msgid "Checking Directory Port Reachability"
-msgstr ""
+msgstr "Prüfe Verzeichnis Port Erreichbarkeit"
msgctxt "StatusEventWidget"
msgid ""
@@ -3489,18 +3497,21 @@ msgid ""
"the Tor network by connecting to itself at %1:%2. This test could take "
"several minutes."
msgstr ""
+"Tor versucht festzustellen, ob Ihr Relay-Verzeichnis Port durch das Tor-"
+"Netzwerk erreichbar ist, indem es sich selbst mit %1:%2 verbindet. Dies "
+"könnte einige Minuten dauern."
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Successful!"
-msgstr ""
+msgstr "Verzeichnis Port Erreichbarkeitstest erfolgreich!"
msgctxt "StatusEventWidget"
msgid "Your relay's directory port is reachable from the Tor network!"
-msgstr ""
+msgstr "Ihr Relay-Verzeichnis Port ist aus dem Tor-Netzwerk erreichbar!"
msgctxt "StatusEventWidget"
msgid "Directory Port Reachability Test Failed"
-msgstr ""
+msgstr "Verzeichnis Port Erreichbarkeitstest fehlgeschlagen"
msgctxt "StatusEventWidget"
msgid ""
@@ -3509,20 +3520,27 @@ msgid ""
"port forwarding. If %1:%2 is not your correct IP address and directory port,"
" please check your relay's configuration."
msgstr ""
+"Ihr Relay-Verzeichnis Port ist für andere Tor-Clients nicht erreichbar. Dies"
+" kann passieren, wenn Sie hinter einem Router und/oder einer Firewall sind. "
+"Dies erfordert \"Port-Forwarding\" in der Konfiguration Ihres Routers bzw. "
+"Ihrer Firewall. Falls %1:%2 nicht Ihre korrekte IP-Adresse und Ihr "
+"Verzeichnis Port sind, überprüfen Sie bitte die Konfiguration Ihres Relays"
msgctxt "StatusEventWidget"
msgid "Relay Descriptor Rejected"
-msgstr ""
+msgstr "Relay Identifikator abgewiesen."
msgctxt "StatusEventWidget"
msgid ""
"Your relay's descriptor, which enables clients to connect to your relay, was"
" rejected by the directory server at %1:%2. The reason given was: %3"
msgstr ""
+"Ihr Relay Identifikator, der Clients ermöglicht sich zu Ihrem Relay zu "
+"verbinden, wurde vom Verzeichnis-Server %1:%2 abgewiesen. Der Grund war: %3"
msgctxt "StatusEventWidget"
msgid "Your Relay is Online"
-msgstr ""
+msgstr "Ihr Relay ist Online"
msgctxt "StatusEventWidget"
msgid ""
@@ -3531,6 +3549,26 @@ msgid ""
" hours as more clients learn about your relay. Thank you for contributing to"
" the Tor network!"
msgstr ""
+"Ihr Relay ist nun Online und kann von Tor-Clients verwendet werden. Sie "
+"sollten innerhalb weniger Stunden, während mehr Clients Ihr Relay "
+"\"kennenlernen\", im Bandbreitengraph steigenden Netzwerkverkehr sehen. "
+"Vielen Dank für Ihre Unterstützung des Tor-Netzwerks!"
+
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
msgctxt "Stream"
msgid "New"
@@ -3568,6 +3606,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Unbekannt"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Prozess %1 wurde nicht gestoppt. [%2]"
@@ -3586,64 +3630,92 @@ msgstr "Berechnung des Kontrollpasswortes fehlgeschlagen."
msgctxt "TorrcDialog"
msgid "Editing torrc"
-msgstr ""
+msgstr "torrc bearbeiten"
msgctxt "TorrcDialog"
msgid ""
"Save settings. If unchecked it will only apply settings to the current Tor "
"instance."
msgstr ""
+"Einstellungen speichern. Falls nicht ausgewählt werden die Einstellungen nur"
+" auf die aktuelle Tor-Instanz angewandt."
msgctxt "TorrcDialog"
msgid "Cut"
-msgstr ""
+msgstr "Ausschneiden"
msgctxt "TorrcDialog"
msgid "Copy"
-msgstr ""
+msgstr "Kopieren"
msgctxt "TorrcDialog"
msgid "Paste"
-msgstr ""
+msgstr "Einfügen"
msgctxt "TorrcDialog"
msgid "Undo"
-msgstr ""
+msgstr "Zurück"
msgctxt "TorrcDialog"
msgid "Redo"
-msgstr ""
+msgstr "Vor"
msgctxt "TorrcDialog"
msgid "Select All"
-msgstr ""
+msgstr "Alles auswählen"
msgctxt "TorrcDialog"
msgid "Apply all"
-msgstr ""
+msgstr "Alles anwenden"
msgctxt "TorrcDialog"
msgid "Apply selection only"
-msgstr ""
+msgstr "Nur Ausgewähltes anwenden"
msgctxt "TorrcDialog"
msgid "Error connecting to Tor"
-msgstr ""
+msgstr "Fehler beim Verbinden zu Tor"
msgctxt "TorrcDialog"
msgid "Selection is empty. Please select some text, or check \"Apply all\""
msgstr ""
+"Auswahl ist leer. Bitte wählen Sie einen Text aus oder verwenden Sie \"Alles"
+" anwenden\""
msgctxt "TorrcDialog"
msgid "Error at line %1: \"%2\""
-msgstr ""
+msgstr "Fehler in Zeile %1: \"%2\""
msgctxt "TorrcDialog"
msgid "Error"
-msgstr ""
+msgstr "Fehler"
msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
+msgstr "Beim Öffnen der torrc Datei ist ein Fehler aufgetreten"
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
msgstr ""
msgctxt "UPNPControl"
@@ -3782,11 +3854,11 @@ msgstr "Version"
msgctxt "UploadProgressDialog"
msgid "Uploading Crash Report"
-msgstr ""
+msgstr "Lade Absturzmeldung hoch"
msgctxt "UploadProgressDialog"
msgid "Unable to send report: %1"
-msgstr ""
+msgstr "Kann Report nicht senden: %1"
msgctxt "VMessageBox"
msgid "OK"
diff --git a/src/vidalia/i18n/po/de_CH/vidalia_de_CH.po b/src/vidalia/i18n/po/de_CH/vidalia_de_CH.po
index d81ca14..24c54be 100755
--- a/src/vidalia/i18n/po/de_CH/vidalia_de_CH.po
+++ b/src/vidalia/i18n/po/de_CH/vidalia_de_CH.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:10+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/dz/vidalia_dz.po b/src/vidalia/i18n/po/dz/vidalia_dz.po
index f6f8109..3cefc2a 100644
--- a/src/vidalia/i18n/po/dz/vidalia_dz.po
+++ b/src/vidalia/i18n/po/dz/vidalia_dz.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:13+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/el/vidalia_el.po b/src/vidalia/i18n/po/el/vidalia_el.po
index ea665c6..9ff85b3 100755
--- a/src/vidalia/i18n/po/el/vidalia_el.po
+++ b/src/vidalia/i18n/po/el/vidalia_el.po
@@ -3,9 +3,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-15 00:05+0000\n"
-"Last-Translator: Evropi <yannanth at gmail.com>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:00+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -234,10 +234,6 @@ msgid "Show Settings"
msgstr "Εμφάνιση ρυθμίσεων"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Χρήση Ευρούς Ζώνης Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Μηδενισμός"
@@ -277,6 +273,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Άκυρο"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -430,17 +430,26 @@ msgid "Control socket is not connected."
msgstr "Η υποδοχή ελέγχου δεν είναι συνδεδεμένη."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Απαιτείται κωδικός"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Απομνημόνευση Κωδικού"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1338,10 +1347,6 @@ msgid "Browse"
msgstr "Περιήγηση"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Εκκίνηση του λογισμικού Tor όταν εκκινεί το Vidalia"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1370,6 +1375,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Έλεγχος Τώρα"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1658,34 +1667,6 @@ msgid "New Identity"
msgstr "Νέα Ταυτότητα"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1694,10 +1675,6 @@ msgid "View"
msgstr "Εμφάνιση"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Βοήθεια για το Vidalia"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Σφάλμα κατά την εκκίνηση του περιηγητή ιστού"
@@ -1813,10 +1790,6 @@ msgid "Tor is shutting down"
msgstr "Το Tor τερματίζει"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Διακοπή του Tor Τώρα"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Διακοπή Tor"
@@ -1905,18 +1878,6 @@ msgstr ""
"του Vidalia ίσως δεν είναι διαθέσιμες."
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Σφάλμα Επαλήθευσης"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Το Vidalia δεν μπόρεσε να εξακριβώσει το λογισμικό Tor . (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr "Ελέγξτε τις ρυθμίσεις ελέγχου της θύρα εξακρίβωσης."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Υπάρχει διαθέσιμη ενημέρωση για το Tor"
@@ -1961,86 +1922,11 @@ msgid "Status"
msgstr "Κατάσταση"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Συντομεύσεις πληκτρολογίου για το Vidalia"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Εγκατάσταση/Ρύθμιση Ενδιάμεσου"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Ρυθμίστε έναν ενδιάμεσο και βοηθήστε στην ανάπτυξη του δικτύου."
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Εμφάνιση του Δικτύου"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Εμφάνιση ενός χάρτη του δικτύου Tor"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Χρήση Νέας Ταυτότητας"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Οι επόμενες συνδέσεις να εμφανίζονται νέες"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Εμφάνιση πρόσφατης χρήσης του εύρους ζώνης"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Εμφάνιση του ιστορικού καταγραφών μηνυμάτων"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Εμφάνιση βοηθητικής τεκμηρίωσης"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Ρύθμιση του Vidalia"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Εμφάνιση της έκδοσης και αδειοδοτικών πληροφοριών"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Έξοδος του Vidalia"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Εμφάνιση αυτού του παραθύρου κατά την εκκίνηση"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Απόκρυψη"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Απόκρυψη αυτού του παραθύρου"
-
-msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Ο μηδενισμός του κωδικού απέτυχε"
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-"Το Vidalia προσπάθησε να επαναφέρει τον αρχικό κωδικό για τις ρυθμίσεις του "
-"Tor, αλλά δεν μπόρεσε να επανεκκινήσει το Tor. Παρακαλούμε ελέγξτε στη "
-"διαχείριση εργασιών του συστήματος ότι δεν εκτελείται κάποια άλλη υπηρεσία "
-"του Tor."
-
-msgctxt "MainWindow"
-msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -2100,13 +1986,31 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2124,6 +2028,16 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ""
@@ -2131,6 +2045,20 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ""
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Φίλτρο Ρύθμισης Λαθών"
@@ -2395,22 +2323,14 @@ msgid "Automatically save new log messages to a file"
msgstr "Αυτόματη αποθήκευση νέων μηνυμάτων καταγραφής σε αρχείο"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "Πάντα να αποθηκεύεις τα νέα αρχεία καταγραφής μηνυμάτων"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Πάντα να αποθηκεύεις τα νέα αρχεία καταγραφής μηνυμάτων"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2450,10 +2370,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Χάρτης δικτύου Tor"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Ανανέωση"
@@ -2553,6 +2469,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Μη έγκυρη γέφυρα"
@@ -2899,10 +2831,6 @@ msgid "Run as a client only"
msgstr "Εκτέλεση μόνο σαν πελάτης"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Αναμετάδωσε κίνηση για το δίκτυο του Tor"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Θύρα σταθμού:"
@@ -3165,6 +3093,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3217,10 +3153,6 @@ msgid "Directory already in use by another service."
msgstr "Ο φάκελος χρησιμοποιήτε ήδη από άλλη υπηρεσία."
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Φόρμα"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Παρεχόμενες κρυφές υπηρεσίες"
@@ -3513,6 +3445,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "Νέο"
@@ -3549,6 +3497,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Άγνωστο"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Η διεργασία %1 απέτυχε να σταματήσει. [%2]"
@@ -3627,6 +3581,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "Επιτυχία"
diff --git a/src/vidalia/i18n/po/eo/vidalia_eo.po b/src/vidalia/i18n/po/eo/vidalia_eo.po
index ba2118c..46c3c0a 100644
--- a/src/vidalia/i18n/po/eo/vidalia_eo.po
+++ b/src/vidalia/i18n/po/eo/vidalia_eo.po
@@ -3,9 +3,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-17 21:55+0000\n"
-"Last-Translator: identity <eeemsi at googlemail.com>\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:00+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -234,10 +234,6 @@ msgid "Show Settings"
msgstr "Montri agordojn "
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor-bendlarĝuzado"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Rekomencigo"
@@ -277,6 +273,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Rezigni"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Lanĉante HTTPS-pontopeto..."
@@ -430,20 +430,27 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Pasvorto nepras"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Memori mian pasvorton"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"Vidalia konektis al Tor-proceso kiu bezonas pasvorton.\n"
-"Bonvolu entajpi vian stirpasvorton:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1338,10 +1345,6 @@ msgid "Browse"
msgstr "Foliumi"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Komenci la Tor-programaro kiam Vidalia komencas"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1369,6 +1372,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Kontroli Nun"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1656,34 +1663,6 @@ msgid "New Identity"
msgstr "Nova idento"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ktrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ktrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ktrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ktrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ktrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ktrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ktrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1692,10 +1671,6 @@ msgid "View"
msgstr "Rigardi"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia Helpo"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Eraro lanĉante foliumilon"
@@ -1808,10 +1783,6 @@ msgid "Tor is shutting down"
msgstr "Tor ĉesantas"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Haltigi Tor-n nun"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Haltigi Tor-n"
@@ -1900,18 +1871,6 @@ msgstr ""
"povas esti neuzeblaj."
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Aŭtentigeraro"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Tor-ĝisdatigo disponebla"
@@ -1952,82 +1911,11 @@ msgid "Status"
msgstr "Stato"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Vidalia fulmbildetoj"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Agordu relajsadon"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Rigardi la reton"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Rigardi mapon de la Tor-reto"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Uzi novan identon"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Rigardi lastatempan bendlarĝuzadon"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Rigardi protokolmesaĝhistorion"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Rigardi helpdokumentadon"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Agordi Vidalia-n"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Rigardi versian kaj permesilan informon"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Forlasi Vidalia-n"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Montri ĉi tiun fenestron dum komencado"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Kaŝi"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Kaŝi ĉi tiun fenestron"
-
-msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Pasvortreagordo fiaskis"
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -2087,13 +1975,31 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "fiaskis (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2111,6 +2017,16 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "fiaskis (%1)"
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ", eble Telnet,"
@@ -2118,6 +2034,20 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", eble retpoŝtkliento,"
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Eraro dum filtrilagordado"
@@ -2371,19 +2301,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2426,10 +2348,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2529,6 +2447,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2854,10 +2788,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3102,6 +3032,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3146,10 +3084,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3438,6 +3372,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3474,6 +3424,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3552,6 +3508,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/es/vidalia_es.po b/src/vidalia/i18n/po/es/vidalia_es.po
index 40f55f7..ee4f797 100644
--- a/src/vidalia/i18n/po/es/vidalia_es.po
+++ b/src/vidalia/i18n/po/es/vidalia_es.po
@@ -3,10 +3,10 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:39+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Spanish (Castilian) <None>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -236,10 +236,6 @@ msgid "Show Settings"
msgstr "Mostrar Preferencias"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Uso del Ancho de Banda de Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Reiniciar"
@@ -279,6 +275,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Cancelar"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Iniciando la solicitud de puente HTTPS."
@@ -432,20 +432,27 @@ msgid "Control socket is not connected."
msgstr "Conector de Control no está conectado."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Contraseña requerida"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Recordar mi contraseña"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"Vidalia 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."
@@ -1341,10 +1348,6 @@ msgid "Browse"
msgstr "Examinar"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Iniciar Tor cuando se inicie Vidalia"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1372,6 +1375,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Revisar ahora"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1659,34 +1666,6 @@ msgid "New Identity"
msgstr "Nueva Identidad"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1695,10 +1674,6 @@ msgid "View"
msgstr "Ver"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Ayuda de Vidalia"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Error al iniciar navegador web"
@@ -1811,10 +1786,6 @@ msgid "Tor is shutting down"
msgstr "Tor se esta apagando"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Detener Tor ahora"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Detener Tor"
@@ -1905,20 +1876,6 @@ msgstr ""
"Vidalia pueden no estar disponibles."
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Error de Autentificación"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia no pudo autentificarse ante Tor. (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-"Por favor, verifique la configuración de autentificación de su puerto de "
-"control."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Actualización de Tor Disponible"
@@ -1964,85 +1921,11 @@ 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 ""
@@ -2109,16 +1992,32 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "falló (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
-"Su repetidor se está deteniendo.\n"
-"Haga clic de nuevo en “Detener” para detener ahora su repetidor."
msgctxt "MainWindow"
msgid ""
@@ -2138,6 +2037,16 @@ msgid ""
msgstr "Vidalia detectó que el software de Tor terminó de manera inesperada."
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "falló (%1)"
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr "probablemente Telnet,"
@@ -2145,6 +2054,22 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", probablemente un cliente de correo electrónico,"
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+"Su repetidor se está deteniendo.\n"
+"Haga clic de nuevo en “Detener” para detener ahora su repetidor."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Error configurando filtro"
@@ -2402,22 +2327,14 @@ msgid "Automatically save new log messages to a file"
msgstr "Guardar automáticamente a un archivo los nuevos mensajes del registro"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "Guardar siempre nuevos mensajes del registro"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Guardar siempre nuevos mensajes del registro"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2471,10 +2388,6 @@ msgstr ""
"%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mapa de Red de Tor"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Actualizar"
@@ -2574,6 +2487,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Puente no válido"
@@ -2914,10 +2843,6 @@ msgid "Run as a client only"
msgstr "Ejecutar como sólo cliente"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Repetidor de tráfico para la red Tor"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Puerto repetidor:"
@@ -3168,7 +3093,7 @@ 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>"
+msgstr "<a href=\"#bridgeUsage\">¿Quién ha utilizado mi puente?</a>"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
@@ -3179,6 +3104,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Replicar el Directorio repetidor"
@@ -3227,10 +3160,6 @@ msgid "Directory already in use by another service."
msgstr "Directorio ya en uso por otro servicio."
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Formulario"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Provistos Servicios Ocultos"
@@ -3520,6 +3449,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "Nuevo"
@@ -3556,6 +3501,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Desconocido"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Proceso %1 no pudo detener [%2]"
@@ -3634,6 +3585,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "Éxito"
diff --git a/src/vidalia/i18n/po/et/vidalia_et.po b/src/vidalia/i18n/po/et/vidalia_et.po
index b668111..baa2cee 100644
--- a/src/vidalia/i18n/po/et/vidalia_et.po
+++ b/src/vidalia/i18n/po/et/vidalia_et.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:16+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/eu/vidalia_eu.po b/src/vidalia/i18n/po/eu/vidalia_eu.po
index 29941ff..ea01fd2 100755
--- a/src/vidalia/i18n/po/eu/vidalia_eu.po
+++ b/src/vidalia/i18n/po/eu/vidalia_eu.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:16+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/fil/vidalia_fil.po b/src/vidalia/i18n/po/fil/vidalia_fil.po
index ea2e870..86a1aec 100644
--- a/src/vidalia/i18n/po/fil/vidalia_fil.po
+++ b/src/vidalia/i18n/po/fil/vidalia_fil.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:15+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/fur/vidalia_fur.po b/src/vidalia/i18n/po/fur/vidalia_fur.po
index fa0ff3c..d98c195 100755
--- a/src/vidalia/i18n/po/fur/vidalia_fur.po
+++ b/src/vidalia/i18n/po/fur/vidalia_fur.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:14+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/ga/vidalia_ga.po b/src/vidalia/i18n/po/ga/vidalia_ga.po
index 62e3d43..fa661c9 100644
--- a/src/vidalia/i18n/po/ga/vidalia_ga.po
+++ b/src/vidalia/i18n/po/ga/vidalia_ga.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:10+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/gl/vidalia_gl.po b/src/vidalia/i18n/po/gl/vidalia_gl.po
index 7add124..8da7090 100755
--- a/src/vidalia/i18n/po/gl/vidalia_gl.po
+++ b/src/vidalia/i18n/po/gl/vidalia_gl.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:10+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/gu/vidalia_gu.po b/src/vidalia/i18n/po/gu/vidalia_gu.po
index 4456d6f..2881e08 100755
--- a/src/vidalia/i18n/po/gu/vidalia_gu.po
+++ b/src/vidalia/i18n/po/gu/vidalia_gu.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 19:55+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/gun/vidalia_gun.po b/src/vidalia/i18n/po/gun/vidalia_gun.po
index 706e1e2..0cdc1ea 100644
--- a/src/vidalia/i18n/po/gun/vidalia_gun.po
+++ b/src/vidalia/i18n/po/gun/vidalia_gun.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:14+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/ha/vidalia_ha.po b/src/vidalia/i18n/po/ha/vidalia_ha.po
index b5a278c..de68c96 100644
--- a/src/vidalia/i18n/po/ha/vidalia_ha.po
+++ b/src/vidalia/i18n/po/ha/vidalia_ha.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:13+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/he/vidalia_he.po b/src/vidalia/i18n/po/he/vidalia_he.po
index b242a74..b3bdd80 100644
--- a/src/vidalia/i18n/po/he/vidalia_he.po
+++ b/src/vidalia/i18n/po/he/vidalia_he.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 19:58+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr "הצג הגדרות"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "שימוש רוחב-פס של Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "אתחל"
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "ביטול"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr "סוקט שליטה לא מחובר."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr "חפש"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr "זהות חדשה"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+F"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+F"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr "תצוגה"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "עזרה אודות Vidalia"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "שגיעה בעת פתיחת דפדפן"
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr "Tor בתהליך עצירה"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1886,18 +1859,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr "אנא בדוק את הגדרות אימות פורט השליטה שלך."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "עידכון Tor זמין"
@@ -1940,82 +1901,11 @@ 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 ""
@@ -2077,13 +1967,31 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2101,6 +2009,16 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ""
@@ -2108,6 +2026,20 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ""
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "שגעיה בעת קביעת סינון"
@@ -2361,22 +2293,14 @@ msgid "Automatically save new log messages to a file"
msgstr "שמוראוטומטית הודעות חדשות לקובץ"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "שמור תמיד הודעות יומן חדשות"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "שמור תמיד הודעות יומן חדשות"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2416,10 +2340,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "מפת רשת Tor"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "עדכן"
@@ -2519,6 +2439,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "גשר לא תקין"
@@ -2847,10 +2783,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "העבר מידע עבור רשת Tor"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "פורט מימסר:"
@@ -3101,6 +3033,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3145,10 +3085,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3437,6 +3373,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "חדש"
@@ -3473,6 +3425,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "לא ידוע"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "תהליך %1 לא הצליח לעצור. (%2)"
@@ -3551,6 +3509,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/hi/vidalia_hi.po b/src/vidalia/i18n/po/hi/vidalia_hi.po
index 12e679d..d3f0a3a 100644
--- a/src/vidalia/i18n/po/hi/vidalia_hi.po
+++ b/src/vidalia/i18n/po/hi/vidalia_hi.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 19:58+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr "अनुकुलन दिखाओ"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "टोर बैंडविड्थ का उपयोग "
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "पुनःस्थाप"
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "रद्द "
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr "स्थिति"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Would you like to check if a newer package is available for installation?"
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "नया"
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "अज्ञात"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/hr/vidalia_hr.po b/src/vidalia/i18n/po/hr/vidalia_hr.po
index c95bad4..7fb3b9f 100755
--- a/src/vidalia/i18n/po/hr/vidalia_hr.po
+++ b/src/vidalia/i18n/po/hr/vidalia_hr.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:13+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/ht/vidalia_ht.po b/src/vidalia/i18n/po/ht/vidalia_ht.po
index 6d5436f..d42081d 100644
--- a/src/vidalia/i18n/po/ht/vidalia_ht.po
+++ b/src/vidalia/i18n/po/ht/vidalia_ht.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:13+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/hu/vidalia_hu.po b/src/vidalia/i18n/po/hu/vidalia_hu.po
index 5958536..8755a6c 100644
--- a/src/vidalia/i18n/po/hu/vidalia_hu.po
+++ b/src/vidalia/i18n/po/hu/vidalia_hu.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 19:58+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ 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"
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Mégse"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr "A Vezérlõ socket nem kapcsolódott."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Jelszó szükséges"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Emlékezzen a jelszavamra"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr "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"
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1654,34 +1663,6 @@ msgid "New Identity"
msgstr "Új identitás"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "CTRL+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "CTRL+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "TOR"
@@ -1690,10 +1671,6 @@ msgid "View"
msgstr "Nézet"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia súgó"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Hiba a böngészõ indításakor"
@@ -1806,10 +1783,6 @@ msgid "Tor is shutting down"
msgstr "TOR lekapcsolása folyamatban..."
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "TOR azonnali leállítása"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "TOR leállítása"
@@ -1897,18 +1870,6 @@ msgstr ""
"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õ"
@@ -1953,85 +1914,11 @@ 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 ""
@@ -2093,13 +1980,31 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2117,6 +2022,16 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ""
@@ -2124,6 +2039,20 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ""
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Hiba a szûrõ beállításakor"
@@ -2377,22 +2306,14 @@ msgid "Automatically save new log messages to a file"
msgstr "Mindig mentse automatikusan az új üzeneteket"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "Mindig mentse az új üzeneteket"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Mindig mentse az új üzeneteket"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2432,10 +2353,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "TOR hálózati térkép"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Frissítés"
@@ -2535,6 +2452,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Érvénytelen Hídkapcsolat"
@@ -2876,10 +2809,6 @@ msgid "Run as a client only"
msgstr "Csak kliens indítása"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "A TOR hálózat forgalmának közvetítése (Elosztás)"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Közvetítõ port:"
@@ -3136,6 +3065,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3184,10 +3121,6 @@ msgid "Directory already in use by another service."
msgstr "A könyvár már használatban van egy másik szolgáltatás által."
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Forma"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Megadott Rejtett Szolgáltatások"
@@ -3476,6 +3409,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "Új"
@@ -3512,6 +3461,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Ismeretlen"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "%1 folyamat leállítása sikertelen. [%2]"
@@ -3590,6 +3545,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "Siker"
diff --git a/src/vidalia/i18n/po/id/vidalia_id.po b/src/vidalia/i18n/po/id/vidalia_id.po
index 58bec81..e51207e 100755
--- a/src/vidalia/i18n/po/id/vidalia_id.po
+++ b/src/vidalia/i18n/po/id/vidalia_id.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:01+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -234,10 +234,6 @@ msgid "Show Settings"
msgstr "Tampilkan Pengaturan"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Penggunaan Bandwidth Tor "
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Reset"
@@ -277,6 +273,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Batal"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -430,17 +430,26 @@ msgid "Control socket is not connected."
msgstr "Kendali socket tidak terhubung."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Diperlukan Password"
+msgid "Problem connecting to Tor"
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Ingat password saya"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1336,10 +1345,6 @@ msgid "Browse"
msgstr "Browse"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Jalankan software Tor ketika Vidalia berjalan"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1367,6 +1372,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1654,34 +1663,6 @@ msgid "New Identity"
msgstr "Identitas Baru"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1690,10 +1671,6 @@ msgid "View"
msgstr "Tampilan"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Bantuan Vidalia"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Error menjalankan browser"
@@ -1806,10 +1783,6 @@ msgid "Tor is shutting down"
msgstr "Tor mati"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Hentikan Tor Sekarang"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Hentikan Tor"
@@ -1894,18 +1867,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1946,138 +1907,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2085,31 +2023,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2365,19 +2297,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2420,10 +2344,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2523,6 +2443,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2848,10 +2784,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3096,6 +3028,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3140,10 +3080,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3432,6 +3368,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3468,6 +3420,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3546,6 +3504,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/is/vidalia_is.po b/src/vidalia/i18n/po/is/vidalia_is.po
index c172280..11da7fe 100755
--- a/src/vidalia/i18n/po/is/vidalia_is.po
+++ b/src/vidalia/i18n/po/is/vidalia_is.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:00+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr "Sýna stillingar"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Bandvíddarnotkun Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Endurstilla"
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Hætta við"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Lykilorð er nauðsynlegt"
+msgid "Problem connecting to Tor"
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Muna lykilorðið mitt"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Keyra upp Tor þegar Vidalia er ræst"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr "Nýtt auðkenni"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr "Sýn"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia hjálp"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Tókst ekki að ræsa vefskoðara"
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/it/vidalia_it.po b/src/vidalia/i18n/po/it/vidalia_it.po
index 9e30b94..f910bba 100644
--- a/src/vidalia/i18n/po/it/vidalia_it.po
+++ b/src/vidalia/i18n/po/it/vidalia_it.po
@@ -3,10 +3,10 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:28+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Italian <None>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -237,10 +237,6 @@ msgid "Show Settings"
msgstr "Mostra Impostazioni"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Utilizzo di banda di Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Reinizializza"
@@ -280,6 +276,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Annulla"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Inizio la richiesta HTTPS di bridge..."
@@ -433,20 +433,27 @@ msgid "Control socket is not connected."
msgstr "Il socket di controllo non è connesso."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Password richiesta"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Ricorda la mia password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"Vidalia 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."
@@ -1342,10 +1349,6 @@ msgid "Browse"
msgstr "Sfoglia"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Avvia Tor quando Vidalia viene avviato"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1373,6 +1376,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Controlla adesso"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1660,34 +1667,6 @@ msgid "New Identity"
msgstr "Nuova identità"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1696,10 +1675,6 @@ msgid "View"
msgstr "Mostra"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Aiuto di Vidalia"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Errore nell'avvio del browser web"
@@ -1812,10 +1787,6 @@ msgid "Tor is shutting down"
msgstr "Arresto di Tor in corso"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Ferma Tor adesso"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Ferma Tor"
@@ -1905,19 +1876,6 @@ msgstr ""
" Vidalia potrebbero non essere disponibili"
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Errore di autenticazione"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia non è riuscito ad autenticarsi al software Tor. (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-"Verificare le impostazioni di autenticazione per la porta di controllo."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "È disponibile un aggiornamento di Tor"
@@ -1960,85 +1918,11 @@ 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 ""
@@ -2102,16 +1986,32 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "fallito (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
-"Il tuo relay si sta spegnendo.\n"
-"Fai di nuovo clic su 'Stop' per fermare il tuo relay adesso."
msgctxt "MainWindow"
msgid ""
@@ -2134,6 +2034,16 @@ msgstr ""
"Controlla il log dei messaggi alla ricerca di avvisi o messaggi di errore recenti."
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "fallito (%1)"
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ", probabilmente Telnet,"
@@ -2141,6 +2051,22 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", probabilmente un client email,"
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+"Il tuo relay si sta spegnendo.\n"
+"Fai di nuovo clic su 'Stop' per fermare il tuo relay adesso."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Errore nell'impostazione del filtro"
@@ -2394,22 +2320,14 @@ msgid "Automatically save new log messages to a file"
msgstr "Salva automaticamente i nuovi messaggi su file"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "Salva sempre i nuovi messaggi di log"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Salva sempre i nuovi messaggi di log"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2464,10 +2382,6 @@ msgstr ""
"%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mappa della rete Tor"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Ricarica"
@@ -2567,6 +2481,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Bridge non valido"
@@ -2906,10 +2836,6 @@ msgid "Run as a client only"
msgstr "Usa solo come client"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Fai da relay e scambia traffico per la rete Tor"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Porta relay:"
@@ -3173,6 +3099,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Offri un mirror della directory dei relay"
@@ -3222,10 +3156,6 @@ msgid "Directory already in use by another service."
msgstr "Cartella già in uso da parte di un altro servizio."
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Modulo"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Hidden service forniti"
@@ -3516,6 +3446,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "Nuovo"
@@ -3552,6 +3498,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Sconosciuto"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Il processo %1 non è riuscito a terminare. [%2]"
@@ -3630,6 +3582,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "Successo"
diff --git a/src/vidalia/i18n/po/kn/vidalia_kn.po b/src/vidalia/i18n/po/kn/vidalia_kn.po
index e6156a1..e8a4552 100644
--- a/src/vidalia/i18n/po/kn/vidalia_kn.po
+++ b/src/vidalia/i18n/po/kn/vidalia_kn.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:16+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/lb/vidalia_lb.po b/src/vidalia/i18n/po/lb/vidalia_lb.po
index 79eab0e..aaf69a2 100644
--- a/src/vidalia/i18n/po/lb/vidalia_lb.po
+++ b/src/vidalia/i18n/po/lb/vidalia_lb.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:11+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/ln/vidalia_ln.po b/src/vidalia/i18n/po/ln/vidalia_ln.po
index 69d9d80..ebca324 100644
--- a/src/vidalia/i18n/po/ln/vidalia_ln.po
+++ b/src/vidalia/i18n/po/ln/vidalia_ln.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:11+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/lo/vidalia_lo.po b/src/vidalia/i18n/po/lo/vidalia_lo.po
index b573d1f..665ad26 100644
--- a/src/vidalia/i18n/po/lo/vidalia_lo.po
+++ b/src/vidalia/i18n/po/lo/vidalia_lo.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:11+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/lt/vidalia_lt.po b/src/vidalia/i18n/po/lt/vidalia_lt.po
index 671e28c..515fae6 100644
--- a/src/vidalia/i18n/po/lt/vidalia_lt.po
+++ b/src/vidalia/i18n/po/lt/vidalia_lt.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:11+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/lv/vidalia_lv.po b/src/vidalia/i18n/po/lv/vidalia_lv.po
index 82614a1..9ff589d 100644
--- a/src/vidalia/i18n/po/lv/vidalia_lv.po
+++ b/src/vidalia/i18n/po/lv/vidalia_lv.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:11+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/mg/vidalia_mg.po b/src/vidalia/i18n/po/mg/vidalia_mg.po
index 68959d4..9d86930 100644
--- a/src/vidalia/i18n/po/mg/vidalia_mg.po
+++ b/src/vidalia/i18n/po/mg/vidalia_mg.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:13+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/mi/vidalia_mi.po b/src/vidalia/i18n/po/mi/vidalia_mi.po
index f4fa8ac..0609e8d 100644
--- a/src/vidalia/i18n/po/mi/vidalia_mi.po
+++ b/src/vidalia/i18n/po/mi/vidalia_mi.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:14+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/mk/vidalia_mk.po b/src/vidalia/i18n/po/mk/vidalia_mk.po
index 78efdd8..fa090b3 100644
--- a/src/vidalia/i18n/po/mk/vidalia_mk.po
+++ b/src/vidalia/i18n/po/mk/vidalia_mk.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:14+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/ml/vidalia_ml.po b/src/vidalia/i18n/po/ml/vidalia_ml.po
index 5eb7b2a..2188ff8 100644
--- a/src/vidalia/i18n/po/ml/vidalia_ml.po
+++ b/src/vidalia/i18n/po/ml/vidalia_ml.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:14+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/mn/vidalia_mn.po b/src/vidalia/i18n/po/mn/vidalia_mn.po
index bdf0519..e609e46 100644
--- a/src/vidalia/i18n/po/mn/vidalia_mn.po
+++ b/src/vidalia/i18n/po/mn/vidalia_mn.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:14+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/mr/vidalia_mr.po b/src/vidalia/i18n/po/mr/vidalia_mr.po
index c8dea9f..52c4025 100644
--- a/src/vidalia/i18n/po/mr/vidalia_mr.po
+++ b/src/vidalia/i18n/po/mr/vidalia_mr.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:15+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/ms/vidalia_ms.po b/src/vidalia/i18n/po/ms/vidalia_ms.po
index 3a78698..d5a0806 100644
--- a/src/vidalia/i18n/po/ms/vidalia_ms.po
+++ b/src/vidalia/i18n/po/ms/vidalia_ms.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:15+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/mt/vidalia_mt.po b/src/vidalia/i18n/po/mt/vidalia_mt.po
index 0ef5e33..8430936 100755
--- a/src/vidalia/i18n/po/mt/vidalia_mt.po
+++ b/src/vidalia/i18n/po/mt/vidalia_mt.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:14+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/my/vidalia_my.po b/src/vidalia/i18n/po/my/vidalia_my.po
index d0eebe5..1facd33 100644
--- a/src/vidalia/i18n/po/my/vidalia_my.po
+++ b/src/vidalia/i18n/po/my/vidalia_my.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:00+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -233,10 +233,6 @@ msgid "Show Settings"
msgstr "Setting မ်ားအားျပရန္"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor bandwidth အသံုးျပဳမွဳအေျခအေန"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "အစမွျပန္စရန္"
@@ -276,6 +272,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "ထြက္ရန္"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -429,17 +429,26 @@ msgid "Control socket is not connected."
msgstr "ထိန္းခ်ဳပ္မွဳ socket အားခ်ိတ္ဆက္၍မရပါ။"
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "လွ်ိဳ႕ဝက္ကုဒ္လိုအပ္သည္"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "ကၽြႏု္ပ္ လွ်ိဳ႕ဝက္ကုဒ္အားမွတ္ထားရန္"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1335,10 +1344,6 @@ msgid "Browse"
msgstr "Browse"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Tor ေဆာ့ဝဲကို Vidalia စတင္ခ်ိန္တြင္ စတင္ပါ"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1366,6 +1371,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1655,34 +1664,6 @@ msgid "New Identity"
msgstr "ကုိယ္ပိုင္အမွတ္အသားအသစ္"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1691,10 +1672,6 @@ msgid "View"
msgstr "ၾကည့္ရႈရန္"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia အကူအညီ"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Web browser စတင္ရာတြင္ မွားယြင္းမႈ"
@@ -1807,10 +1784,6 @@ msgid "Tor is shutting down"
msgstr "Tor ပိတ္သိမ္းေနပါသည္"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Tor ကုိ ယခု ရပ္တန္႕ပါ"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Tor ကုိ ရပ္တန္႕ပါ"
@@ -1899,21 +1872,6 @@ msgstr ""
"လုပ္ေဆာင္ႏုိင္မႈမ်ား မရရွိႏုိင္ပါ"
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "မွန္ကန္ေၾကာင္း စစ္ေဆးမႈ ခ်ိဳ႕ယြင္းခ်က္"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-"Vidalia မွ Tor ေဆာ့ဝဲသို႕ မွန္ကန္ေၾကာင္း စစ္ေဆးမႈ မျပဳလိုႏိုင္ပါ။ (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-"ေက်းဇူးျပဳ၍ သင္၏ ထိန္းခ်ဳပ္မႈ port မွန္ကန္ေၾကာင္း စစ္ေဆးမႈ "
-"ခ်ိန္ညိွခ်က္မ်ားကို စစ္ေဆးပါ"
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Tor အသစ္ျဖည့္သြင္းခ်က္မ်ား ရရွႏုိင္ပါျပီ"
@@ -1960,85 +1918,11 @@ msgid "Status"
msgstr "အေျခအေန"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Vidalia Shortcuts"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Relaying ကုိ ထည့္သြင္းျခင္း"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Relay တစ္ခု ထည့္သြင္း၍ Network ကုိ ၾကီးထြားေအာင္ ျပဳလုပ္ပါ"
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Network ကုိ ၾကည့္ရႈရန္"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Tor Network ၏ ေျမပံုကို ၾကည့္ရႈရန္"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "ကုိယ္ပိုင္ အမွတ္အသားတစ္ခု အသံုးျပဳရန္"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "ေနာက္ဆက္တဲြ ဆက္သြယ္မႈ အသစ္ ျပဳလုပ္ရန္"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "လတ္တေလာ bandwidth အသံုးျပဳမႈ ၾကည့္ရႈရန္"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "သတင္းေပးပို႕မႈ မွတ္တမ္း history ကို ၾကည့္ရႈရန္"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "အကူအညီ မွတ္တမ္းမ်ား ၾကည့္ရႈရန္"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Vidalia ကုိ ခ်ိန္ညိႇယူရန္"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "version ႏွင့္ လုိင္စင္ အခ်က္အလက္မ်ား ၾကည့္ရႈရန္"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Vidalia မွ ထြက္ရန္"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "ဤ windows ကို စနစ္စတင္လ်င္ ျပသရန္"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "ဖံုးကြယ္ထားရန္"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "ဤ windows ကုိ ဖုံုးကြယ္ထားရန္"
-
-msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "စကားဝွက္ ျပင္ဆင္သတ္မွတ္ျခင္း မေအာင္ျမင္ပါ"
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-"Vidalia မွ Tor ၏ ထိန္းခ်ဳပ္မႈ စကားဝွက္ကုိ ျပင္ဆင္သတ္မွတ္စဥ္ Tor ေဆာ့ဝဲကုိ "
-"စတင္ျခင္း မျပဳလုပ္ႏုိင္ပါ။ ေက်းဇူးျပဳ၍ သင္၏ Task Manager တြင္ အျခား Tor "
-"လုပ္ငန္းစဥ္မ်ား ဖြင့္ထားျခင္း ရွိမရွိ စစ္ေဆးပါ။"
-
-msgctxt "MainWindow"
-msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -2098,13 +1982,31 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2122,6 +2024,16 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ""
@@ -2129,6 +2041,20 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ""
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "ခ်ိန္ညွိမႈမ်ား စိစစ္မႈ ခ်ိဳ႕ယြင္းခ်က္"
@@ -2387,22 +2313,14 @@ msgid "Automatically save new log messages to a file"
msgstr "သတင္းအခ်က္အလက္မွတ္တမ္း အသစ္မ်ားကို အလိုအေလ်ာက္ ဖုိင္တစ္ခုသို႕ သိမ္းပါ"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "သတင္းအခ်က္အလက္မွတ္တမ္းအသစ္မ်ားကို အျမဲတမ္း သိမ္းပါ"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "သတင္းအခ်က္အလက္မွတ္တမ္းအသစ္မ်ားကို အျမဲတမ္း သိမ္းပါ"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2442,10 +2360,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor Network ေျမပံု"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "ျပန္လည္ အသစ္တင္ျပပါ"
@@ -2546,6 +2460,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "မဆီေလ်ာ္ေသာ Bridge"
@@ -2885,10 +2815,6 @@ msgid "Run as a client only"
msgstr "Client ကဲ့သုိ႕သာ အလုပ္လုပ္ေဆာင္ပါ"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tor Network အတြက္ Relay traffic"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Relay Port:"
@@ -3147,6 +3073,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3195,10 +3129,6 @@ msgid "Directory already in use by another service."
msgstr "Directory သည္ အျခား ဝန္ေဆာင္မႈတစ္ခုမွ အသံုးျပဳႏွင့္ျပီး ျဖစ္ပါသည္"
msgctxt "ServicePage"
-msgid "Form"
-msgstr "ျဖည့္စြက္ပံုစံ"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "လွ်ိဳ႕ဝွက္ဝန္ေဆာင္မႈမ်ား ရရွိျပီး ျဖစ္ပါသည္"
@@ -3489,6 +3419,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "အသစ္"
@@ -3525,6 +3471,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "မသိရပါ"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "လုပ္ေဆာင္မႈ %1 ရပ္တန္႕ရန္ မေအာင္ျမင္ပါ [%2]"
@@ -3603,6 +3555,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "ေအာင္ျမင္ပါသည္"
diff --git a/src/vidalia/i18n/po/nah/vidalia_nah.po b/src/vidalia/i18n/po/nah/vidalia_nah.po
index 9fb9964..d85f07d 100644
--- a/src/vidalia/i18n/po/nah/vidalia_nah.po
+++ b/src/vidalia/i18n/po/nah/vidalia_nah.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:50+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/nap/vidalia_nap.po b/src/vidalia/i18n/po/nap/vidalia_nap.po
index 6753c09..e29d861 100644
--- a/src/vidalia/i18n/po/nap/vidalia_nap.po
+++ b/src/vidalia/i18n/po/nap/vidalia_nap.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:50+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/nb/vidalia_nb.po b/src/vidalia/i18n/po/nb/vidalia_nb.po
index fcf5a90..e239aa1 100644
--- a/src/vidalia/i18n/po/nb/vidalia_nb.po
+++ b/src/vidalia/i18n/po/nb/vidalia_nb.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 19:56+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -235,10 +235,6 @@ msgid "Show Settings"
msgstr "Vis innstillinger"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor båndbreddeforbruk"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Tilbakestill"
@@ -278,6 +274,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Avbryt"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Starter HTTPS-broforespørsel"
@@ -431,20 +431,27 @@ msgid "Control socket is not connected."
msgstr "Kontroll-socket er ikke tilkoblet."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Passord kreves"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Husk passordet"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"Vidalia har koblet seg til en Tor-prosess som krever et passord. Vennligst "
-"skriv inn ditt kontrollpassord:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1339,10 +1346,6 @@ msgid "Browse"
msgstr "Bla"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Start Tor når Vidalia starter"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1370,6 +1373,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Sjekk nå"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1657,34 +1664,6 @@ msgid "New Identity"
msgstr "Ny Identitet"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1693,10 +1672,6 @@ msgid "View"
msgstr "Vis"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia Hjelp"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Feil ved start av nettleser"
@@ -1809,10 +1784,6 @@ msgid "Tor is shutting down"
msgstr "Tor stenger ned"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Stopp Tor nå"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Stopp Tor"
@@ -1901,18 +1872,6 @@ msgstr ""
"funksjoner kan være utilgjengelig."
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Autentiseringsfeil"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia kunne ikke autentisere mot Tor. (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr "Vennligst sjekk innstillingene for autentisering mot kontrollporten"
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Tor-oppdatering tilgjengelig"
@@ -1956,85 +1915,11 @@ 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 ""
@@ -2098,16 +1983,32 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "feilet (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
-"Din relé stenges ned.\n"
-"Trykk på \"Stopp\" igjen for å stenge din relé nå."
msgctxt "MainWindow"
msgid ""
@@ -2130,6 +2031,16 @@ msgstr ""
"Vennligst sjekk meldingshistorikken for en nylig advarsel eller feilmelding."
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "feilet (%1)"
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ", sannsynligvis Telnet,"
@@ -2137,6 +2048,22 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", sannsynligvis en epostklient,"
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+"Din relé stenges ned.\n"
+"Trykk på \"Stopp\" igjen for å stenge din relé nå."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Feilet ved innstilling av Filter"
@@ -2390,22 +2317,14 @@ msgid "Automatically save new log messages to a file"
msgstr "Lagre automatisk nye loggmeldinger til en fil"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "Alltid lagre nye loggmeldinger"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Alltid lagre nye loggmeldinger"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2460,10 +2379,6 @@ msgstr ""
"%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor Nettverkskart"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Oppdater"
@@ -2563,6 +2478,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Ugyldig Bro"
@@ -2903,10 +2834,6 @@ msgid "Run as a client only"
msgstr "Kjør kun som klient"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Videresend trafikk for Tor-nettverket (Relé)"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Reléport:"
@@ -3163,6 +3090,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Speil relékatalogen"
@@ -3211,10 +3146,6 @@ msgid "Directory already in use by another service."
msgstr "Katalog allerede i bruk av en annen tjeneste."
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Skjema"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Valgte skjulte tjenester"
@@ -3503,6 +3434,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "Ny"
@@ -3539,6 +3486,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Ukjent"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Prosess %1 nektet å stoppe. [%2]"
@@ -3617,6 +3570,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "Vellykket"
diff --git a/src/vidalia/i18n/po/ne/vidalia_ne.po b/src/vidalia/i18n/po/ne/vidalia_ne.po
index 7bbc387..32a07d6 100644
--- a/src/vidalia/i18n/po/ne/vidalia_ne.po
+++ b/src/vidalia/i18n/po/ne/vidalia_ne.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:50+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/nl/vidalia_nl.po b/src/vidalia/i18n/po/nl/vidalia_nl.po
index 4d94049..3ff5e7e 100644
--- a/src/vidalia/i18n/po/nl/vidalia_nl.po
+++ b/src/vidalia/i18n/po/nl/vidalia_nl.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:01+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -235,10 +235,6 @@ msgid "Show Settings"
msgstr "Instellingen Weergeven"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor bandbreedte gebruik"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Reset"
@@ -278,6 +274,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Annuleren"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "HTTPS bridge verzoek is gestart..."
@@ -431,20 +431,27 @@ msgid "Control socket is not connected."
msgstr "Control socket is niet verbonden."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Paswoord noodzakelijk"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Onthoud mijn paswoord"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"Vidalia 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."
@@ -1341,10 +1348,6 @@ msgid "Browse"
msgstr "Bladeren"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "De Tor toepassing starten als Vidalia start"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1372,6 +1375,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Nu controleren"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1659,34 +1666,6 @@ msgid "New Identity"
msgstr "Nieuwe Identiteit"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1695,10 +1674,6 @@ msgid "View"
msgstr "Bekijk"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia Help"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Fout tijdens het starten van de browser"
@@ -1811,10 +1786,6 @@ msgid "Tor is shutting down"
msgstr "Tor is bezig met afsluiten."
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Tor nu stoppen"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Tor stoppen"
@@ -1903,18 +1874,6 @@ msgstr ""
"verschillende functies van Vidalia niet beschikbaar."
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Aanmeldfout"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia kon zich niet bij de Tor software aanmelden (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr "Controleer de beheerspoort aanmeldinstellingen."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Tor update beschikbaar"
@@ -1959,86 +1918,11 @@ msgid "Status"
msgstr "Status"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Vidalia Snelkoppeling"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Relaying Instellen"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Begin een relay en help het netwerk groeien"
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Bekijk het Netwerk"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Bekijk een kaart van het Tor netwerk"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Gebruik een Nieuwe Identiteit"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Laat de eerstvolgende verbindingen nieuw lijken"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Bekijk recent bandbreedte gebruik"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Bekijk log berichten geschiedenis"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Bekijk de help documentatie"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Vidalia configureren"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Bekijk versie en licentie informatie"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Vidalia afsluiten"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Toon dit scherm bij het opstarten"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Verbergen"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Dit scherm niet tonen"
-
-msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Wachtwoord reset faalde"
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-"Vidalia probeerde Tor's controle wachtwoord te resetten, maar was niet niet "
-"in staat om de Tor software te herstarten. Controleert u alstublieft uw "
-"Taakbeheerder om er zeker van te zijn dat er geen andere Tor processen "
-"draaien."
-
-msgctxt "MainWindow"
-msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -2106,16 +1990,32 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "mislukt (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
-"Uw relay is aan het afsluiten.\n"
-"Klik opnieuw op 'Stop' om uw relay nu te stoppen."
msgctxt "MainWindow"
msgid ""
@@ -2138,6 +2038,16 @@ msgstr ""
"Controleert u alstublieft de berichtenlog voor recente waarschuwingen of foutmeldingen."
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "mislukt (%1)"
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ", mogelijk Telnet,"
@@ -2145,6 +2055,22 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", mogelijk een email cliënt,"
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+"Uw relay is aan het afsluiten.\n"
+"Klik opnieuw op 'Stop' om uw relay nu te stoppen."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Fout bij Instellen Filter"
@@ -2401,22 +2327,14 @@ msgid "Automatically save new log messages to a file"
msgstr "Automatisch nieuwe log berichten opslaan naar bestand"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "Altijd Nieuwe Log Berichten Opslaan"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Altijd Nieuwe Log Berichten Opslaan"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2459,10 +2377,6 @@ msgstr ""
"%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor Netwerk Kaart"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Ververs"
@@ -2562,6 +2476,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Ongeldige Brug"
@@ -2887,10 +2817,6 @@ 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 ""
@@ -3142,6 +3068,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3186,10 +3120,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3478,6 +3408,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "Nieuw"
@@ -3514,6 +3460,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Onbekend"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Stoppen van proces %1 mislukt. [%2]"
@@ -3592,6 +3544,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/nn/vidalia_nn.po b/src/vidalia/i18n/po/nn/vidalia_nn.po
index 0a63429..24c55b4 100644
--- a/src/vidalia/i18n/po/nn/vidalia_nn.po
+++ b/src/vidalia/i18n/po/nn/vidalia_nn.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:50+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/nso/vidalia_nso.po b/src/vidalia/i18n/po/nso/vidalia_nso.po
index 4b29d0a..b966b2a 100644
--- a/src/vidalia/i18n/po/nso/vidalia_nso.po
+++ b/src/vidalia/i18n/po/nso/vidalia_nso.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:10+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:43+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/oc/vidalia_oc.po b/src/vidalia/i18n/po/oc/vidalia_oc.po
index 45b3b32..ed69d19 100644
--- a/src/vidalia/i18n/po/oc/vidalia_oc.po
+++ b/src/vidalia/i18n/po/oc/vidalia_oc.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:15+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/pa/vidalia_pa.po b/src/vidalia/i18n/po/pa/vidalia_pa.po
index 4724fcd..67b1b2c 100755
--- a/src/vidalia/i18n/po/pa/vidalia_pa.po
+++ b/src/vidalia/i18n/po/pa/vidalia_pa.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:12+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/pap/vidalia_pap.po b/src/vidalia/i18n/po/pap/vidalia_pap.po
index 428165d..965c5e9 100644
--- a/src/vidalia/i18n/po/pap/vidalia_pap.po
+++ b/src/vidalia/i18n/po/pap/vidalia_pap.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/pl/qt_pl.po b/src/vidalia/i18n/po/pl/qt_pl.po
index 6907bf7..620a6fc 100644
--- a/src/vidalia/i18n/po/pl/qt_pl.po
+++ b/src/vidalia/i18n/po/pl/qt_pl.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-08-20 03:25+0000\n"
-"PO-Revision-Date: 2011-03-18 11:07+0000\n"
+"PO-Revision-Date: 2011-04-18 09:09+0000\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
diff --git a/src/vidalia/i18n/po/pl/vidalia_pl.po b/src/vidalia/i18n/po/pl/vidalia_pl.po
index 3f06935..f854e02 100644
--- a/src/vidalia/i18n/po/pl/vidalia_pl.po
+++ b/src/vidalia/i18n/po/pl/vidalia_pl.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 19:57+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -236,10 +236,6 @@ msgid "Show Settings"
msgstr "Pokaż ustawienia"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Użycie Łącza"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Resetuj"
@@ -279,6 +275,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Anuluj"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Wysyłanie żądania HTTPS do mostu..."
@@ -432,20 +432,27 @@ msgid "Control socket is not connected."
msgstr "Gniazdo sterujące nie jest podłączone."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Wymagane hasło"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Zapamiętaj hasło"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"Vidalia połączyła się z usługą Tora, który wymaga hasła. Proszę wprowadzić "
-"hasło:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1340,10 +1347,6 @@ msgid "Browse"
msgstr "Przeglądaj"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Uruchamiaj Tora gdy Vidalia startuje"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1371,6 +1374,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Sprawdź teraz"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1658,34 +1665,6 @@ msgid "New Identity"
msgstr "Nowa Tożsamość"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1694,10 +1673,6 @@ msgid "View"
msgstr "Widok"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Pomoc Vidalii"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Błąd przy uruchamianiu przeglądarki internetowej"
@@ -1810,10 +1785,6 @@ msgid "Tor is shutting down"
msgstr "Zamykanie Tora"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Zatrzymaj teraz Tora"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Zatrzymaj Tora"
@@ -1902,18 +1873,6 @@ msgstr ""
"funkcji może być niedostępnych."
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Błąd uwierzytelnienia"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia nie zdołała uwierzytelnić się oprogramowaniu Tor."
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr "Proszę sprawdzić port sterujący autentykacją."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Aktualizacja Tora jest dostępna"
@@ -1957,85 +1916,11 @@ msgid "Status"
msgstr "Status"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Skróty Vidalii"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Ustawienia węzła"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Uruchom węzeł i pomóż w rozbudowie sieci."
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Pokaż Sieć"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Pokaż mapę sieci Tora"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Użyj Nowej Tożsamości"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Uczyń kolejne połączenia jako nowe"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Pokaż ostatnie zużycie przepustowości"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Pokaż historię logów"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Pokaż dokumentację pomocy"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Konfiguruj Vidalię"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Pokaż informację o wersji i licencji"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Zamknij Vidalię"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Pokazuj to okno na starcie"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Ukryj"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Ukryj to okno"
-
-msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Resetowanie hasła nie powiodło się"
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-"Vidalia próbowała zresetować hasło sterujące Tora, ale nie udało się "
-"ponownie uruchomić aplikacji Tor. Sprawdź w Menedżerze zadań czy nie ma "
-"uruchomionych procesów Tora."
-
-msgctxt "MainWindow"
-msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -2098,16 +1983,32 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "nie powiodło się (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
-"Twój węzeł zostanie wyłączony.\n"
-"\"Kliknij na 'Zatrzymaj' aby go teraz zatrzymać."
msgctxt "MainWindow"
msgid ""
@@ -2130,6 +2031,16 @@ msgstr ""
"Proszę sprawdzić logi w celu poznania przyczyny."
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "nie powiodło się (%1)"
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ", prawdopodobnie Telnet,"
@@ -2137,6 +2048,22 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", prawdopodobnie klient e-mail,"
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+"Twój węzeł zostanie wyłączony.\n"
+"\"Kliknij na 'Zatrzymaj' aby go teraz zatrzymać."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Błąd ustawiania filtru"
@@ -2390,22 +2317,14 @@ msgid "Automatically save new log messages to a file"
msgstr "Automatycznie zapisuj wiadomości do pliku"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "Zawsze zapisuj nowe wiadomości"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Zawsze zapisuj nowe wiadomości"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2459,10 +2378,6 @@ msgstr ""
"%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mapa Sieci"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Odśwież"
@@ -2562,6 +2477,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Niepoprawny Węzeł-Most"
@@ -2674,11 +2605,11 @@ 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>"
+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>"
+msgstr "<a href=\"bridges.finding\">Jak mogę znaleźć węzły-mosty?</a>"
msgctxt "NetworkPage"
msgid ""
@@ -2899,10 +2830,6 @@ msgid "Run as a client only"
msgstr "Działaj tylko jako klient"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Udostępnij moje łącze dla sieci Tor"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Port węzła:"
@@ -3161,6 +3088,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Przechowuj kopię Katalogu Węzłów"
@@ -3209,10 +3144,6 @@ msgid "Directory already in use by another service."
msgstr "Katalog jest aktualnie w użyciu przez inną usługę."
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Formularz"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Dostarczane ukryte usługi"
@@ -3501,6 +3432,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "Nowe"
@@ -3537,6 +3484,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Nieznane"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Nieudana próba zatrzymania procesu %1. [%2]"
@@ -3615,6 +3568,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "Sukces"
diff --git a/src/vidalia/i18n/po/pms/vidalia_pms.po b/src/vidalia/i18n/po/pms/vidalia_pms.po
index 5c56c17..a0f7ffb 100644
--- a/src/vidalia/i18n/po/pms/vidalia_pms.po
+++ b/src/vidalia/i18n/po/pms/vidalia_pms.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:15+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/ps/vidalia_ps.po b/src/vidalia/i18n/po/ps/vidalia_ps.po
index 1628556..52baa3f 100644
--- a/src/vidalia/i18n/po/ps/vidalia_ps.po
+++ b/src/vidalia/i18n/po/ps/vidalia_ps.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:11+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/pt/vidalia_pt.po b/src/vidalia/i18n/po/pt/vidalia_pt.po
index 9a6f9b0..435ea41 100644
--- a/src/vidalia/i18n/po/pt/vidalia_pt.po
+++ b/src/vidalia/i18n/po/pt/vidalia_pt.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 19:55+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -237,10 +237,6 @@ msgid "Show Settings"
msgstr "Mostrar Configurações"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Utilização de Largura de Banda do Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Reiniciar"
@@ -280,6 +276,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Cancelar"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "A iniciar o pedido de bridge HTTPS..."
@@ -433,20 +433,27 @@ msgid "Control socket is not connected."
msgstr "O socket de controle não está conectado."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Necessário palavra-passe"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Memorizar a minha palavra-passe"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"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."
@@ -1341,10 +1348,6 @@ msgid "Browse"
msgstr "Navegar"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Iniciar o software Tor quando iniciar o Vidalia"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1372,6 +1375,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Verificar Agora"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1659,34 +1666,6 @@ msgid "New Identity"
msgstr "Nova Identidade"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1695,10 +1674,6 @@ msgid "View"
msgstr "Visualizar"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Ajuda do Vidalia"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Erro ao iniciar navegador web:"
@@ -1811,10 +1786,6 @@ msgid "Tor is shutting down"
msgstr "Tor a encerrar"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Parar Tor Agora"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Parar Tor"
@@ -1903,20 +1874,6 @@ msgstr ""
"características podem estar indisponível."
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Erro de Autenticação"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia foi incapaz de autenticar o software Tor. (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-"Por favor, verifique as suas configurações de controlo de autenticação da "
-"porta."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Actualização do Tor Disponível"
@@ -1960,85 +1917,11 @@ msgid "Status"
msgstr "Estado"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Atalhos do Vidalia"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Instalação do Retransmissor"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Cria um retransmissor e ajudar a rede a crescer"
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Ver a Rede"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Ver um mapa da rede Tor"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Use uma Nova Identidade"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Faça com que as subsequentes conexões pareçam novas"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Ver a recente utilização da largura de banda"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Ver histórico das mensagens de log"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Ver documentação de ajuda"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Configurar o Vidalia"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Ver versão e a informação da licença"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Sair do Vidalia"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Mostrar esta janela ao iniciar"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Ocultar"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Ocultar esta janela"
-
-msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Falha na Redefinição da Palavra-Chave"
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-"Vidalia tentou redefinir a palavra-chave de controlo do Tor, mas foi incapaz"
-" de reiniciar o software Tor. Por favor, verifique o seu Gestor de Tarefas "
-"para garantir que não há outros processos Tor em execução."
-
-msgctxt "MainWindow"
-msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -2104,16 +1987,32 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "Falhou (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
-"O seu retransmissor está a encerrar.\n"
-"Clique 'Stop' novamente para parar o seu retransmissor agora."
msgctxt "MainWindow"
msgid ""
@@ -2136,6 +2035,16 @@ msgstr ""
"Por favor, verifique no seu log a existência de mensagens de alerta recente ou mensagens de erro."
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "Falhou (%1)"
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ", provavelmente Telnet,"
@@ -2143,6 +2052,22 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", provavelmente um cliente de email,"
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+"O seu retransmissor está a encerrar.\n"
+"Clique 'Stop' novamente para parar o seu retransmissor agora."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Erro na Definição do Filtro"
@@ -2400,22 +2325,14 @@ msgid "Automatically save new log messages to a file"
msgstr "Salvar automaticamente as novas mensagens de log para arquivo"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "Sempre Salvar Novas Mensagens de Log"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Sempre Salvar Novas Mensagens de Log"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2470,10 +2387,6 @@ msgstr ""
"%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mapa da Rede Tor"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Atualizar"
@@ -2573,6 +2486,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Bridge inválida"
@@ -2913,10 +2842,6 @@ msgid "Run as a client only"
msgstr "Executar apenas um cliente"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Retransmitir o tráfego recebido pela rede Tor"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Porta da Relay:"
@@ -3179,6 +3104,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Espelhar a Pasta de Retransmissão"
@@ -3228,10 +3161,6 @@ msgid "Directory already in use by another service."
msgstr "Pasta em uso por outro serviço."
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Formulário"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Serviços Ocultos Prestados"
@@ -3522,6 +3451,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "Novo"
@@ -3558,6 +3503,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Desconhecido"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "O Processo %1 não pôde ser encerrado. [%2]"
@@ -3636,6 +3587,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "Sucesso"
diff --git a/src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po b/src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po
index a0397d3..6a395a6 100644
--- a/src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po
+++ b/src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 19:57+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -232,10 +232,6 @@ msgid "Show Settings"
msgstr "Exibir parâmetros"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Largura de banda usada pelo Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Reinicializar"
@@ -275,6 +271,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Cancelar"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -428,17 +428,26 @@ msgid "Control socket is not connected."
msgstr "Conexão de controle não estabelecida."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Senha requerida"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Lembrar senha"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1334,10 +1343,6 @@ msgid "Browse"
msgstr "Procurar"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Iniciar Tor e Vidalia juntos"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1365,6 +1370,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 kb/s"
@@ -1652,34 +1661,6 @@ msgid "New Identity"
msgstr "Nova identidade"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1688,10 +1669,6 @@ msgid "View"
msgstr "Ver"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Ajuda do Vidalia"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Erro ao iniciar navegador de internet"
@@ -1806,10 +1783,6 @@ msgid "Tor is shutting down"
msgstr "Encerrando Tor"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Parar o Tor agora"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Parar Tor"
@@ -1900,18 +1873,6 @@ msgstr ""
" funções ficarão indisponíveis."
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Erro de autenticação"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia foi incapaz de autenticar-se no aplicativo Tor. (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr "Por favor, verifique suas configurações da porta de controle"
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Atualização disponível para o Tor"
@@ -1957,85 +1918,11 @@ msgid "Status"
msgstr "Estado"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Atalhos do Vidalia"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Configurar servidor"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Configure um servidor e ajude no crescimento da rede"
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Visualizar rede"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Exibir mapa da rede Tor"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Usar nova identidade"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Fazer conexões subsequentes parecerem novas"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Ver utilização recente de banda"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Ver histórico das mensagens de registro"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Ver documentação de ajuda"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Configurar Vidalia"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Obter versão e informações de licenciamento"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Fechar Vidalia"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Mostrar esta janela no inicio"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Esconder"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Esconder esta janela"
-
-msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Falha ao restabelecer senha"
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-"Vidalia tentou restabelecer a senha de controle do Tor, no entanto foi "
-"incapaz de reiniciar este aplicativo. Por favor verifique se não existe "
-"outra instancia do Tor em execução."
-
-msgctxt "MainWindow"
-msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -2095,13 +1982,31 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2119,6 +2024,16 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ""
@@ -2126,6 +2041,20 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ""
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Erro ao configurar filtro"
@@ -2383,22 +2312,14 @@ msgid "Automatically save new log messages to a file"
msgstr "Salvar, automaticamente, novas mensagens de registro para um arquivo"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "Sempre salvar novas mensagens de registro"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Sempre salvar novas mensagens de registro"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2438,10 +2359,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mapa da rede Tor"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Atualizar"
@@ -2541,6 +2458,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Ponte inválida"
@@ -2879,10 +2812,6 @@ msgid "Run as a client only"
msgstr "Executar somente como cliente"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Encaminhar tráfego para rede Tor"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Porta do servidor:"
@@ -3136,6 +3065,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3183,10 +3120,6 @@ msgid "Directory already in use by another service."
msgstr "Diretório já em uso por outro serviço."
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Form"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Serviços ocultos oferecidos"
@@ -3477,6 +3410,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "Novo"
@@ -3513,6 +3462,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Desconhecido"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Falha ao interromper o processo %1. [%2]"
@@ -3591,6 +3546,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "Sucesso"
diff --git a/src/vidalia/i18n/po/ru/vidalia_ru.po b/src/vidalia/i18n/po/ru/vidalia_ru.po
index 9e5f111..f2d74a0 100644
--- a/src/vidalia/i18n/po/ru/vidalia_ru.po
+++ b/src/vidalia/i18n/po/ru/vidalia_ru.po
@@ -3,15 +3,15 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:39+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Russian <None>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
"X-Generator: Vidalia ts2po 0.2\n"
msgctxt "AboutDialog"
@@ -235,10 +235,6 @@ msgid "Show Settings"
msgstr "Показать настройки"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor трафик"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Сброс"
@@ -278,6 +274,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Отменить"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "Начинаем HTTPS-запрос мостa ..."
@@ -431,20 +431,27 @@ msgid "Control socket is not connected."
msgstr "Контрольный сокет не подключен."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Необходим пароль"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Запомнить пароль"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"Vidalia подключилась к работающему процессу Tor, который требует пароль. "
-"Пожалуйста, введите свой пароль:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1339,10 +1346,6 @@ msgid "Browse"
msgstr "Обзор"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Запускать Tor при запуске Vidalia"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1370,6 +1373,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Проверить сейчас"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 КБ/с"
@@ -1656,34 +1663,6 @@ msgid "New Identity"
msgstr "Сменить личину"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1692,10 +1671,6 @@ msgid "View"
msgstr "Просмотр"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Помощь"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Ошибка при запуске веб-браузера"
@@ -1808,10 +1783,6 @@ msgid "Tor is shutting down"
msgstr "Tor останавливается"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Остановить Tor прямо сейчас"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Остановить Tor"
@@ -1900,19 +1871,6 @@ msgstr ""
"функций Vidalia могут быть недоступны."
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Ошибка аутентификации"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-"Vidalia не смогла подтвердить подлинность программного обеспечения Tor. (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr "Пожалуйста, проверьте настройки управления портом аутентификации."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Обновление Tor доступно"
@@ -1956,85 +1914,11 @@ msgid "Status"
msgstr "Статус"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Ярлыки Vidalia"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Настройка сервера\n"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Настройте сервер и помогите росту сети"
-
-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 устарела или не рекомендуется."
@@ -2098,16 +1982,32 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "не удалось (%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
-"Ваш сервер выключается. Нажмите на кнопку \"Стоп\" для остановки вашего "
-"сервера сейчас."
msgctxt "MainWindow"
msgid ""
@@ -2130,6 +2030,16 @@ msgstr ""
"или сообщения об ошибках."
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "не удалось (%1)"
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ", вероятно, Telnet,"
@@ -2137,6 +2047,22 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", вероятно, клиент электронной почты,"
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+"Ваш сервер выключается. Нажмите на кнопку \"Стоп\" для остановки вашего "
+"сервера сейчас."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Ошибка при установке фильтра"
@@ -2392,22 +2318,14 @@ msgid "Automatically save new log messages to a file"
msgstr "Автоматически сохранять новые сообщения в файл"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "Всегда сохранять новые сообщения"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Всегда сохранять новые сообщения"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2452,10 +2370,6 @@ msgid ""
msgstr "Невозможно записать файл %1 %2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Карта сети Tor"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Обновить"
@@ -2555,6 +2469,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Неверный мост"
@@ -2899,10 +2829,6 @@ msgid "Run as a client only"
msgstr "Режим работы только как клиент"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Серверный трафик сети Tor"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Порт сервера:"
@@ -3162,6 +3088,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Зеркало каталога серверов"
@@ -3211,10 +3145,6 @@ msgid "Directory already in use by another service."
msgstr "Каталог уже используется другой службой."
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Форма"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Предоставленный скрытый сервис"
@@ -3505,6 +3435,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "Создать"
@@ -3541,6 +3487,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Неизвестно"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Процесс %1 не удалось остановить. [%2]"
@@ -3619,6 +3571,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "Успех"
diff --git a/src/vidalia/i18n/po/sco/vidalia_sco.po b/src/vidalia/i18n/po/sco/vidalia_sco.po
index c86346d..0a76d76 100644
--- a/src/vidalia/i18n/po/sco/vidalia_sco.po
+++ b/src/vidalia/i18n/po/sco/vidalia_sco.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:10+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:43+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/son/vidalia_son.po b/src/vidalia/i18n/po/son/vidalia_son.po
index 5db0438..cc59096 100644
--- a/src/vidalia/i18n/po/son/vidalia_son.po
+++ b/src/vidalia/i18n/po/son/vidalia_son.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:10+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:44+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/su/vidalia_su.po b/src/vidalia/i18n/po/su/vidalia_su.po
index c024e6c..c7779a7 100644
--- a/src/vidalia/i18n/po/su/vidalia_su.po
+++ b/src/vidalia/i18n/po/su/vidalia_su.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:16+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/sw/vidalia_sw.po b/src/vidalia/i18n/po/sw/vidalia_sw.po
index 357eae2..d7e175a 100755
--- a/src/vidalia/i18n/po/sw/vidalia_sw.po
+++ b/src/vidalia/i18n/po/sw/vidalia_sw.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:12+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/ta/vidalia_ta.po b/src/vidalia/i18n/po/ta/vidalia_ta.po
index 14652ec..bff8877 100644
--- a/src/vidalia/i18n/po/ta/vidalia_ta.po
+++ b/src/vidalia/i18n/po/ta/vidalia_ta.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:12+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/te/vidalia_te.po b/src/vidalia/i18n/po/te/vidalia_te.po
index 50a36bc..65ad3df 100644
--- a/src/vidalia/i18n/po/te/vidalia_te.po
+++ b/src/vidalia/i18n/po/te/vidalia_te.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:12+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/templates/vidalia.pot b/src/vidalia/i18n/po/templates/vidalia.pot
index 3070fb0..eb6964e 100644
--- a/src/vidalia/i18n/po/templates/vidalia.pot
+++ b/src/vidalia/i18n/po/templates/vidalia.pot
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Vidalia\n"
"Report-Msgid-Bugs-To: translations at vidalia-project.net\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
@@ -223,10 +223,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -266,6 +262,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -419,15 +419,21 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid "Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid "You will need to shut down the Tor process before Vidalia can launch a new one."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Vidalia has connected to a running Tor process that requires a password. Please enter your control password:"
+msgid "Vidalia can try to restart Tor for you. Doing so will close all currently active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1315,10 +1321,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1346,6 +1348,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1623,34 +1629,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1659,10 +1637,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1775,10 +1749,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1855,18 +1825,6 @@ msgid "Vidalia was unable to register for some events. Many of Vidalia's feature
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1903,127 +1861,111 @@ 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"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "The currently installed version of Tor is out of date or no longer recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid "Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Tor has automatically closed your connection in order to protect your anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "There are no new Tor software packages available for your computer at this time."
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia tried to reset Tor's control password, but was not able to restart the Tor software. Please check your Task Manager to ensure there are no other Tor processes running."
+msgid "Anything sent over 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 "The currently installed version of Tor is out of date or no longer recommended."
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Would you like to check if a newer package is available for installation?"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Tor has automatically closed your connection in order to protect your anonymity."
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "There are no new Tor software packages available for your computer at this time."
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
+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 "The following error occurred:"
+msgid "Vidalia tried to restart Tor, but was not able to. Please check your Task Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
-msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2."
+msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid "Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
@@ -2032,23 +1974,11 @@ msgid "Your relay is shutting down.\n"
msgstr ""
msgctxt "MainWindow"
-msgid "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ", probably Telnet,"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2304,19 +2234,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2353,10 +2275,6 @@ msgid "Cannot write file %1\n"
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2456,6 +2374,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2769,10 +2703,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3005,6 +2935,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3046,10 +2984,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3269,6 +3203,22 @@ msgctxt "StatusEventWidget"
msgid "Your relay is now online and available for Tor clients to use. You should see an increase in network traffic shown by the Bandwidth Graph within a few hours as more clients learn about your relay. Thank you for contributing to the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3305,6 +3255,10 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid "Vidalia has not started Tor. You need to stop Tor through the interface you started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3381,6 +3335,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/tg/vidalia_tg.po b/src/vidalia/i18n/po/tg/vidalia_tg.po
index d5ca29d..041d2e1 100644
--- a/src/vidalia/i18n/po/tg/vidalia_tg.po
+++ b/src/vidalia/i18n/po/tg/vidalia_tg.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:12+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/th/vidalia_th.po b/src/vidalia/i18n/po/th/vidalia_th.po
index d8b80cf..8c0768f 100644
--- a/src/vidalia/i18n/po/th/vidalia_th.po
+++ b/src/vidalia/i18n/po/th/vidalia_th.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 19:56+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -232,10 +232,6 @@ msgid "Show Settings"
msgstr "แสดง ส่วนตั้งค่า"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "การใช้ Bandwidth ของ Tor"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "ล้างทิ้ง"
@@ -275,6 +271,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "ยกเลิก"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -428,17 +428,26 @@ msgid "Control socket is not connected."
msgstr "ไม่ได้เชื่อมต่อกับ socket ควบคุม"
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "กรุณาใส่รหัสผ่าน"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "จดจำรหัสผ่าน"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1334,10 +1343,6 @@ msgid "Browse"
msgstr "เลือก"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "เริ่มการทำงาน Tor ด้วยเมื่อ Vidalia เริ่มทำงาน"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1365,6 +1370,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1654,34 +1663,6 @@ msgid "New Identity"
msgstr "สร้างตัวตนใหม่"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1690,10 +1671,6 @@ msgid "View"
msgstr "มองดู"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "ส่วนช่วยเหลือ Vidalia"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "ผิดพลาดในการสั่งเริ่มโปรแกรมท่องอินเตอร์เน็ต(web browser)"
@@ -1806,10 +1783,6 @@ msgid "Tor is shutting down"
msgstr "กำลังปิดการทำงาน Tor"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "หยุด Tor เดี๋ยวนี้"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "หยุด Tor"
@@ -1898,18 +1871,6 @@ msgstr ""
"ทำให้ความสามารถหลายๆอย่างของ Vidalia อาจไม่สามารถใช้งานได้"
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "ผิดพลาด ในการขอสิทธิ"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia ไม่สามารถขอสิทธิเข้าถึงโปรแกรม Tor ได้. (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr "กรุณาตรวจสอบ การตั้งค่าการให้สิทธิ port ควบคุมของคุณ"
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "มีโปรแกรม Tor รุ่นใหม่กว่าที่ใช้อยู่ปัจจุบัน"
@@ -1952,85 +1913,11 @@ msgid "Status"
msgstr "สถานะ"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "ปุ่มลัด Vidalia"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "ตั้งตนเป็น Relay"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "ตั้งตนเป็น Relay ช่วยเหลือขยายเครือข่ายให้ Tor"
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "ดูแผนที่เครือข่าย"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "ดูแผนที่เครือข่าย Tor"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "เปลี่ยนตัวตนใหม่"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "จะส่งผลให้เราย้ายไปใช้ จุดออกของ Tor เครื่องใหม่ จนดูเหมือนเป็นอีกคน"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "ดูระดับการใช้ bandwidth"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "ดูข้อความสิ่งที่ทำไป"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "ดูเอกสารช่วยเหลือ"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "ตั้งค่า Vidalia"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "ดู รุ่น และ ข้อมูลลิขสิทธิ"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "ปิดโปรแกรม Vidalia"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "แสดงหน้าจอนี้เมื่อเริ่มโปรแกรม"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "ซ่อน"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "ซ่อนหน้าจอนี้"
-
-msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "ล้มเหลว ในการล้างรหัสผ่านทิ้ง"
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-"Vidalia พยายามล้างรหัสผ่าน ในการควบคุม Tor ทิ้ง. "
-"แต่ไม่สามารถเริ่มการทำงานโปรแกรม Tor ใหม่ได้. กรุณาตรวจสอบแก้ไขบน Task "
-"Manager เพื่อให้มั่นใจได้ว่า Tor ตัวเดิม ไม่ได้ทำงานอยู่."
-
-msgctxt "MainWindow"
-msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -2090,13 +1977,31 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2114,6 +2019,16 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ""
@@ -2121,6 +2036,20 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ""
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "ผิดพลาด ในการตั้งค่าตัวกรอง"
@@ -2374,22 +2303,14 @@ msgid "Automatically save new log messages to a file"
msgstr "จัดเก็บ ข้อความสิ่งที่เพิ่งทำไปใหม่ๆ ลงไฟล์โดยอัตโนมัติ"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "จัดเก็บข้อความสิ่งที่เพิ่งทำไปใหม่ๆเสมอ"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "จัดเก็บข้อความสิ่งที่เพิ่งทำไปใหม่ๆเสมอ"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2429,10 +2350,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "แผนที่เครือข่าย Tor"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "แสดงใหม่"
@@ -2532,6 +2449,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Bridge ไม่ถูกต้อง "
@@ -2873,10 +2806,6 @@ msgid "Run as a client only"
msgstr "เป็นตัวลูก (ใช้งานอย่างเดียว)"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "เป็น Tor Relay (ช่วยส่งผ่านข้อมูลต่างๆให้เครือข่าย Tor ด้วย)"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "เลข Port Relay:"
@@ -3134,6 +3063,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3181,10 +3118,6 @@ msgid "Directory already in use by another service."
msgstr "ที่จัดเก็บนี้มีบริการอื่นใช้อยู่แล้ว"
msgctxt "ServicePage"
-msgid "Form"
-msgstr "แบบฟอร์ม"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "การให้บริการแบบซ่อนตัวตน"
@@ -3473,6 +3406,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "สร้างใหม่"
@@ -3509,6 +3458,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "ไม่ทราบ"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "ล้มเหลวในการหยุดการทำงาน %1. [%2]"
@@ -3587,6 +3542,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "สำเร็จ"
diff --git a/src/vidalia/i18n/po/ti/vidalia_ti.po b/src/vidalia/i18n/po/ti/vidalia_ti.po
index a862bab..6528cb1 100644
--- a/src/vidalia/i18n/po/ti/vidalia_ti.po
+++ b/src/vidalia/i18n/po/ti/vidalia_ti.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:12+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/tk/vidalia_tk.po b/src/vidalia/i18n/po/tk/vidalia_tk.po
index b2ae1d3..4c3059b 100644
--- a/src/vidalia/i18n/po/tk/vidalia_tk.po
+++ b/src/vidalia/i18n/po/tk/vidalia_tk.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:12+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:45+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/tr/vidalia_tr.po b/src/vidalia/i18n/po/tr/vidalia_tr.po
index 8e3e9b0..4b839b8 100644
--- a/src/vidalia/i18n/po/tr/vidalia_tr.po
+++ b/src/vidalia/i18n/po/tr/vidalia_tr.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 19:56+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -234,10 +234,6 @@ msgid "Show Settings"
msgstr "Ayarları göster"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor Ağ Kullanımı"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Sıfırla"
@@ -277,6 +273,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "İptal"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "HTTPS isteğini başlatıyor..."
@@ -430,20 +430,27 @@ msgid "Control socket is not connected."
msgstr "Kontrol soketi bağlı değil."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Parola Gerekiyor"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Parolamı Hatırla"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"Vidalia parola gerektiren bir Tor sürecine bağlandı. Lütfen kontrol "
-"parolasını giriniz:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1338,10 +1345,6 @@ msgid "Browse"
msgstr "Gözat"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Vidalia başladığında, Tor yazılımını da başlat"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1369,6 +1372,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "Şimdi kontrol et"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1656,34 +1663,6 @@ msgid "New Identity"
msgstr "Yeni Bağlantı"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1692,10 +1671,6 @@ msgid "View"
msgstr "Görünüm"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Yardım"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Web gezgini başlatırlırken hata oluştu"
@@ -1808,10 +1783,6 @@ msgid "Tor is shutting down"
msgstr "Kapatılıyor"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Durdur"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Durdur"
@@ -1899,18 +1870,6 @@ msgstr ""
"fonksiyonu çalışmıyor olabilir."
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Kimlik doğrulamada hata oluştu"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Tor'un doğruluğu sağlanamadı.(%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr "Lütfen kimlik doğrulama portunuzu kontrol edin."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Tor'un yeni güncelleştirmesi var"
@@ -1954,85 +1913,11 @@ 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 "Kendi ağınızı kurarak bu hizmetin büyümesine yardımcı olabilirsiniz."
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Ağı göster"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Tor Ağını haritada göster"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Kimliği Yenile"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Yeni bağlantılar oluşturur"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Band kullanımı"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Günlük kayıtları"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Yardım"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Ayarlar"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Sürüm ve Lisans"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Çıkış"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Başlangıçta göster"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Gizle"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Pencereyi gizle"
-
-msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Şifre sıfırlanamadı"
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-"Vidilia kontrol şifresinizi sıfırlamayı denedi, ama başaramadı.Lütfen "
-"programı yeniden başlatın.Ayrıca görev yöneticinizden başka tor programının "
-"çalışmadığından emin olun."
-
-msgctxt "MainWindow"
-msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -2095,14 +1980,32 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "Hata(%1)"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
-msgstr "Bağlantınız sonlandırılıyor."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
+msgstr ""
msgctxt "MainWindow"
msgid ""
@@ -2125,6 +2028,16 @@ msgstr ""
"Günlük kayıtlarından hata sebebini kontrol edebilirsiniz."
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "Hata(%1)"
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ", Telnet,"
@@ -2132,6 +2045,20 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ", e-posta istemcisi,"
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr "Bağlantınız sonlandırılıyor."
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Filtreler ayarlanırken hata oluştu"
@@ -2385,22 +2312,14 @@ msgid "Automatically save new log messages to a file"
msgstr "Yeni günlük mesajlarını otomatik kaydet"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "Yeni günlük mesajlarını herzaman kaydet"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Yeni günlük mesajlarını herzaman kaydet"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2449,10 +2368,6 @@ msgstr ""
"%2."
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor Ağ haritası"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Yenile"
@@ -2552,6 +2467,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Hatalı köprü"
@@ -2891,10 +2822,6 @@ msgid "Run as a client only"
msgstr "Sadece kullanıcı olarak çalıştır"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tor ağının bir parçası olmak istiyorum"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Aktarım portu:"
@@ -3150,6 +3077,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Geçit dizinini yansıla"
@@ -3198,10 +3133,6 @@ msgid "Directory already in use by another service."
msgstr "Bu klasör zaten başka bir hizmet tarafından kullanılıyor."
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Form"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Arkaplan hizmetleri"
@@ -3490,6 +3421,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "Yeni"
@@ -3526,6 +3473,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Bilinmeyen"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "%1 işlemini durdurken hata oluştu.[%2]"
@@ -3604,6 +3557,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "Başarılı"
diff --git a/src/vidalia/i18n/po/ur/vidalia_ur.po b/src/vidalia/i18n/po/ur/vidalia_ur.po
index 2ca5608..219c3e1 100644
--- a/src/vidalia/i18n/po/ur/vidalia_ur.po
+++ b/src/vidalia/i18n/po/ur/vidalia_ur.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:14+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:47+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/ve/vidalia_ve.po b/src/vidalia/i18n/po/ve/vidalia_ve.po
index ed968ee..a3e9723 100644
--- a/src/vidalia/i18n/po/ve/vidalia_ve.po
+++ b/src/vidalia/i18n/po/ve/vidalia_ve.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:15+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:48+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/vi/vidalia_vi.po b/src/vidalia/i18n/po/vi/vidalia_vi.po
index def62ba..49489eb 100755
--- a/src/vidalia/i18n/po/vi/vidalia_vi.po
+++ b/src/vidalia/i18n/po/vi/vidalia_vi.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 19:54+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr "Hiện những Thiết lập"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Cách dùng Tor Bandwidth"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "Đặt lại"
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "Thôi"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr "Socket kiểm soát không được kết nối."
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Mật khẩu bắt buộc"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Ghi nhớ mật khẩu của tôi"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr "Trình duyệt"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Bắt đầu phần mềm Tor khi bắt đầu Vidalia"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "The-onion-router"
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/s"
@@ -1651,34 +1660,6 @@ msgid "New Identity"
msgstr "Giám định Mới"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1687,10 +1668,6 @@ msgid "View"
msgstr "Xem"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia Trợ giúp"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "Lỗi bắt đầu trình duyệt web"
@@ -1803,10 +1780,6 @@ msgid "Tor is shutting down"
msgstr "Tor là tắt"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Dừng Tor Now"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "Dừng Tor"
@@ -1895,19 +1868,6 @@ msgstr ""
"của Vidalia có thể không có sẵn."
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Lỗi xác thực"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia không thể xác nhận phần mềm Tor. (% 1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-"Vui lòng kiểm tra các thiết lập xác thực cổng truy nhập điều khiển của bạn."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "Có sẵn Cập nhật Tor "
@@ -1951,85 +1911,11 @@ msgid "Status"
msgstr "Tình trạng"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "đường tắt Vidalia"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Thiết lập tiếp nhận"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Thiết lập một chuyển tiếp và giúp phát triển mạng lưới"
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Xem các mạng"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Xem một bản đồ của mạng Tor"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Sử dụng một Identity mới"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Làm cho các kết nối tiếp theo tro*? tha`nh mới"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Xem băng thông sử dụng gần đây"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Xem lịch sử tin đăng nhập "
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Xem tài liệu trợ giúp"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Cấu hình Vidalia"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Xem thông tin về phiên bản và giấy phép"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Thoát khỏi Vidalia"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Hiển thị cửa sổ này lu'c khởi động"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "giấu"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Ẩn cửa sổ này"
-
-msgctxt "MainWindow"
msgid "Password Reset Failed"
msgstr "Đặt lại mật khẩu bị lỗi"
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
-msgstr ""
-"Vidalia đã thu*? đặt lại mật khẩu điều khiển Tor, nhưng đã không thể khởi "
-"động lại phần mềm Tor. Vui lòng kiểm tra quản lý công việc của bạn để đảm "
-"bảo không có tiến trình Tor khác đang chạy."
-
-msgctxt "MainWindow"
-msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
@@ -2089,13 +1975,31 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
@@ -2113,6 +2017,16 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr ""
@@ -2120,6 +2034,20 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr ""
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "Lỗi Thiết Filter"
@@ -2377,22 +2305,14 @@ msgid "Automatically save new log messages to a file"
msgstr "Tự động lưu các tin nhắn đăng nhập mới vào một tập tin"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "Luôn luôn Đăng Lưu Thông điệp mới"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "Luôn luôn Đăng Lưu Thông điệp mới"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2432,10 +2352,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Bản đồ mạng Tor"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Cập nhật"
@@ -2535,6 +2451,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "Cầu không hợp lệ"
@@ -2874,10 +2806,6 @@ msgid "Run as a client only"
msgstr "Chạy chi? như một khách hàng"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tiếp sức giao thông cho mạng Tor"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "Cổng tiếp sức:"
@@ -3135,6 +3063,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3181,10 +3117,6 @@ msgid "Directory already in use by another service."
msgstr "Thư mục đã được sử dụng bởi dịch vụ khác."
msgctxt "ServicePage"
-msgid "Form"
-msgstr "Mẫu"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "Những dịch vụ ẩn được cung cấp"
@@ -3475,6 +3407,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "Mới"
@@ -3511,6 +3459,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "Không biết"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "Quá trình % 1 không ngừng. [% 2]"
@@ -3589,6 +3543,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "Thành công"
diff --git a/src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po b/src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po
index 663ed64..bfd1279 100644
--- a/src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po
+++ b/src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-09 13:17+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 19:59+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -234,10 +234,6 @@ msgid "Show Settings"
msgstr "显示设定"
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor 带宽使用"
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr "复位设定"
@@ -277,6 +273,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr "取消"
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr "开始 HTTPS 网桥请求..."
@@ -430,18 +430,27 @@ msgid "Control socket is not connected."
msgstr "控制接口当前未连接。"
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "需要密码"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "记住我的密码"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
-msgstr "Vidalia 已经连接至一个运行中的需要密码的 Tor 进程。请输入您的控制密码："
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
+msgstr ""
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -1336,10 +1345,6 @@ msgid "Browse"
msgstr "浏览"
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Vidalia 启动时运行 Tor 软件"
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr "Tor"
@@ -1367,6 +1372,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr "现在检查"
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr "%1 KB/秒"
@@ -1649,34 +1658,6 @@ msgid "New Identity"
msgstr "更换身份"
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr "Tor"
@@ -1685,10 +1666,6 @@ msgid "View"
msgstr "查看"
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Vidalia 帮助"
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr "启动浏览器时发生了错误"
@@ -1801,10 +1778,6 @@ msgid "Tor is shutting down"
msgstr "正在关闭 Tor"
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "立刻停止 Tor"
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr "停止 Tor"
@@ -1887,18 +1860,6 @@ msgid ""
msgstr "Vidalia 无法注册某些事件，可能造成 Vidalia 的很多功能不可用。"
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "认证出错"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia无法通过Tor软件的认证。(%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr "请检查控制端口验证设定."
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr "有可用的 Tor 更新"
@@ -1939,82 +1900,11 @@ msgid "Status"
msgstr "状态"
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Vidalia 快捷方式"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "设置中继服务器"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "创建中继节点帮助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版本已经过时，不再推荐使用。"
@@ -2074,16 +1964,32 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "failed (%1)"
-msgstr "失败（%1）"
+msgid "toolBar"
+msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid "Start"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Stop"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Restart"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Reload Tor's config"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Actions"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
-"正在关闭您的中继服务。\n"
-"再次单击'停止'立刻关闭中继。"
msgctxt "MainWindow"
msgid ""
@@ -2106,6 +2012,16 @@ msgstr ""
"请检查消息日志获取最近的警告及错误信息。"
msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr "失败（%1）"
+
+msgctxt "MainWindow"
msgid ", probably Telnet,"
msgstr "，也许是Telnet程序，"
@@ -2113,6 +2029,22 @@ msgctxt "MainWindow"
msgid ", probably an email client,"
msgstr "，也许是Email客户端，"
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+"正在关闭您的中继服务。\n"
+"再次单击'停止'立刻关闭中继。"
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
+
msgctxt "MessageLog"
msgid "Error Setting Filter"
msgstr "设定过滤条件时发生错误"
@@ -2366,22 +2298,14 @@ msgid "Automatically save new log messages to a file"
msgstr "自动保存新的消息内容至文件"
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
+msgid "Always Save New Log Messages"
+msgstr "总是保存新消息"
msgctxt "MessageLog"
-msgid "Advanced"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
-msgstr "总是保存新消息"
-
-msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2426,10 +2350,6 @@ msgstr ""
"%2。"
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor 网络地图"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "刷新"
@@ -2529,6 +2449,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr "Ctrl+F"
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr "无效网桥"
@@ -2854,10 +2790,6 @@ msgid "Run as a client only"
msgstr "仅运行客户端功能"
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Tor 网络中继"
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr "中继端口:"
@@ -3104,6 +3036,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "镜像中继目录"
@@ -3150,10 +3090,6 @@ msgid "Directory already in use by another service."
msgstr "此目录已被其他服务占用。"
msgctxt "ServicePage"
-msgid "Form"
-msgstr "表单"
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr "已提供隐藏服务"
@@ -3442,6 +3378,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "新建"
@@ -3478,6 +3430,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr "未知"
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr "进程 %1 停止失败. [%2]"
@@ -3556,6 +3514,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "成功"
diff --git a/src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po b/src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po
index 5e9cdfd..6877ae2 100755
--- a/src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po
+++ b/src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:12+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:46+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/i18n/po/zu/vidalia_zu.po b/src/vidalia/i18n/po/zu/vidalia_zu.po
index 485fb39..68927a4 100644
--- a/src/vidalia/i18n/po/zu/vidalia_zu.po
+++ b/src/vidalia/i18n/po/zu/vidalia_zu.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-09 13:05+0000\n"
-"PO-Revision-Date: 2011-03-18 11:16+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-08 18:49+0000\n"
"Last-Translator: \n"
"Language-Team: translations at vidalia-project.net\n"
"MIME-Version: 1.0\n"
@@ -231,10 +231,6 @@ msgid "Show Settings"
msgstr ""
msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr ""
-
-msgctxt "BandwidthGraph"
msgid "Reset"
msgstr ""
@@ -274,6 +270,10 @@ msgctxt "BandwidthGraph"
msgid "Cancel"
msgstr ""
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
+
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
msgstr ""
@@ -427,17 +427,26 @@ msgid "Control socket is not connected."
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
+msgid "Problem connecting to Tor"
msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
msgctxt "ControlSocket"
@@ -1333,10 +1342,6 @@ msgid "Browse"
msgstr ""
msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr ""
-
-msgctxt "GeneralPage"
msgid "Tor"
msgstr ""
@@ -1364,6 +1369,10 @@ msgctxt "GeneralPage"
msgid "Check Now"
msgstr ""
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
+
msgctxt "GraphFrame"
msgid "%1 KB/s"
msgstr ""
@@ -1646,34 +1655,6 @@ msgid "New Identity"
msgstr ""
msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor"
msgstr ""
@@ -1682,10 +1663,6 @@ msgid "View"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Error starting web browser"
msgstr ""
@@ -1798,10 +1775,6 @@ msgid "Tor is shutting down"
msgstr ""
msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Stop Tor"
msgstr ""
@@ -1884,18 +1857,6 @@ msgid ""
msgstr ""
msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-
-msgctxt "MainWindow"
msgid "Tor Update Available"
msgstr ""
@@ -1936,138 +1897,115 @@ msgid "Status"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
+msgid "Password Reset Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
+msgid ""
+"The currently installed version of Tor is out of date or no longer "
+"recommended."
msgstr ""
msgctxt "MainWindow"
-msgid "View log message history"
+msgid ""
+"Would you like to check if a newer package is available for installation?"
msgstr ""
msgctxt "MainWindow"
-msgid "View help documentation"
+msgid "Potentially Unsafe Connection"
msgstr ""
msgctxt "MainWindow"
-msgid "Configure Vidalia"
+msgid ""
+"Tor has automatically closed your connection in order to protect your "
+"anonymity."
msgstr ""
msgctxt "MainWindow"
-msgid "View version and license information"
+msgid "Update Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Exit Vidalia"
+msgid "Your software is up to date"
msgstr ""
msgctxt "MainWindow"
-msgid "Show this window on startup"
+msgid ""
+"There are no new Tor software packages available for your computer at this "
+"time."
msgstr ""
msgctxt "MainWindow"
-msgid "Hide"
+msgid "Installation Failed"
msgstr ""
msgctxt "MainWindow"
-msgid "Hide this window"
+msgid "Vidalia was unable to install your software updates."
msgstr ""
msgctxt "MainWindow"
-msgid "Password Reset Failed"
+msgid "The following error occurred:"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
+"One of your applications%1appears to be making a potentially unencrypted and"
+" unsafe connection to port %2."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"The currently installed version of Tor is out of date or no longer "
-"recommended."
+"Anything sent over this connection could be monitored. Please check your "
+"application's configuration and use only encrypted protocols, such as SSL, "
+"if possible."
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Would you like to check if a newer package is available for installation?"
+msgid "toolBar"
msgstr ""
msgctxt "MainWindow"
-msgid "Potentially Unsafe Connection"
+msgid "Start"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Tor has automatically closed your connection in order to protect your "
-"anonymity."
+msgid "Stop"
msgstr ""
msgctxt "MainWindow"
-msgid "Update Failed"
+msgid "Restart"
msgstr ""
msgctxt "MainWindow"
-msgid "Your software is up to date"
+msgid "Reload Tor's config"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"There are no new Tor software packages available for your computer at this "
-"time."
+msgid "Actions"
msgstr ""
msgctxt "MainWindow"
-msgid "Installation Failed"
+msgid "Bootstrapping torrc from %1 to %2"
msgstr ""
msgctxt "MainWindow"
-msgid "Vidalia was unable to install your software updates."
-msgstr ""
-
-msgctxt "MainWindow"
-msgid "The following error occurred:"
+msgid ""
+"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
+"\n"
+"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"One of your applications%1appears to be making a potentially unencrypted and"
-" unsafe connection to port %2."
+"Vidalia detected that the Tor software exited unexpectedly.\n"
+"\n"
+"Please check the message log for recent warning or error messages."
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Anything sent over this connection could be monitored. Please check your "
-"application's configuration and use only encrypted protocols, such as SSL, "
-"if possible."
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
msgstr ""
msgctxt "MainWindow"
@@ -2075,31 +2013,25 @@ msgid "failed (%1)"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"Your relay is shutting down.\n"
-"Click 'Stop' again to stop your relay now."
+msgid ", probably Telnet,"
msgstr ""
msgctxt "MainWindow"
-msgid ""
-"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n"
-"\n"
-"Would you like to shutdown gracefully and give clients time to find a new relay?"
+msgid ", probably an email client,"
msgstr ""
msgctxt "MainWindow"
msgid ""
-"Vidalia detected that the Tor software exited unexpectedly.\n"
-"\n"
-"Please check the message log for recent warning or error messages."
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
msgstr ""
msgctxt "MainWindow"
-msgid ", probably Telnet,"
+msgid "Error reloading configuration"
msgstr ""
msgctxt "MainWindow"
-msgid ", probably an email client,"
+msgid "Vidalia was unable to reload Tor's configuration."
msgstr ""
msgctxt "MessageLog"
@@ -2355,19 +2287,11 @@ msgid "Automatically save new log messages to a file"
msgstr ""
msgctxt "MessageLog"
-msgid "Basic"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr ""
-
-msgctxt "MessageLog"
-msgid "Advanced"
+msgid "Always Save New Log Messages"
msgstr ""
msgctxt "MessageLog"
-msgid "Always Save New Log Messages"
+msgid "toolbar"
msgstr ""
msgctxt "MessageLog"
@@ -2410,10 +2334,6 @@ msgid ""
msgstr ""
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr ""
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr ""
@@ -2513,6 +2433,22 @@ msgctxt "NetViewer"
msgid "Ctrl+F"
msgstr ""
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Relay"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Connection"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Status"
+msgstr ""
+
msgctxt "NetworkPage"
msgid "Invalid Bridge"
msgstr ""
@@ -2838,10 +2774,6 @@ msgid "Run as a client only"
msgstr ""
msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr ""
-
-msgctxt "ServerPage"
msgid "Relay Port:"
msgstr ""
@@ -3086,6 +3018,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr ""
@@ -3130,10 +3070,6 @@ msgid "Directory already in use by another service."
msgstr ""
msgctxt "ServicePage"
-msgid "Form"
-msgstr ""
-
-msgctxt "ServicePage"
msgid "Provided Hidden Services"
msgstr ""
@@ -3422,6 +3358,22 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr ""
@@ -3458,6 +3410,12 @@ msgctxt "Stream"
msgid "Unknown"
msgstr ""
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
+
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
msgstr ""
@@ -3536,6 +3494,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr ""
diff --git a/src/vidalia/log/LogFile.cpp b/src/vidalia/log/LogFile.cpp
index 310294f..a4ec760 100644
--- a/src/vidalia/log/LogFile.cpp
+++ b/src/vidalia/log/LogFile.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/log/LogFile.h b/src/vidalia/log/LogFile.h
index d01f9d7..6e46522 100644
--- a/src/vidalia/log/LogFile.h
+++ b/src/vidalia/log/LogFile.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/log/LogHeaderView.cpp b/src/vidalia/log/LogHeaderView.cpp
index c62b7a1..1b04d3a 100644
--- a/src/vidalia/log/LogHeaderView.cpp
+++ b/src/vidalia/log/LogHeaderView.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/log/LogHeaderView.h b/src/vidalia/log/LogHeaderView.h
index 6223d73..96491ef 100644
--- a/src/vidalia/log/LogHeaderView.h
+++ b/src/vidalia/log/LogHeaderView.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/log/LogMessageColumnDelegate.cpp b/src/vidalia/log/LogMessageColumnDelegate.cpp
index 8821438..3baa749 100644
--- a/src/vidalia/log/LogMessageColumnDelegate.cpp
+++ b/src/vidalia/log/LogMessageColumnDelegate.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/log/LogMessageColumnDelegate.h b/src/vidalia/log/LogMessageColumnDelegate.h
index dbf9ca6..6f16b38 100644
--- a/src/vidalia/log/LogMessageColumnDelegate.h
+++ b/src/vidalia/log/LogMessageColumnDelegate.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/log/LogTreeItem.cpp b/src/vidalia/log/LogTreeItem.cpp
index e7b6598..e8842bc 100644
--- a/src/vidalia/log/LogTreeItem.cpp
+++ b/src/vidalia/log/LogTreeItem.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/log/LogTreeItem.h b/src/vidalia/log/LogTreeItem.h
index a402011..48426b6 100644
--- a/src/vidalia/log/LogTreeItem.h
+++ b/src/vidalia/log/LogTreeItem.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/log/LogTreeWidget.cpp b/src/vidalia/log/LogTreeWidget.cpp
index 0124a63..0936b78 100644
--- a/src/vidalia/log/LogTreeWidget.cpp
+++ b/src/vidalia/log/LogTreeWidget.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/log/LogTreeWidget.h b/src/vidalia/log/LogTreeWidget.h
index ad1dd91..2d9ada8 100644
--- a/src/vidalia/log/LogTreeWidget.h
+++ b/src/vidalia/log/LogTreeWidget.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/log/MessageLog.cpp b/src/vidalia/log/MessageLog.cpp
index e15799e..0f1c0c9 100644
--- a/src/vidalia/log/MessageLog.cpp
+++ b/src/vidalia/log/MessageLog.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -26,6 +26,8 @@
#include <QMessageBox>
#include <QClipboard>
+#include <QToolBar>
+
/* Message log settings */
#define SETTING_MSG_FILTER "MessageFilter"
#define SETTING_MAX_MSG_COUNT "MaxMsgCount"
@@ -54,8 +56,9 @@
* \param parent The parent widget of this MessageLog object.
* \param flags Any desired window creation flags.
*/
-MessageLog::MessageLog(QWidget *parent, Qt::WFlags flags)
-: VidaliaWindow("MessageLog", parent, flags)
+MessageLog::MessageLog(QStatusBar *st, QWidget *parent)
+: VidaliaTab(tr("Message Log"), "MessageLog", parent),
+ _statusBar(st)
{
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
@@ -77,7 +80,8 @@ MessageLog::MessageLog(QWidget *parent, Qt::WFlags flags)
/* Sort in ascending chronological order */
ui.listMessages->sortItems(LogTreeWidget::TimeColumn,
Qt::AscendingOrder);
- ui.listNotifications->sortItems(0, Qt::AscendingOrder);
+
+ ui.frmSettings->setVisible(false);
}
/** Default Destructor. Simply frees up any memory allocated for member
@@ -121,6 +125,19 @@ MessageLog::createActions()
connect(ui.btnBrowse, SIGNAL(clicked()),
this, SLOT(browse()));
+ QToolBar *tb = new QToolBar(tr("toolbar"));
+ tb->addAction(ui.actionSave_All);
+ tb->addAction(ui.actionSave_Selected);
+ tb->addAction(ui.actionCopy);
+ tb->addAction(ui.actionSelect_All);
+ tb->addAction(ui.actionFind);
+ tb->addAction(ui.actionClear);
+ tb->addAction(ui.actionSettings);
+ tb->addAction(ui.actionHelp);
+
+ tb->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+ ui.verticalLayout->insertWidget(0, tb);
+
#if defined(Q_WS_MAC)
ui.actionHelp->setShortcut(QString("Ctrl+?"));
#endif
@@ -152,6 +169,7 @@ void
MessageLog::retranslateUi()
{
ui.retranslateUi(this);
+ setTitle(tr("Message Log"));
setToolTips();
}
@@ -164,7 +182,6 @@ MessageLog::loadSettings()
DEFAULT_MAX_MSG_COUNT).toUInt();
ui.spnbxMaxCount->setValue(maxMsgCount);
ui.listMessages->setMaximumMessageCount(maxMsgCount);
- ui.listNotifications->setMaximumItemCount(maxMsgCount);
/* Set whether or not logging to file is enabled */
_enableLogging = getSetting(SETTING_ENABLE_LOGFILE,
@@ -262,7 +279,6 @@ MessageLog::saveSettings()
/* Update the maximum displayed item count */
saveSetting(SETTING_MAX_MSG_COUNT, ui.spnbxMaxCount->value());
ui.listMessages->setMaximumMessageCount(ui.spnbxMaxCount->value());
- ui.listNotifications->setMaximumItemCount(ui.spnbxMaxCount->value());
/* Save message filter and refilter the list */
uint filter = 0;
@@ -351,29 +367,20 @@ MessageLog::save(const QStringList &messages)
void
MessageLog::saveSelected()
{
- if (ui.tabWidget->currentIndex() == 0)
- save(ui.listNotifications->selectedEvents());
- else
- save(ui.listMessages->selectedMessages());
+ save(ui.listMessages->selectedMessages());
}
/** Saves all shown messages to a file. */
void
MessageLog::saveAll()
{
- if (ui.tabWidget->currentIndex() == 0)
- save(ui.listNotifications->allEvents());
- else
- save(ui.listMessages->allMessages());
+ save(ui.listMessages->allMessages());
}
void
MessageLog::selectAll()
{
- if (ui.tabWidget->currentIndex() == 0)
- ui.listNotifications->selectAll();
- else
- ui.listMessages->selectAll();
+ ui.listMessages->selectAll();
}
/** Copies contents of currently selected messages to the 'clipboard'. */
@@ -382,10 +389,7 @@ MessageLog::copy()
{
QString contents;
- if (ui.tabWidget->currentIndex() == 0)
- contents = ui.listNotifications->selectedEvents().join("\n");
- else
- contents = ui.listMessages->selectedMessages().join("\n");
+ contents = ui.listMessages->selectedMessages().join("\n");
if (!contents.isEmpty()) {
/* Copy the selected messages to the clipboard */
@@ -398,10 +402,7 @@ MessageLog::copy()
void
MessageLog::clear()
{
- if (ui.tabWidget->currentIndex() == 0)
- ui.listNotifications->clear();
- else
- ui.listMessages->clearMessages();
+ ui.listMessages->clearMessages();
}
/** Prompts the user for a search string. If the search string is not found in
@@ -421,18 +422,10 @@ MessageLog::find()
QTreeWidgetItem *firstItem = 0;
/* Pick the right tree widget to search based on the current tab */
- if (ui.tabWidget->currentIndex() == 0) {
- QList<StatusEventItem *> results = ui.listNotifications->find(text, true);
- if (results.size() > 0) {
- tree = ui.listNotifications;
- firstItem = dynamic_cast<QTreeWidgetItem *>(results.at(0));
- }
- } else {
- QList<LogTreeItem *> results = ui.listMessages->find(text, true);
- if (results.size() > 0) {
- tree = ui.listMessages;
- firstItem = dynamic_cast<QTreeWidgetItem *>(results.at(0));
- }
+ QList<LogTreeItem *> results = ui.listMessages->find(text, true);
+ if (results.size() > 0) {
+ tree = ui.listMessages;
+ firstItem = dynamic_cast<QTreeWidgetItem *>(results.at(0));
}
if (! firstItem) {
@@ -461,11 +454,13 @@ MessageLog::log(tc::Severity type, const QString &message)
/* This is a workaround to force Qt to update the statusbar text (if any
* is currently displayed) to reflect the new message added. */
- QString currStatusTip = ui.statusbar->currentMessage();
- if (!currStatusTip.isEmpty()) {
- currStatusTip = ui.listMessages->statusTip();
- ui.statusbar->showMessage(currStatusTip);
- }
+ QString currStatusTip;
+ if(_statusBar && _onTop)
+ currStatusTip = _statusBar->currentMessage();
+ if (!currStatusTip.isEmpty()) {
+ currStatusTip = ui.listMessages->statusTip();
+ _statusBar->showMessage(currStatusTip);
+ }
/* If we're saving log messages to a file, go ahead and do that now */
if (_enableLogging) {
diff --git a/src/vidalia/log/MessageLog.h b/src/vidalia/log/MessageLog.h
index 3462ae1..a4bad9d 100644
--- a/src/vidalia/log/MessageLog.h
+++ b/src/vidalia/log/MessageLog.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -17,7 +17,7 @@
#define _MESSAGELOG_H
#include "ui_MessageLog.h"
-#include "VidaliaWindow.h"
+#include "VidaliaTab.h"
#include "LogFile.h"
#include "TorControl.h"
#include "VidaliaSettings.h"
@@ -25,13 +25,13 @@
class LogTreeItem;
class QStringList;
-class MessageLog : public VidaliaWindow
+class MessageLog : public VidaliaTab
{
Q_OBJECT
public:
/** Default constructor **/
- MessageLog(QWidget *parent = 0, Qt::WFlags flags = 0);
+ MessageLog(QStatusBar *st = 0, QWidget *parent = 0);
/** Default destructor **/
~MessageLog();
@@ -90,6 +90,8 @@ private:
/* The log file used to store log messages. */
LogFile _logFile;
+ QStatusBar *_statusBar;
+
/** Qt Designer generatated QObject **/
Ui::MessageLog ui;
};
diff --git a/src/vidalia/log/MessageLog.ui b/src/vidalia/log/MessageLog.ui
index f5a90cf..c72c0ba 100644
--- a/src/vidalia/log/MessageLog.ui
+++ b/src/vidalia/log/MessageLog.ui
@@ -1,237 +1,273 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MessageLog</class>
- <widget class="QMainWindow" name="MessageLog">
+ <widget class="QWidget" name="MessageLog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>698</width>
- <height>625</height>
+ <width>534</width>
+ <height>521</height>
</rect>
</property>
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
<property name="windowTitle">
- <string>Message Log</string>
- </property>
- <property name="windowIcon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/32x32/format-justify-fill.png</normaloff>:/images/32x32/format-justify-fill.png</iconset>
- </property>
- <property name="statusTip">
- <string/>
- </property>
- <property name="autoFillBackground">
- <bool>true</bool>
+ <string notr="true"/>
</property>
- <property name="unifiedTitleAndToolBarOnMac">
- <bool>false</bool>
- </property>
- <widget class="QWidget" name="centralwidget">
- <layout class="QVBoxLayout">
- <property name="leftMargin">
- <number>12</number>
- </property>
- <property name="topMargin">
- <number>12</number>
- </property>
- <property name="rightMargin">
- <number>12</number>
- </property>
- <item>
- <widget class="QTabWidget" name="tabWidget">
- <property name="currentIndex">
- <number>0</number>
- </property>
- <widget class="QWidget" name="tabBasic">
- <attribute name="title">
- <string>Basic</string>
- </attribute>
- <layout class="QGridLayout" name="basicTabLayout">
- <property name="margin">
- <number>12</number>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="LogTreeWidget" name="listMessages">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="autoFillBackground">
+ <bool>false</bool>
+ </property>
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <property name="uniformRowHeights">
+ <bool>true</bool>
+ </property>
+ <property name="itemsExpandable">
+ <bool>false</bool>
+ </property>
+ <property name="sortingEnabled">
+ <bool>true</bool>
+ </property>
+ <column>
+ <property name="text">
+ <string>Time</string>
</property>
- <item row="0" column="0">
- <widget class="StatusEventWidget" name="listNotifications">
- <property name="contextMenuPolicy">
- <enum>Qt::CustomContextMenu</enum>
- </property>
- <property name="horizontalScrollBarPolicy">
- <enum>Qt::ScrollBarAsNeeded</enum>
- </property>
- <property name="showDropIndicator" stdset="0">
- <bool>false</bool>
- </property>
- <property name="alternatingRowColors">
- <bool>true</bool>
- </property>
- <property name="selectionMode">
- <enum>QAbstractItemView::ExtendedSelection</enum>
- </property>
- <property name="selectionBehavior">
- <enum>QAbstractItemView::SelectRows</enum>
- </property>
- <property name="indentation">
- <number>0</number>
- </property>
- <property name="rootIsDecorated">
- <bool>false</bool>
- </property>
- <property name="itemsExpandable">
- <bool>false</bool>
- </property>
- <property name="sortingEnabled">
- <bool>true</bool>
- </property>
- <attribute name="headerShowSortIndicator" stdset="0">
- <bool>true</bool>
- </attribute>
- <attribute name="headerShowSortIndicator" stdset="0">
- <bool>true</bool>
- </attribute>
- <column>
- <property name="text">
- <string>Tor Status</string>
- </property>
- </column>
- </widget>
- </item>
- </layout>
+ </column>
+ <column>
+ <property name="text">
+ <string>Type</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Message</string>
+ </property>
+ </column>
</widget>
- <widget class="QWidget" name="tabAdvanced">
- <attribute name="title">
- <string>Advanced</string>
- </attribute>
- <layout class="QGridLayout" name="advancedTabLayout">
+ </item>
+ <item>
+ <widget class="QFrame" name="frmSettings">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>520</width>
+ <height>183</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>520</width>
+ <height>183</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="visible">
+ <bool>true</bool>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <layout class="QGridLayout">
<property name="margin">
- <number>12</number>
+ <number>3</number>
</property>
- <item row="0" column="0">
- <widget class="LogTreeWidget" name="listMessages">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <item row="0" column="2">
+ <layout class="QHBoxLayout" name="_2">
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="_3">
+ <item>
+ <widget class="QPushButton" name="btnSaveSettings">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Saves the current Message Log settings</string>
+ </property>
+ <property name="text">
+ <string>Save Settings</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnCancelSettings">
+ <property name="minimumSize">
+ <size>
+ <width>90</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Cancels changes made to settings</string>
+ </property>
+ <property name="text">
+ <string>Cancel</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="0" rowspan="2">
+ <widget class="QGroupBox" name="groupBox">
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
- <property name="autoFillBackground">
- <bool>false</bool>
- </property>
- <property name="alternatingRowColors">
- <bool>true</bool>
- </property>
- <property name="selectionMode">
- <enum>QAbstractItemView::ExtendedSelection</enum>
- </property>
- <property name="rootIsDecorated">
- <bool>false</bool>
- </property>
- <property name="uniformRowHeights">
- <bool>true</bool>
+ <property name="title">
+ <string>Message Filter</string>
</property>
- <property name="itemsExpandable">
- <bool>false</bool>
- </property>
- <property name="sortingEnabled">
- <bool>true</bool>
- </property>
- <column>
- <property name="text">
- <string>Time</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Type</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Message</string>
- </property>
- </column>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- <item>
- <widget class="QFrame" name="frmSettings">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>520</width>
- <height>183</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>520</width>
- <height>183</height>
- </size>
- </property>
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="visible">
- <bool>false</bool>
- </property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- <layout class="QGridLayout">
- <property name="margin">
- <number>3</number>
- </property>
- <property name="spacing">
- <number>3</number>
- </property>
- <item row="0" column="2">
- <layout class="QHBoxLayout">
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <layout class="QVBoxLayout">
+ <layout class="QVBoxLayout" name="_4">
+ <item>
+ <widget class="QCheckBox" name="chkTorErr">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Error</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/emblem-important.png</normaloff>:/images/16x16/emblem-important.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkTorWarn">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Warning</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/dialog-warning.png</normaloff>:/images/16x16/dialog-warning.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkTorNote">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Notice</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/preferences-desktop-notification.png</normaloff>:/images/16x16/preferences-desktop-notification.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkTorInfo">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Info</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/dialog-information.png</normaloff>:/images/16x16/dialog-information.png</iconset>
+ </property>
+ </widget>
+ </item>
<item>
- <widget class="QPushButton" name="btnSaveSettings">
+ <widget class="QCheckBox" name="chkTorDebug">
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip">
- <string>Saves the current Message Log settings</string>
+ <string/>
</property>
<property name="text">
- <string>Save Settings</string>
+ <string>Debug</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/16x16/applications-system.png</normaloff>:/images/16x16/applications-system.png</iconset>
</property>
</widget>
</item>
+ </layout>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QGroupBox" name="grou">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="title">
+ <string>Message Log History</string>
+ </property>
+ <layout class="QHBoxLayout" name="_5">
<item>
- <widget class="QPushButton" name="btnCancelSettings">
+ <widget class="QSpinBox" name="spnbxMaxCount">
<property name="minimumSize">
<size>
- <width>90</width>
+ <width>50</width>
<height>0</height>
</size>
</property>
@@ -239,261 +275,98 @@
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip">
- <string>Cancels changes made to settings</string>
+ <string>Number of messages to display in the message log window</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight</set>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>99999</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="lblMessageCount">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
</property>
<property name="text">
- <string>Cancel</string>
+ <string>messages</string>
+ </property>
+ <property name="textFormat">
+ <enum>Qt::AutoText</enum>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
- </item>
- </layout>
- </item>
- <item row="0" column="0" rowspan="2">
- <widget class="QGroupBox" name="groupBox">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="title">
- <string>Message Filter</string>
- </property>
- <layout class="QVBoxLayout">
- <item>
- <widget class="QCheckBox" name="chkTorErr">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip">
- <string/>
- </property>
- <property name="whatsThis">
- <string/>
- </property>
- <property name="text">
- <string>Error</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/16x16/emblem-important.png</normaloff>:/images/16x16/emblem-important.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="chkTorWarn">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip">
- <string/>
- </property>
- <property name="text">
- <string>Warning</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/16x16/dialog-warning.png</normaloff>:/images/16x16/dialog-warning.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="chkTorNote">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip">
- <string/>
- </property>
- <property name="text">
- <string>Notice</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/16x16/preferences-desktop-notification.png</normaloff>:/images/16x16/preferences-desktop-notification.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="chkTorInfo">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip">
- <string/>
- </property>
- <property name="text">
- <string>Info</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/16x16/dialog-information.png</normaloff>:/images/16x16/dialog-information.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="chkTorDebug">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip">
- <string/>
- </property>
- <property name="text">
- <string>Debug</string>
- </property>
- <property name="icon">
- <iconset resource="../res/vidalia.qrc">
- <normaloff>:/images/16x16/applications-system.png</normaloff>:/images/16x16/applications-system.png</iconset>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QGroupBox" name="grou">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="title">
- <string>Message Log History</string>
- </property>
- <layout class="QHBoxLayout">
- <item>
- <widget class="QSpinBox" name="spnbxMaxCount">
- <property name="minimumSize">
- <size>
- <width>50</width>
- <height>0</height>
- </size>
- </property>
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip">
- <string>Number of messages to display in the message log window</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight</set>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>99999</number>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="lblMessageCount">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="text">
- <string>messages</string>
- </property>
- <property name="textFormat">
- <enum>Qt::AutoText</enum>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="1" column="1" colspan="2">
- <widget class="QGroupBox" name="groupBox_2">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="title">
- <string>Always Save New Log Messages </string>
- </property>
- <layout class="QGridLayout">
- <property name="margin">
- <number>6</number>
+ </widget>
+ </item>
+ <item row="1" column="1" colspan="2">
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
</property>
- <item row="1" column="1">
- <widget class="QPushButton" name="btnBrowse">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="text">
- <string>Browse</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLineEdit" name="lineFile">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QCheckBox" name="chkEnableLogFile">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip">
- <string>Enable automatically saving all new log messages to a file</string>
- </property>
- <property name="text">
- <string>Automatically save new log messages to a file</string>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QStatusBar" name="statusbar"/>
- <widget class="QToolBar" name="toolBar">
- <property name="contextMenuPolicy">
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="movable">
- <bool>false</bool>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="toolButtonStyle">
- <enum>Qt::ToolButtonTextUnderIcon</enum>
- </property>
- <attribute name="toolBarArea">
- <enum>TopToolBarArea</enum>
- </attribute>
- <attribute name="toolBarBreak">
- <bool>false</bool>
- </attribute>
- <addaction name="actionSave_All"/>
- <addaction name="actionSave_Selected"/>
- <addaction name="separator"/>
- <addaction name="actionCopy"/>
- <addaction name="actionSelect_All"/>
- <addaction name="actionFind"/>
- <addaction name="actionClear"/>
- <addaction name="separator"/>
- <addaction name="actionSettings"/>
- <addaction name="actionHelp"/>
- <addaction name="actionClose"/>
- </widget>
+ <property name="title">
+ <string>Always Save New Log Messages </string>
+ </property>
+ <layout class="QGridLayout" name="_6">
+ <property name="margin">
+ <number>6</number>
+ </property>
+ <item row="1" column="1">
+ <widget class="QPushButton" name="btnBrowse">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="text">
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLineEdit" name="lineFile">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="chkEnableLogFile">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="toolTip">
+ <string>Enable automatically saving all new log messages to a file</string>
+ </property>
+ <property name="text">
+ <string>Automatically save new log messages to a file</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
<action name="actionMessage_Filters">
<property name="text">
<string>Message Filters...</string>
@@ -667,33 +540,12 @@
<extends>QTreeWidget</extends>
<header>log/LogTreeWidget.h</header>
</customwidget>
- <customwidget>
- <class>StatusEventWidget</class>
- <extends>QTreeWidget</extends>
- <header>StatusEventWidget.h</header>
- </customwidget>
</customwidgets>
<resources>
<include location="../res/vidalia.qrc"/>
</resources>
<connections>
<connection>
- <sender>actionClose</sender>
- <signal>triggered()</signal>
- <receiver>MessageLog</receiver>
- <slot>close()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>-1</x>
- <y>-1</y>
- </hint>
- <hint type="destinationlabel">
- <x>407</x>
- <y>378</y>
- </hint>
- </hints>
- </connection>
- <connection>
<sender>actionSettings</sender>
<signal>toggled(bool)</signal>
<receiver>frmSettings</receiver>
@@ -704,8 +556,8 @@
<y>-1</y>
</hint>
<hint type="destinationlabel">
- <x>407</x>
- <y>393</y>
+ <x>264</x>
+ <y>424</y>
</hint>
</hints>
</connection>
@@ -716,12 +568,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>373</x>
- <y>491</y>
+ <x>283</x>
+ <y>461</y>
</hint>
<hint type="destinationlabel">
- <x>348</x>
- <y>516</y>
+ <x>283</x>
+ <y>487</y>
</hint>
</hints>
</connection>
@@ -732,12 +584,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>20</x>
- <y>20</y>
+ <x>283</x>
+ <y>461</y>
</hint>
<hint type="destinationlabel">
- <x>20</x>
- <y>20</y>
+ <x>473</x>
+ <y>487</y>
</hint>
</hints>
</connection>
diff --git a/src/vidalia/log/StatusEventItem.cpp b/src/vidalia/log/StatusEventItem.cpp
index d42823f..ef62360 100644
--- a/src/vidalia/log/StatusEventItem.cpp
+++ b/src/vidalia/log/StatusEventItem.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/log/StatusEventItem.h b/src/vidalia/log/StatusEventItem.h
index f70f711..8e599a2 100644
--- a/src/vidalia/log/StatusEventItem.h
+++ b/src/vidalia/log/StatusEventItem.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/log/StatusEventItemDelegate.cpp b/src/vidalia/log/StatusEventItemDelegate.cpp
index b8852eb..32bbcfa 100644
--- a/src/vidalia/log/StatusEventItemDelegate.cpp
+++ b/src/vidalia/log/StatusEventItemDelegate.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/log/StatusEventItemDelegate.h b/src/vidalia/log/StatusEventItemDelegate.h
index c4eb244..bd24c48 100644
--- a/src/vidalia/log/StatusEventItemDelegate.h
+++ b/src/vidalia/log/StatusEventItemDelegate.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/log/StatusEventWidget.cpp b/src/vidalia/log/StatusEventWidget.cpp
index 9fd4dbc..4bd11d0 100644
--- a/src/vidalia/log/StatusEventWidget.cpp
+++ b/src/vidalia/log/StatusEventWidget.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/log/StatusEventWidget.h b/src/vidalia/log/StatusEventWidget.h
index ee0130f..da12c13 100644
--- a/src/vidalia/log/StatusEventWidget.h
+++ b/src/vidalia/log/StatusEventWidget.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/main.cpp b/src/vidalia/main.cpp
index acb9d66..7e9ad28 100644
--- a/src/vidalia/main.cpp
+++ b/src/vidalia/main.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -43,6 +43,8 @@ setup_crash_reporter()
QString crashReporter = Vidalia::applicationDirPath() + "\\crashreporter.exe";
#elif defined(Q_OS_MAC)
QString crashReporter = Vidalia::applicationDirPath() + "/CrashReporter.app";
+#else
+ QString crashReporter = Vidalia::applicationDirPath() + "/crashreporter";
#endif
if (! QFileInfo(crashReporter).isExecutable()) {
vWarn("Unable to find crash reporting application. Crash reporting will "
diff --git a/src/vidalia/network/CircuitItem.cpp b/src/vidalia/network/CircuitItem.cpp
index bca061e..d74254d 100644
--- a/src/vidalia/network/CircuitItem.cpp
+++ b/src/vidalia/network/CircuitItem.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/CircuitItem.h b/src/vidalia/network/CircuitItem.h
index b188098..c2c1b7e 100644
--- a/src/vidalia/network/CircuitItem.h
+++ b/src/vidalia/network/CircuitItem.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/CircuitListWidget.cpp b/src/vidalia/network/CircuitListWidget.cpp
index a0af5e7..5e01c9a 100644
--- a/src/vidalia/network/CircuitListWidget.cpp
+++ b/src/vidalia/network/CircuitListWidget.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/CircuitListWidget.h b/src/vidalia/network/CircuitListWidget.h
index 9bfdfec..a6d92c2 100644
--- a/src/vidalia/network/CircuitListWidget.h
+++ b/src/vidalia/network/CircuitListWidget.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/CountryInfo.cpp b/src/vidalia/network/CountryInfo.cpp
index dd6b998..c7d749a 100644
--- a/src/vidalia/network/CountryInfo.cpp
+++ b/src/vidalia/network/CountryInfo.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/CountryInfo.h b/src/vidalia/network/CountryInfo.h
index 30a8207..f660a12 100644
--- a/src/vidalia/network/CountryInfo.h
+++ b/src/vidalia/network/CountryInfo.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/GeoIpDatabase.cpp b/src/vidalia/network/GeoIpDatabase.cpp
index 3f496c7..c1e6d40 100644
--- a/src/vidalia/network/GeoIpDatabase.cpp
+++ b/src/vidalia/network/GeoIpDatabase.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/GeoIpDatabase.h b/src/vidalia/network/GeoIpDatabase.h
index 5b8a6db..48697ca 100644
--- a/src/vidalia/network/GeoIpDatabase.h
+++ b/src/vidalia/network/GeoIpDatabase.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/GeoIpRecord.cpp b/src/vidalia/network/GeoIpRecord.cpp
index 8a37813..25d11c1 100644
--- a/src/vidalia/network/GeoIpRecord.cpp
+++ b/src/vidalia/network/GeoIpRecord.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/GeoIpRecord.h b/src/vidalia/network/GeoIpRecord.h
index bf254e9..002085f 100644
--- a/src/vidalia/network/GeoIpRecord.h
+++ b/src/vidalia/network/GeoIpRecord.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/GeoIpResolver.cpp b/src/vidalia/network/GeoIpResolver.cpp
index 45e09e6..f2c5100 100644
--- a/src/vidalia/network/GeoIpResolver.cpp
+++ b/src/vidalia/network/GeoIpResolver.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/GeoIpResolver.h b/src/vidalia/network/GeoIpResolver.h
index b0bbab9..cf39153 100644
--- a/src/vidalia/network/GeoIpResolver.h
+++ b/src/vidalia/network/GeoIpResolver.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp
index 2501537..405fd35 100644
--- a/src/vidalia/network/NetViewer.cpp
+++ b/src/vidalia/network/NetViewer.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -20,6 +20,7 @@
#include "VMessageBox.h"
#include <QMessageBox>
+#include <QToolBar>
#include <QHeaderView>
#include <QCoreApplication>
@@ -41,7 +42,7 @@
* \param parent The parent widget of this NetViewer object.\
*/
NetViewer::NetViewer(QWidget *parent)
- : VidaliaWindow("NetViewer", parent)
+ : VidaliaTab(tr("Network Map"), "", parent)
{
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
@@ -51,8 +52,8 @@ NetViewer::NetViewer(QWidget *parent)
#endif
/* Pressing 'Esc' or 'Ctrl+W' will close the window */
- ui.actionClose->setShortcut(QString("Esc"));
- Vidalia::createShortcut("Ctrl+W", this, ui.actionClose, SLOT(trigger()));
+// ui.actionClose->setShortcut(QString("Esc"));
+// Vidalia::createShortcut("Ctrl+W", this, ui.actionClose, SLOT(trigger()));
/* Get the TorControl object */
_torControl = Vidalia::torControl();
@@ -99,7 +100,6 @@ NetViewer::NetViewer(QWidget *parent)
#endif
ui.gridLayout->addWidget(_map);
-
/* Connect zoom buttons to TorMapWidget zoom slots */
connect(ui.actionZoomIn, SIGNAL(triggered()), this, SLOT(zoomIn()));
connect(ui.actionZoomOut, SIGNAL(triggered()), this, SLOT(zoomOut()));
@@ -130,6 +130,17 @@ NetViewer::NetViewer(QWidget *parent)
_torControl, SLOT(closeStream(StreamId)));
setupGeoIpResolver();
+
+ QToolBar *tb = new QToolBar();
+ tb->addAction(ui.actionRefresh);
+ tb->addAction(ui.actionHelp);
+ tb->addAction(ui.actionZoomIn);
+ tb->addAction(ui.actionZoomOut);
+ tb->addAction(ui.actionZoomToFit);
+ tb->addAction(ui.actionZoomFullScreen);
+
+ tb->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+ ui.horizontalLayout->addWidget(tb);
}
/** Called when the user changes the UI translation. */
@@ -137,6 +148,7 @@ void
NetViewer::retranslateUi()
{
ui.retranslateUi(this);
+ setTitle(tr("Network Map"));
ui.treeRouterList->retranslateUi();
ui.treeCircuitList->retranslateUi();
diff --git a/src/vidalia/network/NetViewer.h b/src/vidalia/network/NetViewer.h
index e5c7208..3c0a675 100644
--- a/src/vidalia/network/NetViewer.h
+++ b/src/vidalia/network/NetViewer.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -18,7 +18,7 @@
#include "config.h"
#include "ui_NetViewer.h"
-#include "VidaliaWindow.h"
+#include "VidaliaTab.h"
#include "GeoIpResolver.h"
#if defined(USE_MARBLE)
@@ -38,7 +38,7 @@
class QDateTime;
-class NetViewer : public VidaliaWindow
+class NetViewer : public VidaliaTab
{
Q_OBJECT
diff --git a/src/vidalia/network/NetViewer.ui b/src/vidalia/network/NetViewer.ui
index 63c8d88..863907b 100644
--- a/src/vidalia/network/NetViewer.ui
+++ b/src/vidalia/network/NetViewer.ui
@@ -1,353 +1,334 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>NetViewer</class>
- <widget class="QMainWindow" name="NetViewer" >
- <property name="geometry" >
+ <widget class="QWidget" name="NetViewer">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>844</width>
- <height>596</height>
+ <width>694</width>
+ <height>552</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <property name="windowTitle">
+ <string>Network Map</string>
</property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="windowTitle" >
- <string>Tor Network Map</string>
- </property>
- <property name="windowIcon" >
- <iconset resource="../res/vidalia.qrc" >:/images/32x32/applications-internet.png</iconset>
- </property>
- <property name="toolButtonStyle" >
- <enum>Qt::ToolButtonTextUnderIcon</enum>
- </property>
- <widget class="QWidget" name="centralwidget" >
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QSplitter" name="splitter" >
- <property name="contextMenuPolicy" >
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout"/>
+ </item>
+ <item>
+ <widget class="QSplitter" name="splitter">
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="childrenCollapsible">
+ <bool>false</bool>
+ </property>
+ <widget class="RouterListWidget" name="treeRouterList">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>175</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::DefaultContextMenu</enum>
+ </property>
+ <property name="statusTip">
+ <string/>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
+ <property name="indentation">
+ <number>0</number>
+ </property>
+ <property name="sortingEnabled">
+ <bool>true</bool>
+ </property>
+ <property name="columnCount">
+ <number>3</number>
+ </property>
+ <column>
+ <property name="text">
+ <string/>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string/>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Relay</string>
+ </property>
+ </column>
+ </widget>
+ <widget class="QSplitter" name="splitter3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>100</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <property name="childrenCollapsible" >
+ <property name="childrenCollapsible">
<bool>false</bool>
</property>
- <widget class="RouterListWidget" name="treeRouterList" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>7</vsizetype>
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
+ <widget class="QFrame" name="frmMap">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>100</horstretch>
+ <verstretch>100</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
- <width>175</width>
- <height>0</height>
+ <width>400</width>
+ <height>300</height>
</size>
</property>
- <property name="contextMenuPolicy" >
- <enum>Qt::DefaultContextMenu</enum>
- </property>
- <property name="statusTip" >
- <string/>
- </property>
- <property name="indentation" >
- <number>0</number>
+ <property name="contextMenuPolicy">
+ <enum>Qt::NoContextMenu</enum>
</property>
- <property name="sortingEnabled" >
- <bool>true</bool>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
</property>
- <property name="selectionMode" >
- <enum>QAbstractItemView::ExtendedSelection</enum>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
</property>
+ <layout class="QHBoxLayout">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>9</number>
+ </property>
+ <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ </layout>
+ </item>
+ </layout>
</widget>
- <widget class="QSplitter" name="splitter3" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
+ <widget class="QSplitter" name="splitter2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
<horstretch>100</horstretch>
- <verstretch>0</verstretch>
+ <verstretch>1</verstretch>
</sizepolicy>
</property>
- <property name="contextMenuPolicy" >
+ <property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="childrenCollapsible" >
+ <property name="childrenCollapsible">
<bool>false</bool>
</property>
- <widget class="QFrame" name="frmMap" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>7</vsizetype>
+ <widget class="CircuitListWidget" name="treeCircuitList">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>100</horstretch>
<verstretch>100</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
- <width>400</width>
- <height>300</height>
+ <width>300</width>
+ <height>0</height>
</size>
</property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
+ <property name="contextMenuPolicy">
+ <enum>Qt::CustomContextMenu</enum>
</property>
- <property name="frameShape" >
- <enum>QFrame::StyledPanel</enum>
+ <property name="statusTip">
+ <string/>
</property>
- <property name="frameShadow" >
- <enum>QFrame::Raised</enum>
+ <property name="sortingEnabled">
+ <bool>false</bool>
+ </property>
+ <property name="columnCount">
+ <number>2</number>
</property>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>9</number>
+ <column>
+ <property name="text">
+ <string>Connection</string>
</property>
- <property name="spacing" >
- <number>6</number>
+ </column>
+ <column>
+ <property name="text">
+ <string>Status</string>
</property>
- <item>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- </layout>
- </item>
- </layout>
+ </column>
</widget>
- <widget class="QSplitter" name="splitter2" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>1</vsizetype>
+ <widget class="RouterDescriptorView" name="textRouterInfo">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>100</horstretch>
- <verstretch>1</verstretch>
+ <verstretch>100</verstretch>
</sizepolicy>
</property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
+ <property name="contextMenuPolicy">
+ <enum>Qt::DefaultContextMenu</enum>
</property>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="childrenCollapsible" >
- <bool>false</bool>
+ <property name="readOnly">
+ <bool>true</bool>
</property>
- <widget class="CircuitListWidget" name="treeCircuitList" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>100</horstretch>
- <verstretch>100</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>300</width>
- <height>0</height>
- </size>
- </property>
- <property name="contextMenuPolicy" >
- <enum>Qt::CustomContextMenu</enum>
- </property>
- <property name="statusTip" >
- <string/>
- </property>
- <property name="sortingEnabled" >
- <bool>false</bool>
- </property>
- </widget>
- <widget class="RouterDescriptorView" name="textRouterInfo" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>100</horstretch>
- <verstretch>100</verstretch>
- </sizepolicy>
- </property>
- <property name="contextMenuPolicy" >
- <enum>Qt::DefaultContextMenu</enum>
- </property>
- <property name="readOnly" >
- <bool>true</bool>
- </property>
- </widget>
</widget>
</widget>
</widget>
- </item>
- </layout>
- </widget>
- <widget class="QStatusBar" name="statusbar" />
- <widget class="QToolBar" name="toolBar" >
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="movable" >
- <bool>false</bool>
- </property>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <attribute name="toolBarArea" >
- <number>4</number>
- </attribute>
- <addaction name="actionRefresh" />
- <addaction name="separator" />
- <addaction name="actionZoomIn" />
- <addaction name="actionZoomOut" />
- <addaction name="actionZoomToFit" />
- <addaction name="actionZoomFullScreen" />
- <addaction name="separator" />
- <addaction name="actionHelp" />
- <addaction name="actionClose" />
- </widget>
- <action name="actionRefresh" >
- <property name="enabled" >
+ </widget>
+ </item>
+ </layout>
+ <action name="actionRefresh">
+ <property name="enabled">
<bool>false</bool>
</property>
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/32x32/view-refresh.png</iconset>
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/view-refresh.png</normaloff>:/images/32x32/view-refresh.png</iconset>
</property>
- <property name="text" >
+ <property name="text">
<string>Refresh</string>
</property>
- <property name="toolTip" >
+ <property name="toolTip">
<string>Refresh the list of Tor relays and connections</string>
</property>
- <property name="statusTip" >
+ <property name="statusTip">
<string>Refresh the list of Tor relays and connections</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Ctrl+R</string>
</property>
</action>
- <action name="actionHelp" >
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/32x32/system-help.png</iconset>
+ <action name="actionHelp">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/system-help.png</normaloff>:/images/32x32/system-help.png</iconset>
</property>
- <property name="text" >
+ <property name="text">
<string>Help</string>
</property>
- <property name="toolTip" >
+ <property name="toolTip">
<string>Show the network map help</string>
</property>
- <property name="statusTip" >
+ <property name="statusTip">
<string>Show network map help</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>F1</string>
</property>
</action>
- <action name="actionClose" >
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/32x32/window-close.png</iconset>
+ <action name="actionClose">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/window-close.png</normaloff>:/images/32x32/window-close.png</iconset>
</property>
- <property name="text" >
+ <property name="text">
<string>Close</string>
</property>
- <property name="toolTip" >
+ <property name="toolTip">
<string>Close the network map</string>
</property>
- <property name="statusTip" >
+ <property name="statusTip">
<string>Close the network map</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Esc</string>
</property>
</action>
- <action name="actionZoomIn" >
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/32x32/zoom-in.png</iconset>
+ <action name="actionZoomIn">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/zoom-in.png</normaloff>:/images/32x32/zoom-in.png</iconset>
</property>
- <property name="text" >
+ <property name="text">
<string>Zoom In</string>
</property>
- <property name="toolTip" >
+ <property name="toolTip">
<string>Zoom in on the network map</string>
</property>
- <property name="statusTip" >
+ <property name="statusTip">
<string>Zoom in on the network map</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>+</string>
</property>
</action>
- <action name="actionZoomOut" >
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/32x32/zoom-out.png</iconset>
+ <action name="actionZoomOut">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/zoom-out.png</normaloff>:/images/32x32/zoom-out.png</iconset>
</property>
- <property name="text" >
+ <property name="text">
<string>Zoom Out</string>
</property>
- <property name="toolTip" >
+ <property name="toolTip">
<string>Zoom out on the network map</string>
</property>
- <property name="statusTip" >
+ <property name="statusTip">
<string>Zoom out on the network map</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>-</string>
</property>
</action>
- <action name="actionZoomToFit" >
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/32x32/zoom-fit-best.png</iconset>
+ <action name="actionZoomToFit">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/zoom-fit-best.png</normaloff>:/images/32x32/zoom-fit-best.png</iconset>
</property>
- <property name="text" >
+ <property name="text">
<string>Zoom To Fit</string>
</property>
- <property name="toolTip" >
+ <property name="toolTip">
<string>Zooms to fit all currently displayed circuits</string>
</property>
- <property name="statusTip" >
+ <property name="statusTip">
<string>Zooms to fit all currently displayed circuits</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Ctrl+Z</string>
</property>
</action>
- <action name="actionZoomFullScreen" >
- <property name="icon" >
- <iconset resource="../res/vidalia.qrc" >:/images/32x32/view-fullscreen.png</iconset>
+ <action name="actionZoomFullScreen">
+ <property name="icon">
+ <iconset resource="../res/vidalia.qrc">
+ <normaloff>:/images/32x32/view-fullscreen.png</normaloff>:/images/32x32/view-fullscreen.png</iconset>
</property>
- <property name="text" >
+ <property name="text">
<string>Full Screen</string>
</property>
- <property name="toolTip" >
+ <property name="toolTip">
<string>View the network map as a full screen window</string>
</property>
- <property name="statusTip" >
+ <property name="statusTip">
<string>View the network map as a full screen window</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Ctrl+F</string>
</property>
</action>
@@ -370,24 +351,7 @@
</customwidget>
</customwidgets>
<resources>
- <include location="../res/vidalia.qrc" />
+ <include location="../res/vidalia.qrc"/>
</resources>
- <connections>
- <connection>
- <sender>actionClose</sender>
- <signal>triggered()</signal>
- <receiver>NetViewer</receiver>
- <slot>close()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>-1</x>
- <y>-1</y>
- </hint>
- <hint type="destinationlabel" >
- <x>403</x>
- <y>322</y>
- </hint>
- </hints>
- </connection>
- </connections>
+ <connections/>
</ui>
diff --git a/src/vidalia/network/RouterDescriptorView.cpp b/src/vidalia/network/RouterDescriptorView.cpp
index 63c3102..6d9370c 100644
--- a/src/vidalia/network/RouterDescriptorView.cpp
+++ b/src/vidalia/network/RouterDescriptorView.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -110,8 +110,11 @@ RouterDescriptorView::display(QList<RouterDescriptor> rdlist)
/* If the router is online, then show the uptime and bandwidth stats. */
if (!rd.offline()) {
+ qint64 minBandwidth = (qint64)qMin(rd.observedBandwidth(),
+ qMin(rd.averageBandwidth(),
+ rd.burstBandwidth()));
html.append(trow(tcol(b(tr("Bandwidth:"))) +
- tcol(string_format_bandwidth(rd.observedBandwidth()))));
+ tcol(string_format_bandwidth(minBandwidth))));
html.append(trow(tcol(b(tr("Uptime:"))) +
tcol(string_format_uptime(
adjustUptime(rd.uptime(), rd.published())))));
diff --git a/src/vidalia/network/RouterDescriptorView.h b/src/vidalia/network/RouterDescriptorView.h
index 1a77412..94af97a 100644
--- a/src/vidalia/network/RouterDescriptorView.h
+++ b/src/vidalia/network/RouterDescriptorView.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/RouterInfoDialog.cpp b/src/vidalia/network/RouterInfoDialog.cpp
index 935a1e3..806d3e9 100644
--- a/src/vidalia/network/RouterInfoDialog.cpp
+++ b/src/vidalia/network/RouterInfoDialog.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/RouterInfoDialog.h b/src/vidalia/network/RouterInfoDialog.h
index ac09ea3..96f3117 100644
--- a/src/vidalia/network/RouterInfoDialog.h
+++ b/src/vidalia/network/RouterInfoDialog.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/RouterListItem.cpp b/src/vidalia/network/RouterListItem.cpp
index 904a3f7..db558bf 100644
--- a/src/vidalia/network/RouterListItem.cpp
+++ b/src/vidalia/network/RouterListItem.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
@@ -69,7 +69,9 @@ RouterListItem::update(const RouterDescriptor &rd)
statusIcon = QIcon(IMG_NODE_SLEEPING);
setToolTip(STATUS_COLUMN, tr("Hibernating"));
} else {
- _statusValue = (qint64)_rd->observedBandwidth();
+ _statusValue = (qint64)qMin(_rd->observedBandwidth(),
+ qMin(_rd->averageBandwidth(),
+ _rd->burstBandwidth()));
if (_statusValue >= 400*1024) {
statusIcon = QIcon(IMG_NODE_HIGH_BW);
} else if (_statusValue >= 60*1024) {
diff --git a/src/vidalia/network/RouterListItem.h b/src/vidalia/network/RouterListItem.h
index ea423a3..f50f53a 100644
--- a/src/vidalia/network/RouterListItem.h
+++ b/src/vidalia/network/RouterListItem.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/RouterListWidget.cpp b/src/vidalia/network/RouterListWidget.cpp
index ce34355..e35bc22 100644
--- a/src/vidalia/network/RouterListWidget.cpp
+++ b/src/vidalia/network/RouterListWidget.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/RouterListWidget.h b/src/vidalia/network/RouterListWidget.h
index 34dfd95..04d7263 100644
--- a/src/vidalia/network/RouterListWidget.h
+++ b/src/vidalia/network/RouterListWidget.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/StreamItem.cpp b/src/vidalia/network/StreamItem.cpp
index 5c9fff9..27823f4 100644
--- a/src/vidalia/network/StreamItem.cpp
+++ b/src/vidalia/network/StreamItem.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/StreamItem.h b/src/vidalia/network/StreamItem.h
index 9390469..2842423 100644
--- a/src/vidalia/network/StreamItem.h
+++ b/src/vidalia/network/StreamItem.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/TorMapImageView.cpp b/src/vidalia/network/TorMapImageView.cpp
index dbcf634..6c04d89 100644
--- a/src/vidalia/network/TorMapImageView.cpp
+++ b/src/vidalia/network/TorMapImageView.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/TorMapImageView.h b/src/vidalia/network/TorMapImageView.h
index 47f08d8..ca26c94 100644
--- a/src/vidalia/network/TorMapImageView.h
+++ b/src/vidalia/network/TorMapImageView.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/TorMapWidget.cpp b/src/vidalia/network/TorMapWidget.cpp
index 226ee17..e222218 100644
--- a/src/vidalia/network/TorMapWidget.cpp
+++ b/src/vidalia/network/TorMapWidget.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/TorMapWidget.h b/src/vidalia/network/TorMapWidget.h
index 0671874..f371198 100644
--- a/src/vidalia/network/TorMapWidget.h
+++ b/src/vidalia/network/TorMapWidget.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/TorMapWidgetInputHandler.cpp b/src/vidalia/network/TorMapWidgetInputHandler.cpp
index 3344d83..467594b 100644
--- a/src/vidalia/network/TorMapWidgetInputHandler.cpp
+++ b/src/vidalia/network/TorMapWidgetInputHandler.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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"
diff --git a/src/vidalia/network/TorMapWidgetInputHandler.h b/src/vidalia/network/TorMapWidgetInputHandler.h
index 8265944..066a4dc 100644
--- a/src/vidalia/network/TorMapWidgetInputHandler.h
+++ b/src/vidalia/network/TorMapWidgetInputHandler.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. 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
diff --git a/src/vidalia/network/TorMapWidgetPopupMenu.cpp b/src/vidalia/network/TorMapWidgetPopupMenu.cpp
index 2bc9ae5..a98c7e6 100644
--- a/src/vidalia/network/TorMapWidgetPopupMenu.cpp
+++ b/src/vidalia/network/TorMapWidgetPopupMenu.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/TorMapWidgetPopupMenu.h b/src/vidalia/network/TorMapWidgetPopupMenu.h
index b892a1e..c83ded3 100644
--- a/src/vidalia/network/TorMapWidgetPopupMenu.h
+++ b/src/vidalia/network/TorMapWidgetPopupMenu.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/ZImageView.cpp b/src/vidalia/network/ZImageView.cpp
index cf712a7..c0cad4f 100644
--- a/src/vidalia/network/ZImageView.cpp
+++ b/src/vidalia/network/ZImageView.cpp
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/network/ZImageView.h b/src/vidalia/network/ZImageView.h
index 37b53ea..436b3d9 100644
--- a/src/vidalia/network/ZImageView.h
+++ b/src/vidalia/network/ZImageView.h
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
diff --git a/src/vidalia/res/DigiCertAssuredCA.crt b/src/vidalia/res/DigiCertAssuredCA.crt
new file mode 100644
index 0000000..2731638
--- /dev/null
+++ b/src/vidalia/res/DigiCertAssuredCA.crt
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
+b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
+cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c
+JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP
+mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+
+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4
+VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/
+AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB
+AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
+BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun
+pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC
+dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf
+fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm
+NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx
+H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
diff --git a/src/vidalia/res/DigiCertCA.crt b/src/vidalia/res/DigiCertCA.crt
new file mode 100644
index 0000000..fd4341d
--- /dev/null
+++ b/src/vidalia/res/DigiCertCA.crt
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
+QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
+CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
+nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
+43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
+T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
+gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
+BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
+TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
+DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
+hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
+06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
+PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
+YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
diff --git a/src/vidalia/res/DigiCertHighAssuranceCA.crt b/src/vidalia/res/DigiCertHighAssuranceCA.crt
new file mode 100644
index 0000000..9e6810a
--- /dev/null
+++ b/src/vidalia/res/DigiCertHighAssuranceCA.crt
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
+LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
+RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
++9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
+PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
+xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
+Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
+hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
+EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
+FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
+nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
+eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
+hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
+Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
++OkuE6N36B9K
+-----END CERTIFICATE-----
diff --git a/src/vidalia/res/vidalia.qrc b/src/vidalia/res/vidalia.qrc
index 68f84aa..cfb1004 100644
--- a/src/vidalia/res/vidalia.qrc
+++ b/src/vidalia/res/vidalia.qrc
@@ -310,6 +310,9 @@
</qresource>
<qresource prefix="/pki">
<file>EquifaxSecureCA.crt</file>
+ <file>DigiCertCA.crt</file>
+ <file>DigiCertAssuredCA.crt</file>
+ <file>DigiCertHighAssuranceCA.crt</file>
</qresource>
<qresource prefix="/geoip">
<file>country-coordinates.csv</file>
diff --git a/src/vidalia/res/vidalia_win.rc.in b/src/vidalia/res/vidalia_win.rc.in
index ef22bdc..188b798 100644
--- a/src/vidalia/res/vidalia_win.rc.in
+++ b/src/vidalia/res/vidalia_win.rc.in
@@ -3,9 +3,9 @@
** LICENSE file, found in the top level directory of this distribution. If you
** did not receive the LICENSE file with this file, you may obtain it from the
** Vidalia source package distributed by the Vidalia Project at
-** http://www.vidalia-project.net/. No part of Vidalia, including this file,
-** may be copied, modified, propagated, or distributed except according to the
-** terms described in the LICENSE file.
+** http://www.torproject.org/projects/vidalia.html. No part of Vidalia,
+** including this file, may be copied, modified, propagated, or distributed
+** except according to the terms described in the LICENSE file.
*/
/*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git
More information about the Pkg-privacy-commits
mailing list