[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [vidalia/alpha] Updated vidalia-alpha-po files
commit 90ed10ed7a78ddaa89b182c6668d1a052bba935e
Author: Runa A. Sandvik <runa.sandvik@xxxxxxxxx>
Date: Fri May 6 21:15:11 2011 +0100
Updated vidalia-alpha-po files
---
src/vidalia/i18n/po/.tx/config | 125 +--
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 | 320 +++---
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 | 324 +++---
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 | 1836 +++++++++++++---------------
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 | 1837 +++++++++++++---------------
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/vidalia_pl.po | 317 +++---
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 | 1835 +++++++++++++---------------
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/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 +++---
85 files changed, 14015 insertions(+), 16021 deletions(-)
diff --git a/src/vidalia/i18n/po/.tx/config b/src/vidalia/i18n/po/.tx/config
index 2586ea7..d129db7 100644
--- a/src/vidalia/i18n/po/.tx/config
+++ b/src/vidalia/i18n/po/.tx/config
@@ -1,4 +1,4 @@
-[torproject.1-vidalia-vidalia-pot]
+[torproject.3-vidalia-alpha-vidalia-pot]
source_file = templates/vidalia.pot
source_lang = en
trans.af = af/vidalia_af.po
@@ -124,126 +124,3 @@ trans.zu = zu/vidalia_zu.po
[main]
host = https://www.transifex.net
-
-[torproject.1-vidalia-qt-pot]
-source_file = templates/qt.pot
-source_lang = en
-trans.af = af/qt_af.po
-trans.ak = ak/qt_ak.po
-trans.am = am/qt_am.po
-trans.ar = ar/qt_ar.po
-trans.arn = arn/qt_arn.po
-trans.ast = ast/qt_ast.po
-trans.az = az/qt_az.po
-trans.be = be/qt_be.po
-trans.bg = bg/qt_bg.po
-trans.bn = bn/qt_bn.po
-trans.bn_IN = bn_IN/qt_bn_IN.po
-trans.bo = bo/qt_bo.po
-trans.br = br/qt_br.po
-trans.bs = bs/qt_bs.po
-trans.ca = ca/qt_ca.po
-trans.cs = cs/qt_cs.po
-trans.csb = csb/qt_csb.po
-trans.cy = cy/qt_cy.po
-trans.da = da/qt_da.po
-trans.de = de/qt_de.po
-trans.de_CH = de_CH/qt_de_CH.po
-trans.de_DE = de_DE/qt_de_DE.po
-trans.dz = dz/qt_dz.po
-trans.el = el/qt_el.po
-trans.eo = eo/qt_eo.po
-trans.es = es/qt_es.po
-trans.et = et/qt_et.po
-trans.eu = eu/qt_eu.po
-trans.fa = fa/qt_fa.po
-trans.fi = fi/qt_fi.po
-trans.fil = fil/qt_fil.po
-trans.fo = fo/qt_fo.po
-trans.fr = fr/qt_fr.po
-trans.fur = fur/qt_fur.po
-trans.fy = fy/qt_fy.po
-trans.ga = ga/qt_ga.po
-trans.gl = gl/qt_gl.po
-trans.gu = gu/qt_gu.po
-trans.gun = gun/qt_gun.po
-trans.ha = ha/qt_ha.po
-trans.he = he/qt_he.po
-trans.hi = hi/qt_hi.po
-trans.hr = hr/qt_hr.po
-trans.ht = ht/qt_ht.po
-trans.hu = hu/qt_hu.po
-trans.hy = hy/qt_hy.po
-trans.id = id/qt_id.po
-trans.is = is/qt_is.po
-trans.it = it/qt_it.po
-trans.ja = ja/qt_ja.po
-trans.jv = jv/qt_jv.po
-trans.ka = ka/qt_ka.po
-trans.km = km/qt_km.po
-trans.kn = kn/qt_kn.po
-trans.ko = ko/qt_ko.po
-trans.ku = ku/qt_ku.po
-trans.kw = kw/qt_kw.po
-trans.ky = ky/qt_ky.po
-trans.lb = lb/qt_lb.po
-trans.ln = ln/qt_ln.po
-trans.lo = lo/qt_lo.po
-trans.lt = lt/qt_lt.po
-trans.lv = lv/qt_lv.po
-trans.mg = mg/qt_mg.po
-trans.mi = mi/qt_mi.po
-trans.mk = mk/qt_mk.po
-trans.ml = ml/qt_ml.po
-trans.mn = mn/qt_mn.po
-trans.mr = mr/qt_mr.po
-trans.ms = ms/qt_ms.po
-trans.mt = mt/qt_mt.po
-trans.my = my/qt_my.po
-trans.nah = nah/qt_nah.po
-trans.nap = nap/qt_nap.po
-trans.nb = nb/qt_nb.po
-trans.ne = ne/qt_ne.po
-trans.nl = nl/qt_nl.po
-trans.nn = nn/qt_nn.po
-trans.nso = nso/qt_nso.po
-trans.oc = oc/qt_oc.po
-trans.or = or/qt_or.po
-trans.pa = pa/qt_pa.po
-trans.pap = pap/qt_pap.po
-trans.pl = pl/qt_pl.po
-trans.pms = pms/qt_pms.po
-trans.ps = ps/qt_ps.po
-trans.pt = pt/qt_pt.po
-trans.pt_BR = pt_BR/qt_pt_BR.po
-trans.ro = ro/qt_ro.po
-trans.ru = ru/qt_ru.po
-trans.sco = sco/qt_sco.po
-trans.sk = sk/qt_sk.po
-trans.sl = sl/qt_sl.po
-trans.so = so/qt_so.po
-trans.son = son/qt_son.po
-trans.sq = sq/qt_sq.po
-trans.sr = sr/qt_sr.po
-trans.st = st/qt_st.po
-trans.su = su/qt_su.po
-trans.sv = sv/qt_sv.po
-trans.sw = sw/qt_sw.po
-trans.ta = ta/qt_ta.po
-trans.te = te/qt_te.po
-trans.tg = tg/qt_tg.po
-trans.th = th/qt_th.po
-trans.ti = ti/qt_ti.po
-trans.tk = tk/qt_tk.po
-trans.tr = tr/qt_tr.po
-trans.uk = uk/qt_uk.po
-trans.ur = ur/qt_ur.po
-trans.ve = ve/qt_ve.po
-trans.vi = vi/qt_vi.po
-trans.wa = wa/qt_wa.po
-trans.wo = wo/qt_wo.po
-trans.zh_CN = zh_CN/qt_zh_CN.po
-trans.zh_HK = zh_HK/qt_zh_HK.po
-trans.zh_TW = zh_TW/qt_zh_TW.po
-trans.zu = zu/qt_zu.po
-
diff --git a/src/vidalia/i18n/po/af/vidalia_af.po b/src/vidalia/i18n/po/af/vidalia_af.po
index 0f20e57..efbbf2b 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-04-18 08:45+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:05+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 ca8544f..4b1ecb6 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-04-18 08:46+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:07+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 5dd5736..033daf7 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-04-18 08:49+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 f22bcf7..63e2ef9 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-22 16:13+0000\n"
-"Last-Translator: OsamaK <osamak@xxxxxxx>\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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 "استخداÙ? تÙ?ر Ù?عرض اÙ?Ù?طاÙ?"
-
-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,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 "Remember my password"
-msgstr "تذÙ?ر Ù?Ù?Ù?Ø© اÙ?سر"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"اتصÙ? Ú¤Ù?داÙ?Ù?ا بعÙ?Ù?Ù?Ø© تÙ?ر جارÙ?Ø© تتطÙ?ب Ù?Ù?Ù?Ø© سر. Ù?رجÙ? Ø£Ù? تدخÙ? Ù?Ù?Ù?Ø© سر اÙ?تØÙ?Ù?:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
@@ -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 "Ù?دخÙ? اÙ?تØÙ?Ù?Ù?Ø©:"
@@ -3146,6 +3074,14 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "عÙ?س (mirror) دÙ?Ù?Ù? اÙ?تØÙ?Ù?Ù?ات"
@@ -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 "اÙ?خدÙ?ات اÙ?Ù?Ù?Ù?رة اÙ?Ù?Ø®Ù?Ù?Ø©"
@@ -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 "Ù?جاØ"
diff --git a/src/vidalia/i18n/po/arn/vidalia_arn.po b/src/vidalia/i18n/po/arn/vidalia_arn.po
index bd09323..8073e27 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-04-18 08:50+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 786efc7..e0087f6 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-04-18 08:51+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:12+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 fd0a525..441eb12 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-04-18 08:50+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 643282a..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 c31b82e..b1b7cef 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-04-18 08:51+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 10e4469..fe29203 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-04-18 08:44+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:04+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 9332606..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 60bae8a..ed95c2b 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-04-18 08:51+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:12+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 0f9a19f..43bb277 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-04-18 08:44+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:04+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 eac6134..a50ab61 100644
--- a/src/vidalia/i18n/po/de/vidalia_de.po
+++ b/src/vidalia/i18n/po/de/vidalia_de.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-04-16 19:54+0000\n"
-"Last-Translator: bastik <bastik.tor@xxxxxxxxxxxxxx>\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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -245,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"
@@ -288,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..."
@@ -442,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 ""
+"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 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."
@@ -1359,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"
@@ -1390,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"
@@ -1677,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"
@@ -1713,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"
@@ -1829,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"
@@ -1922,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"
@@ -1981,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 ""
@@ -2130,16 +2012,32 @@ msgstr ""
"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 ""
@@ -2162,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,"
@@ -2169,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"
@@ -2424,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 "Einfach "
-
-msgctxt "MessageLog"
-msgid "Tor Status"
-msgstr "Tor Status"
-
-msgctxt "MessageLog"
-msgid "Advanced"
-msgstr "Fortgeschritten"
-
-msgctxt "MessageLog"
msgid "Always Save New Log Messages"
msgstr "Nachrichten immer speichern"
msgctxt "MessageLog"
+msgid "toolbar"
+msgstr ""
+
+msgctxt "MessageLog"
msgid ""
"Messages that appear when something has \n"
"gone very wrong and Tor cannot proceed."
@@ -2492,10 +2408,6 @@ msgstr ""
"%2"
msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Tor-Netzwerk-Karte"
-
-msgctxt "NetViewer"
msgid "Refresh"
msgstr "Aktualisieren"
@@ -2595,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"
@@ -2938,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:"
@@ -3208,6 +3132,14 @@ msgid "Automatically distribute my bridge address"
msgstr "Meine Bridge-Adresse automatisch verteilen"
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
msgstr "Spiegele das Relay Verzeichnis"
@@ -3259,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"
@@ -3626,6 +3554,22 @@ msgstr ""
"\"kennenlernen\", im Bandbreitengraph steigenden Netzwerkverkehr sehen. "
"Vielen Dank für Ihre Unterstützung des Tor-Netzwerks!"
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
msgstr "Neu"
@@ -3662,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]"
@@ -3744,6 +3694,30 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr "Beim Ã?ffnen der torrc Datei ist ein Fehler aufgetreten"
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
msgstr "Erfolgreich"
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 76b3830..c5ad6e3 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-04-18 08:45+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:05+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 f0da320..2c34625 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-04-18 08:47+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:08+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 3f9f7c6..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-22 16:13+0000\n"
-"Last-Translator: Evropi <yannanth@xxxxxxxxx>\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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 43d88b2..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-22 16:13+0000\n"
-"Last-Translator: identity <eeemsi@xxxxxxxxxxxxxx>\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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 af314bc..0297ec6 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-04-17 18:58+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 19:51+0000\n"
"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\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"
@@ -16,126 +16,124 @@ msgstr ""
msgctxt "AboutDialog"
msgid "About Vidalia"
-msgstr "Acerca de Vidalia"
+msgstr ""
msgctxt "AboutDialog"
msgid "License"
-msgstr "Licencia"
+msgstr ""
msgctxt "AboutDialog"
msgid "Vidalia 0.2.0"
-msgstr "Vidalia 0.2.0"
+msgstr ""
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
-msgstr "Tor 0.2.0.32"
+msgstr ""
msgctxt "AboutDialog"
msgid "Qt 4.4.2"
-msgstr "Qt 4.4.2"
+msgstr ""
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
-msgstr "'%1' no es una dirección IP válida."
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
msgstr ""
-"Ha seleccionado autenticación por 'Contraseña', pero no ha especificado "
-"ninguna."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
-msgstr "Seleccione el Archivo de Configuración de Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "File Not Found"
-msgstr "Archivo No Encontrado"
+msgstr ""
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
-msgstr "%1 no existe. ¿Desea crearlo?"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Failed to Create File"
-msgstr "Error al Crear Archivo"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
-msgstr "No se pudo crear %1 [%2]"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
-msgstr "Seleccione un Directorio para Almacenar Datos de Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
-msgstr "No se pudo eliminar el Servicio Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
-msgstr "No se pudo instalar el Servicio Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
-msgstr "Vidalia no pudo instalar el servicio Tor."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Authentication:"
-msgstr "Autentificación:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Address:"
-msgstr "Dirección:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "None"
-msgstr "Ninguna"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Cookie"
-msgstr "Cookie"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Password"
-msgstr "Contraseña"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "Generar aleatoriamente"
+msgstr ""
msgctxt "AdvancedPage"
msgid ":"
-msgstr ":"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
-msgstr "Fichero de configuración de Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "Iniciar Tor con el archivo de configuración especificado (torrc)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
-msgstr "Seleccione la ruta a su archivo de configuración"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Browse"
-msgstr "Examinar"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Data Directory"
-msgstr "Directorio de Datos"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "Almacenar datos de Tor en el siguiente directorio"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr "Seleccione el directorio que se usará para almacenar los datos de Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Control"
@@ -199,966 +197,969 @@ msgid ""
"\n"
"You may need to remove it manually."
msgstr ""
-"Vidalia no fue capaz de eliminar el servicio de Tor.\n"
-"\n"
-"Puede que necesite eliminarlo de manera manual."
msgctxt "AppearancePage"
msgid "Language"
-msgstr "Idioma"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Seleccione el idioma usado por Vidalia"
+msgstr ""
msgctxt "AppearancePage"
msgid "Style"
-msgstr "Estilo"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
-msgstr "Escoja el estilo de la interfaz de Vidalia"
+msgstr ""
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr "Vidalia no pudo cargar la traducción al idioma seleccionado."
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Since:"
-msgstr "Desde:"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Hide Settings"
-msgstr "Ocultar Preferencias"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Show Settings"
-msgstr "Mostrar Preferencias"
-
-msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Uso del Ancho de Banda de Tor"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Reset"
-msgstr "Reiniciar"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Receive Rate"
-msgstr "Tasa de Recepción"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Send Rate"
-msgstr "Tasa de EnvÃo"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Always on Top"
-msgstr "Siempre Arriba"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Style"
-msgstr "Estilo"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Cambia la transparencia del Gráfico de Ancho de Banda"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "100"
-msgstr "100"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "% Opaque"
-msgstr "% Opaco"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Save"
-msgstr "Guardar"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
+
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "Iniciando la solicitud de puente HTTPS."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
-msgstr "Conectando a %1:%2..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Enviando una solicitud HTTPS para puentes."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "Descargando una lista de puentes..."
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "Descargando puentes"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "No pudo descargar puentes: %1"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "Reintentando la solicitud de puentes..."
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Country"
-msgstr "PaÃs"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "# Clients"
-msgstr "Nº. de Clientes"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr "Clientes de los siguientes paÃses han usado su retransmisor desde %1"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Resumen de utilización del puente"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "Resumen del cliente"
+msgstr ""
msgctxt "Circuit"
msgid "New"
-msgstr "Nuevo"
+msgstr ""
msgctxt "Circuit"
msgid "Open"
-msgstr "Abierto"
+msgstr ""
msgctxt "Circuit"
msgid "Building"
-msgstr "Construyendo"
+msgstr ""
msgctxt "Circuit"
msgid "Failed"
-msgstr "Falló"
+msgstr ""
msgctxt "Circuit"
msgid "Closed"
-msgstr "Cerrado"
+msgstr ""
msgctxt "Circuit"
msgid "Unknown"
-msgstr "Desconocido"
+msgstr ""
msgctxt "CircuitItem"
msgid "<Path Empty>"
-msgstr "<Ruta VacÃa>"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Connection"
-msgstr "Conexión"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Status"
-msgstr "Estado"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
-msgstr "Acercamiento al circuito"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
-msgstr "Cerrar Circuito (Del)"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "Cerrar flujo (Del)"
+msgstr ""
msgctxt "ConfigDialog"
msgid "General"
-msgstr "General"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Network"
-msgstr "Red"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Sharing"
-msgstr "Compartiendo"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Services"
-msgstr "Servicios"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Appearance"
-msgstr "Apariencia"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Advanced"
-msgstr "Avanzado"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Help"
-msgstr "Ayuda"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr "Error al Guardar las Preferencias"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
-msgstr "Vidalia no pudo guardar sus preferencias de %1."
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
-msgstr "Error al Aplicar Preferencias"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr "Vidalia no pudo aplicar sus preferencias de %1 a Tor."
+msgstr ""
msgctxt "ConfigDialog"
msgid "Settings"
-msgstr "Preferencias"
+msgstr ""
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Vidalia no pudo conectarse con Tor. (%1)"
+msgstr ""
msgctxt "ControlConnection"
msgid "Control socket is not connected."
-msgstr "Conector de Control no está conectado."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Contraseña requerida"
+msgid "Problem connecting to Tor"
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Recordar mi contraseña"
+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."
-msgstr "La conexión de control no esta conectada."
+msgstr ""
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
-msgstr "Error enviando comando de control. [%1]"
+msgstr ""
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
msgstr ""
-"Conexión desconectada mientras se trataba de leer una lÃnea de información."
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
-msgstr "Respuesta de control no válida. [%1]"
+msgstr ""
msgctxt "CountryInfo"
msgid "Afghanistan"
-msgstr "Afganistán"
+msgstr ""
msgctxt "CountryInfo"
msgid "Andorra"
-msgstr "Andorra"
+msgstr ""
msgctxt "CountryInfo"
msgid "Angola"
-msgstr "Angola"
+msgstr ""
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr "Antigua y Barbuda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Argentina"
-msgstr "Argentina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr "Armenia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Australia"
-msgstr "Australia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "Azerbaidzhán"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr "Bahamas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "Bangladesh"
+msgstr ""
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "Barbados"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "Bielorrusia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr "Bélgica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belize"
-msgstr "Belice"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr "Bután"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr "Bolivia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr "Bosnia y Herzegovina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "Botswana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr "Brasil"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Brunei"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr "Bulgaria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr "Burkina Faso"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr "Burundi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "Cambodia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "Camerún"
+msgstr ""
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "Canadá"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "Cabo Verde"
+msgstr ""
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "República Centroafricana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "Chad"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chile"
-msgstr "Chile"
+msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "China"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr "Colombia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Comores"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "Congo, República Democrática del"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "Congo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr "Costa Rica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cote d�Ivoire"
-msgstr "Costa de MarfÃl"
+msgstr ""
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "Croacia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "Cuba"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "Chipre"
+msgstr ""
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "República Checa"
+msgstr ""
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "Dinamarca"
+msgstr ""
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "DjibutÃ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "Dominica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "República Dominicana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "Ecuador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "Egipto"
+msgstr ""
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr "El Salvador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "Guinea Ecuatorial"
+msgstr ""
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "Eritrea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "Estonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "France"
-msgstr "Francia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr "Gabón"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "Gambia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Georgia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Germany"
-msgstr "Alemania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr "Ghana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Grenada"
-msgstr "Granada"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guatemala"
-msgstr "Guatemala"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea"
-msgstr "Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr "Guinea-Bissau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guyana"
-msgstr "Guyana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hong Kong"
-msgstr "Hong Kong"
+msgstr ""
msgctxt "CountryInfo"
msgid "Haiti"
-msgstr "HaitÃ"
+msgstr ""
msgctxt "CountryInfo"
msgid "Honduras"
-msgstr "Honduras"
+msgstr ""
msgctxt "CountryInfo"
msgid "Israel"
-msgstr "Israel"
+msgstr ""
msgctxt "CountryInfo"
msgid "Italy"
-msgstr "Italia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "Jamaica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Japan"
-msgstr "Japón"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr "Jordania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "Kazajhstán"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr "Kenya"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr "Kiribati"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "Kuwait"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "Kirguistán"
+msgstr ""
msgctxt "CountryInfo"
msgid "Laos"
-msgstr "Laos"
+msgstr ""
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr "Letonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr "LÃbano"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr "Lesotho"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr "Liberia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "Liechtenstein"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr "Lituania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr "Luxemburgo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr "Macedonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr "Madagascar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "Malaui"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr "Malasia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "Mali"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malta"
-msgstr "Malta"
+msgstr ""
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr "Islas Marshall"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "Mauritania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "Mauricio"
+msgstr ""
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr "Micronesia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "Moldavia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "Mónaco"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr "Mongolia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr "Montenegro"
+msgstr ""
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr "Marruecos"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr "Mozambique"
+msgstr ""
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "Namibia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr "Nauru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr "Nepal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr "Holanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "Nueva Zelanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr "Nicaragua"
+msgstr ""
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "NÃger"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "NÃger"
+msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "Noruega"
+msgstr ""
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "Omán"
+msgstr ""
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr "Pakistán"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "Palau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr "Palestina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Panama"
-msgstr "Panamá"
+msgstr ""
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Papúa y Nueva Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "Paraguay"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "Perú"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "Filipinas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "Polonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "Portugal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Qatar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "RumanÃa"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "Rusia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "Ruanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "Saint Kitts y Nevis"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "Santa LucÃa"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "San Vicente y las Granadinas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr "Samoa"
+msgstr ""
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "San Marino"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "Sao Tomé y PrÃncipe"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "Arabia Saudita"
+msgstr ""
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr "Senegal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr "Serbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "Seycheles"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr "Sierra Leona"
+msgstr ""
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "Singapur"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "Eslovaquia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "Eslovenia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "Islas Salomón"
+msgstr ""
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "Somalia"
+msgstr ""
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "Sudáfrica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "España"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "Sri Lanka"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr "Sudán"
+msgstr ""
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "Surinam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr "Suazilandia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "Suecia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "Suiza"
+msgstr ""
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "Siria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tazhdikistán"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "Tanzania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "Tailandia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "Timor Leste"
+msgstr ""
msgctxt "CountryInfo"
msgid "Togo"
-msgstr "Togo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr "Tonga"
+msgstr ""
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Trinidad y Tobago"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "Túnez"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr "TurquÃa"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "Turkmenistán"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr "Tuvalu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr "Uganda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr "Ucrania"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "Emiratos Ã?rabes Unidos"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "Reino Unido"
+msgstr ""
msgctxt "CountryInfo"
msgid "United States"
-msgstr "Estados Unidos"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr "Uruguay"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "Uzbekistán"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr "Vanuatu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "Vaticano"
+msgstr ""
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "Venezuela"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr "Vietnam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Sahara Occidental"
+msgstr ""
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr "Yemén"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr "Zambia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr "Zimbabwe"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zaire"
@@ -1166,99 +1167,99 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr "Albania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr "Argelia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "Austria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Bahrein"
+msgstr ""
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "Benin"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr "EtiopÃa"
+msgstr ""
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "Fiji"
+msgstr ""
msgctxt "CountryInfo"
msgid "Finland"
-msgstr "Finlandia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Greece"
-msgstr "Grecia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guam"
-msgstr "Guam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "HungrÃa"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr "Islandia"
+msgstr ""
msgctxt "CountryInfo"
msgid "India"
-msgstr "India"
+msgstr ""
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr "Indonesia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iran"
-msgstr "Irán"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr "Irak"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "Irlanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "Corea del Norte"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "Corea del Sur"
+msgstr ""
msgctxt "CountryInfo"
msgid "Libya"
-msgstr "Libia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr "Maldivas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "Méjico"
+msgstr ""
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "Birmania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "Taiwán"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
@@ -1318,215 +1319,215 @@ msgstr ""
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
-msgstr "Ejecutables (*.exe)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "Seleccione la ruta de Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "Seleccionar el Ejecutable del Proxy"
+msgstr ""
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr "Debe especificar el nombre del ejecutable de Tor."
+msgstr ""
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr "Iniciar Vidalia cuando inicie mi sistema"
+msgstr ""
msgctxt "GeneralPage"
msgid "Browse"
-msgstr "Examinar"
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Iniciar Tor cuando se inicie Vidalia"
+msgstr ""
msgctxt "GeneralPage"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "Aplicación Proxy (opcional)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "Iniciar una aplicación proxy cuando Tor se inicie"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "Argumentos de la aplicación Proxy:"
+msgstr ""
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "Actualizaciones de software"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Revisar automáticamente si hay actualizaciones de software"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "Revisar ahora"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB"
-msgstr "%1 KB"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 MB"
-msgstr "%1 MB"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 GB"
-msgstr "%1 GB"
+msgstr ""
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr "Recib."
+msgstr ""
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Enviados:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
-msgstr "Archivo XML suministrado no es un documento de Contenidos valido."
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached end of document"
-msgstr "La búsqueda alcanzó el final del documento"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached start of document"
-msgstr "La búsqueda alcanzó el principio del documento"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Text not found in document"
-msgstr "Texto no encontrado en el documento"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found %1 results"
-msgstr "Se encontraron %1 resultados"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Vidalia Help"
-msgstr "Ayuda de Vidalia"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Back"
-msgstr "Atrás"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to previous page (Backspace)"
-msgstr "Ir a la página anterior (Retroceso)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Backspace"
-msgstr "Retroceso"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Forward"
-msgstr "Adelante"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
-msgstr "Ir a la página siguiente (Mayúsculas+Retroceso)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Shift+Backspace"
-msgstr "Shift+Retroceso"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Home"
-msgstr "Inicio"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to the Home page (Ctrl+H)"
-msgstr "Ir a la Página de Inicio (Ctrl+H)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+H"
-msgstr "Ctrl+H"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find"
-msgstr "Buscar"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr "Buscar una palabra o frase en la página actual (Ctrl+F)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close"
-msgstr "Cerrar"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close Vidalia Help"
-msgstr "Cerrar Ayuda de Vidalia"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find:"
-msgstr "Buscar:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Previous"
-msgstr "Buscar Anterior"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Next"
-msgstr "Encontrar Siguiente"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "Coincidir mayúsculas y minúsculas"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Whole words only"
-msgstr "Palabras completas solamente"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Help Topics"
-msgstr "Temas de Ayuda"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Contents"
-msgstr "Contenido"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search"
-msgstr "Búsqueda"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Searching for:"
-msgstr "Buscando:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found Documents"
-msgstr "Documentos encontrados"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "No se pudo cargar el contenido de la Ayuda:"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "Abriendo enlace externo"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
@@ -1534,65 +1535,60 @@ msgid ""
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
msgstr ""
-"Vidalia puede abrir el enlace seleccionado en su Navegador predeterminado. "
-"Si su Navegador no está configurado actualmente para usar el Tor, la "
-"solicitud no será anónima."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "¿Desea que Vidalia abra el enlace en su Navegador predeterminado?"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "No se pudo abrir el enlace"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
msgstr ""
-"Vidalia no pudo abrir el enlace seleccionado en su navegador de Internet. "
-"Puede intentarlo copiando el URL y pegándolo en su navegador."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "No se pudo abrir el archivo de ayuda:"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
-msgstr "Información de Licencia"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License"
-msgstr "Licencia"
+msgstr ""
msgctxt "LicenseDialog"
msgid "Credits"
-msgstr "Créditos"
+msgstr ""
msgctxt "LogEvent"
msgid "Debug"
-msgstr "Depurar"
+msgstr ""
msgctxt "LogEvent"
msgid "Info"
-msgstr "Información"
+msgstr ""
msgctxt "LogEvent"
msgid "Notice"
-msgstr "Notificación"
+msgstr ""
msgctxt "LogEvent"
msgid "Warning"
-msgstr "Advertencia"
+msgstr ""
msgctxt "LogEvent"
msgid "Error"
-msgstr "Error"
+msgstr ""
msgctxt "LogEvent"
msgid "Unknown"
-msgstr "Desconocido"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Debug"
@@ -1620,480 +1616,336 @@ msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Iniciar Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Exit"
-msgstr "Salir"
+msgstr ""
msgctxt "MainWindow"
msgid "Bandwidth Graph"
-msgstr "Gráfica de Ancho de Banda"
+msgstr ""
msgctxt "MainWindow"
msgid "Message Log"
-msgstr "Registro de Mensajes"
+msgstr ""
msgctxt "MainWindow"
msgid "Network Map"
-msgstr "Mapa de Red"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr "Panel de Control"
+msgstr ""
msgctxt "MainWindow"
msgid "Settings"
-msgstr "Preferencias"
+msgstr ""
msgctxt "MainWindow"
msgid "About"
-msgstr "Acerca de"
+msgstr ""
msgctxt "MainWindow"
msgid "Help"
-msgstr "Ayuda"
+msgstr ""
msgctxt "MainWindow"
msgid "New Identity"
-msgstr "Nueva Identidad"
-
-msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "View"
-msgstr "Ver"
-
-msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Ayuda de Vidalia"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Error al iniciar navegador web"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia no pudo iniciar el navegador web configurado"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "Error al inicial el cliente IM"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia no pudo iniciar el cliente IM configurado"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "Error al iniciar el servidor proxy"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia no pudo iniciar el servidor proxy configurado"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "Conectando a un directorio repetidor"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "Estableciendo una conexión con un directorio encriptado"
+msgstr ""
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr "Recuperando el estado de la red"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading network status"
-msgstr "Cargando el estado de la red"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "Cargando los certificados de autoridad"
+msgstr ""
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "Cargando los certificados de autoridad"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "Cargando la información del repetidor"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Conectando a la red Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "Estableciendo un circuito Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "¡Conectado a la red Tor!"
+msgstr ""
msgctxt "MainWindow"
msgid "Unrecognized startup status"
-msgstr "Estado de inicio desconocido"
+msgstr ""
msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr "Miscelánea"
+msgstr ""
msgctxt "MainWindow"
msgid "identity mismatch"
-msgstr "no hay coincidencia de identidad"
+msgstr ""
msgctxt "MainWindow"
msgid "done"
-msgstr "terminado"
+msgstr ""
msgctxt "MainWindow"
msgid "connection refused"
-msgstr "conexión rechazada"
+msgstr ""
msgctxt "MainWindow"
msgid "connection timeout"
-msgstr "tiempo de espera de conexión agotado"
+msgstr ""
msgctxt "MainWindow"
msgid "read/write error"
-msgstr "error en escritura/lectura"
+msgstr ""
msgctxt "MainWindow"
msgid "no route to host"
-msgstr "no hay ruta hacia el host"
+msgstr ""
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "recursos insuficientes"
+msgstr ""
msgctxt "MainWindow"
msgid "unknown"
-msgstr "desconocido"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is not running"
-msgstr "Tor no está ejecutándose"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is shutting down"
-msgstr "Tor se esta apagando"
-
-msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Detener Tor ahora"
+msgstr ""
msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "Detener Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "Iniciando el software Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "Iniciando Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Starting Tor"
-msgstr "Error al Iniciar Tor"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
msgstr ""
-"Vidalia no pudo iniciar Tor. Verifique sus preferencias para asegurar que "
-"estén especificados el nombre correcto y la localización del ejecutable Tor."
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr "Conectando con Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "Error de Conexión"
+msgstr ""
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr "Retransmisión Activada"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr "Error al Cerrarse"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr "Vidalia no pudo detener el software de Tor."
+msgstr ""
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "Error Inesperado"
+msgstr ""
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "Autentificándose con Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "Se Requiere Autenticación a través de Cookie"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
msgstr ""
-"Tor requiere que Vidalia envÃe el contenido de una cookie de autenticación, "
-"pero Vidalia no pudo encontrar ninguna."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
msgstr ""
-"¿Le gustarÃa examinar usted mismo para encontrar el archivo "
-"'control_auth_cookie'?"
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "Directorio de Datos"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "Cookie de Control (control_auth_cookie)"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "Error en el registro de Eventos"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
msgstr ""
-"Vidalia no pudo registrar algunos eventos. Muchas de las caracterÃsticas de "
-"Vidalia pueden no estar disponibles."
-
-msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Error de Autentificación"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia no pudo autentificarse ante Tor. (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-"Por favor, verifique la configuración de autentificación de su puerto de "
-"control."
msgctxt "MainWindow"
msgid "Tor Update Available"
-msgstr "Actualización de Tor Disponible"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
msgstr ""
-"La versión actualmente instalada de Tor está desactualizada o no se "
-"recomiendo su uso. Por favor, visite el sitio web de Tor y descargue la "
-"versión más reciente."
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr "Sitio web de Tor: %1"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
msgstr ""
-"Todas las conexiones subsecuentes parecerán diferentes que sus conexiones "
-"antiguas."
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
-msgstr "No se pudo crear una nueva Identidad"
+msgstr ""
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "No se pudieron reenviar los puertos"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr "Vidalia no pudo configurar automáticamente el reenvÃo de puertos."
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr "Panel de Control de Vidalia"
+msgstr ""
msgctxt "MainWindow"
msgid "Status"
-msgstr "Estado"
-
-msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Métodos abreviados de Vidalia"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Configuración de retransmisión"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Configure un repetidor y ayude a que la red crezca"
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Ver la Red"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Ver un mapa de la red Tor"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Usar una nueva identidad"
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Hacer que las conexiones subsiguientes parezcan nuevas"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Ver el uso reciente del ancho de banda"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Ver el historial de registros de mensajes"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Ver la documentación de la ayuda"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Configurar Vidalia"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Ver la información de la versión y de la licencia"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Salir de Vidalia"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Mostrar esta ventana al iniciar"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Ocultar"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Ocultar esta ventana"
+msgstr ""
msgctxt "MainWindow"
msgid "Password Reset Failed"
-msgstr "No se pudo reiniciar la contraseña"
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
msgstr ""
-"Vidalia trató de reiniciar la contraseña de control de Tor, pero no pudo "
-"reiniciar su software. Verifique su Administrador de Tareas para asegurarse "
-"de que no esté ejecutándose otro proceso de Tor."
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
-"La versión actualmente instalada de Tor está desactualizada o no se "
-"recomiendo su uso."
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
msgstr ""
-"¿Le gustarÃa verificar si hay un nuevo paquete disponible para su "
-"instalación?"
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "Conexión potencialmente insegura"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
msgstr ""
-"Tor ha cerrado automáticamente su conexión para proteger su anonimato."
msgctxt "MainWindow"
msgid "Update Failed"
-msgstr "No se pudo actualizar"
+msgstr ""
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "Su software está actualizado"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
msgstr ""
-"En este momento no hay paquetes de software Tor disponibles para su "
-"computadora."
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "No se pudo realizar la instalación"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
-msgstr "Vidalia no pudo instalar las actualizaciones de su software."
+msgstr ""
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "Ocurrió el siguiente error:"
+msgstr ""
msgctxt "MainWindow"
msgid ""
@@ -2109,16 +1961,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 ""
@@ -2126,312 +1994,317 @@ msgid ""
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
-"Actualmente está ejecutando un repetidor. La detención del mismo interrumpirÃa cualesquiera conexiones que tengan abiertas los clientes.\n"
-"\n"
-"¿PodrÃa darle tiempo a los clientes de encontrar un nuevo repetidor?"
msgctxt "MainWindow"
msgid ""
"Vidalia detected that the Tor software exited unexpectedly.\n"
"\n"
"Please check the message log for recent warning or error messages."
-msgstr "Vidalia detectó que el software de Tor terminó de manera inesperada."
+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 "probablemente Telnet,"
+msgstr ""
msgctxt "MainWindow"
msgid ", probably an email client,"
-msgstr ", probablemente un cliente de correo electrónico,"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid ""
+"Your relay is shutting down.\n"
+"Click 'Stop' again to stop your relay now."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Error reloading configuration"
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "Vidalia was unable to reload Tor's configuration."
+msgstr ""
msgctxt "MessageLog"
msgid "Error Setting Filter"
-msgstr "Error configurando filtro"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr "Vidalia no pudo introducirse en el registro de eventos de Tor."
+msgstr ""
msgctxt "MessageLog"
msgid "Error Opening Log File"
-msgstr "Error abriendo Archivo de Registro"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr "Vidalia no pudo abrir el archivo de registro especificado."
+msgstr ""
msgctxt "MessageLog"
msgid "Log Filename Required"
-msgstr "Nombre de Archivo de Registro requerido"
+msgstr ""
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
msgstr ""
-"Debe escribir un nombre de archivo para poder guardar en él los mensajes de "
-"registro."
msgctxt "MessageLog"
msgid "Select Log File"
-msgstr "Seleccione Archivo de Registro"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Log Messages"
-msgstr "Guardar Mensajes de Registro"
+msgstr ""
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
-msgstr "Archivos de texto (*.txt)"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia"
-msgstr "Vidalia"
+msgstr ""
msgctxt "MessageLog"
msgid "Find in Message Log"
-msgstr "Buscar en el Registro de Mensajes"
+msgstr ""
msgctxt "MessageLog"
msgid "Find:"
-msgstr "Buscar:"
+msgstr ""
msgctxt "MessageLog"
msgid "Not Found"
-msgstr "No se encontró"
+msgstr ""
msgctxt "MessageLog"
msgid "Search found 0 matches."
-msgstr "La búsqueda obtuvo 0 resultados."
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log"
-msgstr "Registro de Mensajes"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filters..."
-msgstr "Filtros de Mensajes..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set message filters"
-msgstr "Configure los filtros de mensajes"
+msgstr ""
msgctxt "MessageLog"
msgid "History Size..."
-msgstr "Tamaño del Historial..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
-msgstr "Establecer el numero máximo de mensajes a mostrar"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear"
-msgstr "Borrar"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "Borrar todos los mensajes del Registro de Mensajes "
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+E"
-msgstr "Ctrl+E"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy"
-msgstr "Copiar"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr "Copiar los mensajes seleccionados al portapapeles (Ctrl+C)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+C"
-msgstr "Ctrl+C"
+msgstr ""
msgctxt "MessageLog"
msgid "Select All"
-msgstr "Seleccionar Todos"
+msgstr ""
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
-msgstr "Seleccione todos los mensajes (Ctrl+A)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+A"
-msgstr "Ctrl+A"
+msgstr ""
msgctxt "MessageLog"
msgid "Save All"
-msgstr "Guardar Todo"
+msgstr ""
msgctxt "MessageLog"
msgid "Save all messages to a file"
-msgstr "Guardar todos los mensajes en un archivo"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Selected"
-msgstr "Guardar la selección"
+msgstr ""
msgctxt "MessageLog"
msgid "Save selected messages to a file"
-msgstr "Guardar en un archivo los mensajes seleccionados"
+msgstr ""
msgctxt "MessageLog"
msgid "Settings"
-msgstr "Preferencias"
+msgstr ""
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
-msgstr "Ajustar las preferencias del Registro de Mensajes"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+T"
-msgstr "Ctrl+T"
+msgstr ""
msgctxt "MessageLog"
msgid "Help"
-msgstr "Ayuda"
+msgstr ""
msgctxt "MessageLog"
msgid "Show the help browser"
-msgstr "Mostrar el navegador de la ayuda"
+msgstr ""
msgctxt "MessageLog"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "MessageLog"
msgid "Close"
-msgstr "Cerrar"
+msgstr ""
msgctxt "MessageLog"
msgid "Close the Message Log"
-msgstr "Cerrar el Registro de Mensajes"
+msgstr ""
msgctxt "MessageLog"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "MessageLog"
msgid "Find"
-msgstr "Buscar"
+msgstr ""
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "Buscar todos los menajes que contengan el texto seleccionado (Ctrl+F)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr ""
msgctxt "MessageLog"
msgid "Time"
-msgstr "Hora"
+msgstr ""
msgctxt "MessageLog"
msgid "Type"
-msgstr "Tipo"
+msgstr ""
msgctxt "MessageLog"
msgid "Message"
-msgstr "Mensaje"
+msgstr ""
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
-msgstr "Guarda las preferencias actuales del Registro de Mensajes"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Settings"
-msgstr "Guardar preferencias"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
-msgstr "Cancela los cambios hechos a las Preferencias"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filter"
-msgstr "Filtro de Mensajes"
+msgstr ""
msgctxt "MessageLog"
msgid "Error"
-msgstr "Error"
+msgstr ""
msgctxt "MessageLog"
msgid "Warning"
-msgstr "Advertencia"
+msgstr ""
msgctxt "MessageLog"
msgid "Notice"
-msgstr "Notificación"
+msgstr ""
msgctxt "MessageLog"
msgid "Info"
-msgstr "Información"
+msgstr ""
msgctxt "MessageLog"
msgid "Debug"
-msgstr "Depurar"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log History"
-msgstr "Historial del Registro de Mensajes"
+msgstr ""
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
msgstr ""
-"Cantidad de mensajes que aparecerán en la ventana del registro de mensajes"
msgctxt "MessageLog"
msgid "messages"
-msgstr "mensajes"
+msgstr ""
msgctxt "MessageLog"
msgid "Browse"
-msgstr "Examinar"
+msgstr ""
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
msgstr ""
-"Habilitar el guardado automático en un archivo de todos los mensajes nuevos"
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
-msgstr "Guardar automáticamente a un archivo los nuevos mensajes del registro"
-
-msgctxt "MessageLog"
-msgid "Basic"
msgstr ""
msgctxt "MessageLog"
-msgid "Tor Status"
+msgid "Always Save New Log Messages"
msgstr ""
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."
msgstr ""
-"Mensajes que aparecen cuando algo ha \n"
-"ido muy mal y Tor no puede continuar."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
-"Mensajes que aparecen solamente cuando \n"
-"algo ha ido mal con Tor."
msgctxt "MessageLog"
msgid ""
@@ -2440,25 +2313,18 @@ msgid ""
"not considered errors, but you may \n"
"care about."
msgstr ""
-"Mensajes que aparecen raramente \n"
-"durante la operación normal de Tor y no \n"
-"se consideran errores, pero de los que es posible que"
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
-"Mensajes que aparecen frecuentemente \n"
-"durante la operación normal de Tor."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
-"Mensajes muy especializados principalmente para \n"
-"uso de los desarrolladores de Tor."
msgctxt "MessageLog"
msgid ""
@@ -2466,244 +2332,242 @@ msgid ""
"\n"
"%2."
msgstr ""
-"No se puede escribir el archivo %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mapa de Red de Tor"
msgctxt "NetViewer"
msgid "Refresh"
-msgstr "Actualizar"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "Actualizar la lista de repetidores y conexiones de Tor"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+R"
-msgstr "Ctrl+R"
+msgstr ""
msgctxt "NetViewer"
msgid "Help"
-msgstr "Ayuda"
+msgstr ""
msgctxt "NetViewer"
msgid "Show the network map help"
-msgstr "Mostrar la ayuda del mapa de red"
+msgstr ""
msgctxt "NetViewer"
msgid "Show network map help"
-msgstr "Mostrar la ayuda del mapa de red"
+msgstr ""
msgctxt "NetViewer"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "NetViewer"
msgid "Close"
-msgstr "Cerrar"
+msgstr ""
msgctxt "NetViewer"
msgid "Close the network map"
-msgstr "Cerrar el mapa de red"
+msgstr ""
msgctxt "NetViewer"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom In"
-msgstr "Acercar"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom in on the network map"
-msgstr "Acercamiento al mapa de red"
+msgstr ""
msgctxt "NetViewer"
msgid "+"
-msgstr "+"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom Out"
-msgstr "Alejar"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom out on the network map"
-msgstr "Alejar en el mapa de red"
+msgstr ""
msgctxt "NetViewer"
msgid "-"
-msgstr "-"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom To Fit"
-msgstr "Ampliar para ajustar"
+msgstr ""
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
-msgstr "AmplÃa para ajustarse a todos los circuitos mostrados"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+Z"
-msgstr "Ctrl+Z"
+msgstr ""
msgctxt "NetViewer"
msgid "Relay Not Found"
-msgstr "Repetidor no encontrado"
+msgstr ""
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "No hay detalles disponibles del repetidor seleccionado."
+msgstr ""
msgctxt "NetViewer"
msgid "Unknown"
-msgstr "Desconocido"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
msgctxt "NetViewer"
-msgid "Full Screen"
-msgstr "Pantalla completa"
+msgid "Relay"
+msgstr ""
msgctxt "NetViewer"
-msgid "View the network map as a full screen window"
-msgstr "Ver el mapa de red como una ventana de pantalla completa"
+msgid "Connection"
+msgstr ""
msgctxt "NetViewer"
-msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgid "Status"
+msgstr ""
msgctxt "NetworkPage"
msgid "Invalid Bridge"
-msgstr "Puente no válido"
+msgstr ""
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr "El identificador de puente especificado no es válido."
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr "Copiar (Ctrl+C)"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
msgstr ""
-"Debe especificar una dirección IP o nombre del equipo y un número de puerto "
-"para configurar Tor para usar un proxy para acceder a Internet."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
msgstr ""
-"Debe especificar uno o más puertos a los que su cortafuegos le permita "
-"conectarse."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-msgstr "'%1' no es un número de puerto válido."
+msgstr ""
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
-msgstr "Marque si su red local requiere de un proxy para acceder a Internet"
+msgstr ""
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr "Uso un proxy para acceder a Internet"
+msgstr ""
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr "Configuración de Proxy"
+msgstr ""
msgctxt "NetworkPage"
msgid "Username:"
-msgstr "Nombre de Usuario:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Password:"
-msgstr "Contraseña:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Port:"
-msgstr "Puerto:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
-"Active para conectarse solamente con repetidores que usen puertos permitidos"
-" por la configuración de su cortafuegos"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr "Mi cortafuegos sólo me permite conectarme a ciertos puertos"
+msgstr ""
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "Configuración del Cortafuegos"
+msgstr ""
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr "Puertos Permitidos:"
+msgstr ""
msgctxt "NetworkPage"
msgid "80, 443"
-msgstr "80, 443"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
msgstr ""
-"Active para peticiones de directorios encriptadas y opcionalmente, usar "
-"puentes repetidores para acceder a la red Tor"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr "Mi ISP bloquea conexiones a la red Tor"
+msgstr ""
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "Configuración de Puentes"
+msgstr ""
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr "Agregar un puente:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr "Quitar de la lista los puentes seleccionados"
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr "Copiar al portapapeles los puentes seleccionados"
+msgstr ""
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "Buscar puentes ahora"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">¿De qué otra forma puedo buscar puentes?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">¿Cómo puedo buscar puentes?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
msgstr ""
-"Actualmente no hay nuevos puentes disponibles. Puede esperar un rato e "
-"intentar de nuevo o probar con otro método para encontrar nuevos puentes."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-"Haga clic en Ayuda para ver otros métodos de búsqueda de nuevos puentes"
msgctxt "NetworkPage"
msgid "Address:"
@@ -2735,440 +2599,415 @@ msgstr ""
msgctxt "Policy"
msgid "accept"
-msgstr "aceptar"
+msgstr ""
msgctxt "Policy"
msgid "reject"
-msgstr "rechazar"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Online"
-msgstr "En LÃnea"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Hibernating"
-msgstr "Hibernando"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Offline"
-msgstr "Fuera de LÃnea"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Location:"
-msgstr "Ubicación:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "IP Address:"
-msgstr "Dirección IP:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Platform:"
-msgstr "Plataforma:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
-msgstr "Ancho de Banda:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Uptime:"
-msgstr "Tiempo de disponibilidad:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
-msgstr "�ltima Actualización:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Copy"
-msgstr "Copiar"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Hibernating"
-msgstr "Hibernando"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Online"
-msgstr "En LÃnea"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Offline"
-msgstr "Fuera de LÃnea"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Unknown"
-msgstr "Desconocido"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Detalles del repetidor"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "Resumen"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Name:"
-msgstr "Nombre:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Status:"
-msgstr "Estado"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Location:"
-msgstr "Ubicación:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "IP Address:"
-msgstr "Dirección IP:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Platform:"
-msgstr "Plataforma:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Bandwidth:"
-msgstr "Ancho de Banda:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Uptime:"
-msgstr "Tiempo de disponibilidad:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Contact:"
-msgstr "Contacto:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Last Updated:"
-msgstr "�ltima Actualización:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Descriptor"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
-msgstr "Fuera de LÃnea"
+msgstr ""
msgctxt "RouterListItem"
msgid "Hibernating"
-msgstr "Hibernando"
+msgstr ""
msgctxt "RouterListItem"
msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Relay"
-msgstr "Repetidor"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr "Acercar al Repetidor"
+msgstr ""
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 repetidores en lÃnea"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Copy"
-msgstr "Copiar"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr "Sobrenombre"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr "Huella"
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "Soporte de Puentes no disponible"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
msgstr ""
-"Ha configurado Tor para actuar como repetidor de puente para usuarios "
-"censurados, pero su versión de Tor no soporta puentes."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
msgstr ""
-"Por favor, mejore su versión de Tor o configúrelo para actuar como un "
-"repetidor regular."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr "Su puente repetidor no está ejecutándose."
+msgstr ""
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr "Debe especificar al menos el sobrenombre de un repetidor y puerto."
+msgstr ""
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "Ejecutar como sólo cliente"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Repetidor de tráfico para la red Tor"
+msgstr ""
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "Puerto repetidor:"
+msgstr ""
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr "Habilitar la réplica del directorio de repetición"
+msgstr ""
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr "Intentar configurar automáticamente el reenvÃo de puertos"
+msgstr ""
msgctxt "ServerPage"
msgid "Test"
-msgstr "Prueba"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr "Mostrar el tópico de ayuda del reenvÃo de puertos"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port:"
-msgstr "Puerto del Directorio:"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port Number"
-msgstr "Número del Puerto del Directorio"
+msgstr ""
msgctxt "ServerPage"
msgid "Contact Info:"
-msgstr "Información de Contacto:"
+msgstr ""
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr "Nombre de su repetidor"
+msgstr ""
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
msgstr ""
-"Puerto por el que los usuarios y otros repetidores pueden comunicarse con su"
-" repetidor"
msgctxt "ServerPage"
msgid "Nickname:"
-msgstr "Sobrenombre:"
+msgstr ""
msgctxt "ServerPage"
msgid "Basic Settings"
-msgstr "Preferencias Básicas"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
msgstr ""
-"Para conexiones de internet con velocidades de descarga rápida pero subida "
-"lenta, por favor escriba su velocidad de subida aquÃ."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
-msgstr "Cable/DSL 256 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
-msgstr "Cable/DSL 512 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
-msgstr "Cable/DSL 768 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr "T1/Cable/DSL 1.5 Mbps"
+msgstr ""
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
-msgstr "> 1.5 Mbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Custom"
-msgstr "Especificado"
+msgstr ""
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr "Seleccione la entrada que más se parezca a su conexión de Internet"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
-msgstr "Mostrar ayuda acerca de los limites de tasas del ancho de banda"
+msgstr ""
msgctxt "ServerPage"
msgid "Average Rate"
-msgstr "Tasa Promedio"
+msgstr ""
msgctxt "ServerPage"
msgid "Long-term average bandwidth limit"
-msgstr "Tasa de ancho de banda promedio a largo plazo"
+msgstr ""
msgctxt "ServerPage"
msgid "KB/s"
-msgstr "KB/s"
+msgstr ""
msgctxt "ServerPage"
msgid "Maximum Rate"
-msgstr "Tasa Máxima"
+msgstr ""
msgctxt "ServerPage"
msgid "Peak bandwidth rate limit"
-msgstr "Limite pico de la tasa del ancho de banda"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
-"La tasa máxima de su ancho de banda debe ser mayor o igual que su tasa de "
-"ancho de banda promedio. Ambos valores deben ser al menos 20KB/s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
-msgstr "Limites del Ancho de Banda"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 6660 - 6669 and 6697"
-msgstr "Puertos 6660 - 6669 y 6697"
+msgstr ""
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
-msgstr "Conversación de Repetidor de Internet (IRC)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
-msgstr "Puertos 110, 143, 993 y 995"
+msgstr ""
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr "Recibir Correo (POP, IMAP)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
-msgstr "Puertos no especificados por otras casillas de verificación"
+msgstr ""
msgctxt "ServerPage"
msgid "Misc Other Services"
-msgstr "Otros servicios misceláneos"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "Puertos 706, 1863, 5050, 5190, 5222, 5223, 8300 y 8888"
+msgstr ""
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
-msgstr "MensajerÃa Instantánea (IM)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 443"
-msgstr "Puerto 443"
+msgstr ""
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
-msgstr "Sitios Web Seguros (SSL)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 80"
-msgstr "Puerto 80"
+msgstr ""
msgctxt "ServerPage"
msgid "Websites"
-msgstr "Sitios Web"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on exit policies"
-msgstr "Mostrar ayuda acerca de las polÃticas de salida"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
msgstr ""
-"¿A cuáles recursos de Internet podrán acceder los usuarios conectados a su "
-"repetidor?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
msgstr ""
-"Tor seguirá bloqueando algún correo saliente y aplicaciones de compartir "
-"archivos de manera predeterminada para reducir el correo basura y otros "
-"abusos."
msgctxt "ServerPage"
msgid "Exit Policies"
-msgstr "PolÃticas de Salida"
+msgstr ""
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr "Permitir a otros acceder a su puente dándoles esta lÃnea:"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
msgstr ""
-"Este es el identificador de su puente repetidor que puede ofrecer a otras "
-"personas"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "Copiar el identificador de su puente retransmisor al portapapeles"
+msgstr ""
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr "Sin uso reciente"
+msgstr ""
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr "Ningún cliente ha usado recientemente su repetidor"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
msgstr ""
-"Permita que su repetidor siga ejecutándose para que los clientes tengan más "
-"oportunidades de encontrarlo y usarlo"
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr "Historial de puentes"
+msgstr ""
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr "Vidalia no pudo recuperar el historial de utilización de sus puentes."
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
msgstr ""
-"Tor devolvió una respuesta con formato incorrecto cuando Vidalia solicitó el"
-" historial de utilización de sus puentes."
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr "La respuesta devuelta fue: %1"
+msgstr ""
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr "Ayude a usuarios censurados a acceder a la red Tor"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"#bridgeUsage\">¿Quién ha utilizado mi puente?</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
@@ -3179,101 +3018,100 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (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"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
-"Dirección de correo electrónico en la cual podrÃa localizársele si hubiera un\n"
-"problema con su repetidor. Pudiera incluir también su huella PGP o GPG."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr "Error al tratar de quitar la publicación de todos los servicios"
+msgstr ""
msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
msgstr ""
-"Por favor, configure al menos un servidor de directorios y un puerto virtual"
-" por cada servicio que quiera guardar. Elimine los otros."
msgctxt "ServicePage"
msgid "Error"
-msgstr "Error"
+msgstr ""
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "Por favor, seleccione un Servicio."
+msgstr ""
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr "Seleccione Servicio de Directorio"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
-msgstr "El Puerto Virtual sólo puede contener puertos válidos [1..65535]."
+msgstr ""
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr "El destino sólo puede contener dirección:puerto, dirección, o puerto."
+msgstr ""
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr "Directorio ya en uso por otro servicio."
-
-msgctxt "ServicePage"
-msgid "Form"
-msgstr "Formulario"
+msgstr ""
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "Provistos Servicios Ocultos"
+msgstr ""
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "Dirección Onion"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr "Puerto Virtual"
+msgstr ""
msgctxt "ServicePage"
msgid "Target"
-msgstr "Destino"
+msgstr ""
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "Ruta del Directorio"
+msgstr ""
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "Habilitado"
+msgstr ""
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr "Agregar nuevo servicio a la lista"
+msgstr ""
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr "Quitar servicio seleccionado de la lista"
+msgstr ""
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "Copiar dirección onion del servicio seleccionado al portapapeles"
+msgstr ""
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
msgstr ""
-"Explorar sus archivos y elegir un directorio para servicios seleccionados"
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr "Creado por Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
@@ -3520,57 +3358,79 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
-msgstr "Nuevo"
+msgstr ""
msgctxt "Stream"
msgid "Resolving"
-msgstr "Resolviendo"
+msgstr ""
msgctxt "Stream"
msgid "Connecting"
-msgstr "Conectando"
+msgstr ""
msgctxt "Stream"
msgid "Open"
-msgstr "Abrir"
+msgstr ""
msgctxt "Stream"
msgid "Failed"
-msgstr "Falló"
+msgstr ""
msgctxt "Stream"
msgid "Closed"
-msgstr "Cerrado"
+msgstr ""
msgctxt "Stream"
msgid "Retrying"
-msgstr "Intentando de nuevo"
+msgstr ""
msgctxt "Stream"
msgid "Remapped"
-msgstr "Remapeado"
+msgstr ""
msgctxt "Stream"
msgid "Unknown"
-msgstr "Desconocido"
+msgstr ""
+
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not 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]"
+msgstr ""
msgctxt "TorService"
msgid "The Tor service is not installed."
-msgstr "El servicio Tor no esta instalado."
+msgstr ""
msgctxt "TorService"
msgid "Unable to start the Tor service."
-msgstr "No se puede comenzar el servicio Tor."
+msgstr ""
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr "Falló al obtener hash de la contraseña de control."
+msgstr ""
msgctxt "TorrcDialog"
msgid "Editing torrc"
@@ -3634,140 +3494,157 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+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"
+msgstr ""
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr "No se encontraron dispositivos UpnP habilitados"
+msgstr ""
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
msgstr ""
-"No se encontraron dispositivos UPnP de puertas de enlace de Internet válidos"
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr "WSAStartup falló"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr "Falló al agregar un mapeo de puertos"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
-msgstr "Falló el reintento de mapeo de puertos"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
-msgstr "Falló al eliminar el mapeo de puertos"
+msgstr ""
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr "Error desconocido"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr "Buscando dispositivos UpnP habilitados"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr "Actualizando el directorio de mapeo de puertos"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr "Actualizando el mapeo de puertos del repetidor"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr "¡La prueba concluyó de manera exitosa!"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
-msgstr "Probando el Soporte UPnP"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
-msgstr "Probando el Soporte Universal Plug & Play"
+msgstr ""
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
msgstr ""
-"Vidalia no pudo verificar la existencia de actualizaciones de software "
-"disponibles porque no pudo encontrar '%1'. "
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
msgstr ""
-"Vidalia no pudo verificar si hay actualizaciones de software disponibles "
-"porque el proceso de actualización de Tor terminó inesperadamente."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
-msgstr "Verificando si hay actualizaciones disponibles..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Hide"
-msgstr "Ocultar"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "Descargando actualizaciones..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
-msgstr "Instalando el software actualizado..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr "¡Terminado! Su software ya está actualizado."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "OK"
-msgstr "Aceptar"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "Actualizaciones de Software"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr "Verificando si hay actualizaciones..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
-msgstr "Actualizaciones de software disponible"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Recordármelo más tarde"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr "Instalar"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
msgstr ""
-"Los siguientes paquetes de software actualizados están listos para su "
-"instalación:"
msgctxt "UpdatesAvailableDialog"
msgid "Package"
-msgstr "Paquete"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr "Versión"
+msgstr ""
msgctxt "UploadProgressDialog"
msgid "Uploading Crash Report"
@@ -3779,109 +3656,107 @@ msgstr ""
msgctxt "VMessageBox"
msgid "OK"
-msgstr "Aceptar"
+msgstr ""
msgctxt "VMessageBox"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
msgctxt "VMessageBox"
msgid "Yes"
-msgstr "Si"
+msgstr ""
msgctxt "VMessageBox"
msgid "No"
-msgstr "No"
+msgstr ""
msgctxt "VMessageBox"
msgid "Help"
-msgstr "Ayuda"
+msgstr ""
msgctxt "VMessageBox"
msgid "Retry"
-msgstr "Intentar de nuevo"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Log"
-msgstr "Mostrar Registro"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Settings"
-msgstr "Mostrar Preferencias"
+msgstr ""
msgctxt "VMessageBox"
msgid "Continue"
-msgstr "Continuar"
+msgstr ""
msgctxt "VMessageBox"
msgid "Quit"
-msgstr "Salir"
+msgstr ""
msgctxt "VMessageBox"
msgid "Browse"
-msgstr "Examinar"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid Argument"
-msgstr "Argumento no válido"
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia is already running"
-msgstr "Vidalia ya está ejecutándose"
+msgstr ""
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
-msgstr "Muestra este mensaje y sale."
+msgstr ""
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
-msgstr "Restablece TODAS las preferencias almacenadas de Vidalia."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr "Establece el directorio de Vidalia para archivos de información."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
msgstr ""
-"Establece el nombre y la ubicación del archivo de procesos de Vidalia."
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
msgstr ""
-"Establece el nombre y la ubicación del archivo de registro de Vidalia."
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "Establece el nivel de registro de Vidalia."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
-msgstr "Establece el estilo de la interfaz de Vidalia"
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
-msgstr "Establece el idioma de Vidalia."
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
-msgstr "Información de Uso de Vidalia"
+msgstr ""
msgctxt "Vidalia"
msgid "Unable to open log file '%1': %2"
-msgstr "No se puede abrir el archivo de registro '%1': %2"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr "Código de idioma especificado no válido:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "Estilo de Interfaz Gráfica de Usuario especificado no válido:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Nivel de registro especificado no válido:"
+msgstr ""
msgctxt "Vidalia"
msgid ""
@@ -3889,38 +3764,35 @@ msgid ""
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
-"Posiblemente ya se esté ejecutando otro proceso de Vidalia. Si realmente no hay otro proceso de Vidalia ejecutándose, puede optar por continuar de todos modos.\n"
-"\n"
-"Quiere continuar con el inicio de Vidalia?"
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 secs"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 B/s"
-msgstr "%1 B/s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 MB/s"
-msgstr "%1 MB/s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 GB/s"
-msgstr "%1 GB/s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 days"
-msgstr "%1 dÃas"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 hours"
-msgstr "%1 horas"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
-msgstr "%1 min."
+msgstr ""
diff --git a/src/vidalia/i18n/po/et/vidalia_et.po b/src/vidalia/i18n/po/et/vidalia_et.po
index 5231fd2..1114b97 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-04-18 08:50+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 e8ad97f..102414a 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-04-18 08:50+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 2a7719d..1c99122 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-04-18 08:48+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:09+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 25b68e4..d41eb00 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-04-18 08:47+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:08+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 a7df81e..8b98742 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-04-18 08:44+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:04+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 ebf2f7b..ee875d5 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-04-18 08:44+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:05+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 38c1206..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 c189d0b..80cc080 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-04-18 08:48+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:09+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 e5fe2ea..2c9c814 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-04-18 08:47+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:08+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 78fff8e..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 08d2fb8..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 7259ab5..65a919c 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-04-18 08:47+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:07+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 8e34e5c..651ca94 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-04-18 08:47+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:08+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 0d80e4d..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 aa81b8c..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 836ca05..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 7ee2636..879c203 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-22 16:13+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 19:51+0000\n"
"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\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"
@@ -16,126 +16,124 @@ msgstr ""
msgctxt "AboutDialog"
msgid "About Vidalia"
-msgstr "Informazioni su Vidalia"
+msgstr ""
msgctxt "AboutDialog"
msgid "License"
-msgstr "Licenza"
+msgstr ""
msgctxt "AboutDialog"
msgid "Vidalia 0.2.0"
-msgstr "Vidalia"
+msgstr ""
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
-msgstr "Tor 0.2.0.32"
+msgstr ""
msgctxt "AboutDialog"
msgid "Qt 4.4.2"
-msgstr "4.4.2"
+msgstr ""
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
-msgstr "'%1' non è un indirizzo IP valido."
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
msgstr ""
-"Hai scelto l'autenticazione tramite password, ma non ne hai specificata "
-"nessuna."
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
-msgstr "Scegliere il file di configurazione di Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "File Not Found"
-msgstr "File non trovato."
+msgstr ""
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
-msgstr "%1 non esiste. Vuoi crearlo?"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Failed to Create File"
-msgstr "Non è possibile creare il file"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
-msgstr "Non è possibile creare %1 [%2]"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
-msgstr "Selezionare una cartella da usare per i dati di Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
-msgstr "Impossibile rimuovere il servizio Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
-msgstr "Impossibile installare il servizio Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
-msgstr "Vidalia non è riuscitoad installare il servizio Tor."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Authentication:"
-msgstr "Autenticazione:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Address:"
-msgstr "Indirizzo:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "None"
-msgstr "Nessuno"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Cookie"
-msgstr "Cookie"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Password"
-msgstr "Password"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "Genera casualmente"
+msgstr ""
msgctxt "AdvancedPage"
msgid ":"
-msgstr ":"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
-msgstr "File di configurazione di Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "Avvia Tor con il file di configurazione (torrc) specificato"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
-msgstr "Seleziona il percorso del tuo file di configurazione"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Browse"
-msgstr "Sfoglia"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Data Directory"
-msgstr "Cartella dei dati"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "Conserva i dati di Tor nella seguente cartella"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
-msgstr "Seleziona la cartella per conservare i dati di Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Control"
@@ -199,967 +197,969 @@ msgid ""
"\n"
"You may need to remove it manually."
msgstr ""
-"Vidalia non ha potuto rimuovere il servizio Tor.\n"
-"\n"
-"Dovresti rimuoverlo manualmente."
msgctxt "AppearancePage"
msgid "Language"
-msgstr "Lingua"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Scegli la lingua da usare in Vidalia"
+msgstr ""
msgctxt "AppearancePage"
msgid "Style"
-msgstr "Stile"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
-msgstr "Scegliere lo stile dell'interfaccia di Vidalia"
+msgstr ""
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
msgstr ""
-"Vidalia non è in grado di caricare la traduzione della lingua prescelta"
msgctxt "BandwidthGraph"
msgid "Since:"
-msgstr "Dal:"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Hide Settings"
-msgstr "Nascondi impostazioni"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Show Settings"
-msgstr "Mostra Impostazioni"
-
-msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Utilizzo di banda di Tor"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Reset"
-msgstr "Reinizializza"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Receive Rate"
-msgstr "Velocità di ricezione"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Send Rate"
-msgstr "Velocità di invio"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Always on Top"
-msgstr "Sempre in primo piano"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Style"
-msgstr "Stile"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Modifica la trasparenza del grafico dell'ampiezza di banda"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "100"
-msgstr "100"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "% Opaque"
-msgstr "% Opaco"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Save"
-msgstr "Salva"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Cancel"
-msgstr "Annulla"
+msgstr ""
+
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "Inizio la richiesta HTTPS di bridge..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
-msgstr "In connessione a %1:%2..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Invio una richiesta HTTPS di bridge..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "Scarico una lista di bridge..."
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "Scarico i Bridge"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "Non riesco a scaricare i bridge: %1"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "Riprovo a richiedere i bridge..."
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Country"
-msgstr "Paese"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "# Clients"
-msgstr "# di client"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr "A partire da %1 i client di questi paesi hanno usato il tuo relay"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Riepilogo sull'uso del bridge"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "Riepilogo sui client"
+msgstr ""
msgctxt "Circuit"
msgid "New"
-msgstr "Nuovo"
+msgstr ""
msgctxt "Circuit"
msgid "Open"
-msgstr "Aperto"
+msgstr ""
msgctxt "Circuit"
msgid "Building"
-msgstr "In costruzione"
+msgstr ""
msgctxt "Circuit"
msgid "Failed"
-msgstr "Non funzionante"
+msgstr ""
msgctxt "Circuit"
msgid "Closed"
-msgstr "Chiuso"
+msgstr ""
msgctxt "Circuit"
msgid "Unknown"
-msgstr "Sconosciuto"
+msgstr ""
msgctxt "CircuitItem"
msgid "<Path Empty>"
-msgstr "<Percorso vuoto>"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Connection"
-msgstr "Connessione"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Status"
-msgstr "Stato"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
-msgstr "Dettagli del circuito"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
-msgstr "Chiudi circuito (Canc)"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "Chiudi flusso (Canc)"
+msgstr ""
msgctxt "ConfigDialog"
msgid "General"
-msgstr "Generale"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Network"
-msgstr "Rete"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Sharing"
-msgstr "Condivisione"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Services"
-msgstr "Servizi"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Appearance"
-msgstr "Aspetto"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Advanced"
-msgstr "Avanzato"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Help"
-msgstr "Aiuto"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr "Errore nel salvare le impostazioni"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
-msgstr "Vidalia non è riuscito a salvare la tua impostazione %1"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
-msgstr "Errore nell'applicare le impostazioni"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr "Vidalia non è riuscito ad applicare la tua impostazione %1 a Tor"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Settings"
-msgstr "Impostazioni"
+msgstr ""
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Vidalia non è riuscito a collegarsi a Tor. (%1)"
+msgstr ""
msgctxt "ControlConnection"
msgid "Control socket is not connected."
-msgstr "Il socket di controllo non è connesso."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Password richiesta"
+msgid ""
+"Tor is already running, but Vidalia can't connect to 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 "Ricorda la mia 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 ""
-"Vidalia si è collegato a un processo Tor in corse che richiede una password."
-" Inserisci la tua password di controllo:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
-msgstr "Il socket di controllo non è connesso."
+msgstr ""
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
-msgstr "Errore nell'invio del comando di controllo. [%1]"
+msgstr ""
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
msgstr ""
-"Il socket si è disconnesso durante il tentativo di leggere una riga di dati."
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
-msgstr "Risposta di controllo non valida. [%1]"
+msgstr ""
msgctxt "CountryInfo"
msgid "Afghanistan"
-msgstr "Afghanistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Andorra"
-msgstr "Andorra"
+msgstr ""
msgctxt "CountryInfo"
msgid "Angola"
-msgstr "Angola"
+msgstr ""
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr "Antigua & Barbuda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Argentina"
-msgstr "Argentina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr "Armenia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Australia"
-msgstr "Australia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "Azerbaijan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr "Bahamas"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "Bangladesh"
+msgstr ""
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "Barbados"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "Bielorussia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr "Belgio"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belize"
-msgstr "Belize"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr "Bhutan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr "Bolivia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr "Bosnia Herzegovina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "Botswana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr "Brasile"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Brunei Darussalam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr "Bulgaria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr "Burkina Faso"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr "Burundi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "Cambogia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "Camerun"
+msgstr ""
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "Canada"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "Capo Verde"
+msgstr ""
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "Repubblica Centrafricana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "Ciad"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chile"
-msgstr "Cile"
+msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "Cina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr "Colombia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Comore"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "Repubblica Democratica del Congo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "Congo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr "Costa Rica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cote d�Ivoire"
-msgstr "Costa d'Avorio"
+msgstr ""
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "Croazia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "Cuba"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "Cipro"
+msgstr ""
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "Repubblica Ceca"
+msgstr ""
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "Danimarca"
+msgstr ""
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "Gibuti"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "Dominica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "Repubblica Dominicana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "Ecuador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "Egitto"
+msgstr ""
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr "El Salvador"
+msgstr ""
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "Guibnea Equatoriale"
+msgstr ""
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "Eritrea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "Estonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "France"
-msgstr "Francia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr "Gabon"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "Gambia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Georgia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Germany"
-msgstr "Germania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr "Ghana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Grenada"
-msgstr "Grenada"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guatemala"
-msgstr "Guatemala"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea"
-msgstr "Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr "Guinea-Bissau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guyana"
-msgstr "Guyana"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hong Kong"
-msgstr "Hong Kong"
+msgstr ""
msgctxt "CountryInfo"
msgid "Haiti"
-msgstr "Haiti"
+msgstr ""
msgctxt "CountryInfo"
msgid "Honduras"
-msgstr "Honduras"
+msgstr ""
msgctxt "CountryInfo"
msgid "Israel"
-msgstr "Israele"
+msgstr ""
msgctxt "CountryInfo"
msgid "Italy"
-msgstr "Italia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "Giamaica"
+msgstr ""
msgctxt "CountryInfo"
msgid "Japan"
-msgstr "Giappone"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr "Giordania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "Kazakistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr "Kenya"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr "Kiribati"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "Kuwait"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "Kirgizistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Laos"
-msgstr "Laos"
+msgstr ""
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr "Lettonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr "Libano"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr "Lesotho"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr "Liberia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "Liechtenstein"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr "Lituania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr "Lussemburgo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr "Macedonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr "Madagascar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "Malawi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr "Malesia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "Mali"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malta"
-msgstr "Malta"
+msgstr ""
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr "Isole Marshall"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "Mauritania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "Mauritius"
+msgstr ""
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr "Micronesia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "Moldavia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "Monaco"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr "Mongolia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr "Montenegro"
+msgstr ""
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr "Marocco"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr "Mozambico"
+msgstr ""
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "Namibia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr "Nauru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr "Nepal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr "Olanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "Nuova Zelanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr "Nicaragua"
+msgstr ""
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "Niger"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "Nigeria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "Norvegia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "Oman"
+msgstr ""
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr "Pakistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "Palau"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr "Palestina"
+msgstr ""
msgctxt "CountryInfo"
msgid "Panama"
-msgstr "Panama"
+msgstr ""
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Papua Nuova Guinea"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "Paraguay"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "Peru"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "Filippine"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "Polonia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "Portogallo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Qatar"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "Romania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "Russia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "Ruanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "Saint Kitts & Nevis"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "Saint Lucia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "Saint Vincent & the Grenadines"
+msgstr ""
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr "Samoa"
+msgstr ""
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "San Marino"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "Sao Tome & Principe"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "Arabia Saudita"
+msgstr ""
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr "Senegal"
+msgstr ""
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr "Serbia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "Seychelles"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr "Sierra Leone"
+msgstr ""
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "Singapore"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "Slovacchia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "Slovenia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "Isole Salomone"
+msgstr ""
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "Somalia"
+msgstr ""
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "Sud Africa"
+msgstr ""
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "Spagna"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "Sri Lanka"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr "Sudan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "Suriname"
+msgstr ""
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr "Swaziland"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "Svezia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "Svizzera"
+msgstr ""
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "Siria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "Tagikistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "Tanzania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "Tailandia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "Timor Est"
+msgstr ""
msgctxt "CountryInfo"
msgid "Togo"
-msgstr "Togo"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr "Tonga"
+msgstr ""
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "Trinidad & Tobago"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "Tunisia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr "Turchia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "Turkmenistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr "Tuvalu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr "Uganda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr "Ucraina"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "Emirati Arabi Uniti"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "Regno Unito"
+msgstr ""
msgctxt "CountryInfo"
msgid "United States"
-msgstr "Stati Uniti"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr "Uruguay"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "Uzbekistan"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr "Vanuatu"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "Vaticano"
+msgstr ""
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "Venezuela"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr "Vietnam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Sahara Occidentale"
+msgstr ""
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr "Yemen"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr "Zambia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr "Zimbabwe"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zaire"
@@ -1167,99 +1167,99 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr "Albania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr "Algeria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "Austria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Bahrain"
+msgstr ""
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "Benin"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr "Etiopia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "Figi"
+msgstr ""
msgctxt "CountryInfo"
msgid "Finland"
-msgstr "Finlandia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Greece"
-msgstr "Grecia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guam"
-msgstr "Guam"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "Ungheria"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr "Islanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "India"
-msgstr "India"
+msgstr ""
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr "Indonesia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iran"
-msgstr "Iran"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr "Iraq"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "Irlanda"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "Corea del Nord"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "Corea del Sud"
+msgstr ""
msgctxt "CountryInfo"
msgid "Libya"
-msgstr "Libia"
+msgstr ""
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr "Maldive"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "Messico"
+msgstr ""
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "Birmania"
+msgstr ""
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "Taiwan"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
@@ -1319,215 +1319,215 @@ msgstr ""
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
-msgstr "Eseguibili (*.exe)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "Imposta il percorso di Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "Seleziona l'eseguibile del proxy"
+msgstr ""
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr "Devi indicare il nome dell'eseguibile di Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr "Avvia Vidalia all'avvio del sistema"
+msgstr ""
msgctxt "GeneralPage"
msgid "Browse"
-msgstr "Sfoglia"
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Avvia Tor quando Vidalia viene avviato"
+msgstr ""
msgctxt "GeneralPage"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "Applicazione Proxy (facoltativa)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "Avvia un'applicazione proxy quando Tor si avvia"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "Argomenti applicazione proxy:"
+msgstr ""
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "Aggiornamenti Software"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Controlla automaticamente gli aggiornamenti software"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "Controlla adesso"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB"
-msgstr "%1 KB"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 MB"
-msgstr "%1 MB"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 GB"
-msgstr "%1 GB"
+msgstr ""
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr "Ricevuti:"
+msgstr ""
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Inviati:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
-msgstr "Il file XML specificato non è un documento valido di contenuto."
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached end of document"
-msgstr "La ricerca ha raggiunto la fine del documento"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached start of document"
-msgstr "La ricerca ha raggiunto l'inizio del documento"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Text not found in document"
-msgstr "Il testo non è stato trovato nel documento"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found %1 results"
-msgstr "Trovati %1 risultati"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Vidalia Help"
-msgstr "Aiuto di Vidalia"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Back"
-msgstr "Indietro"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to previous page (Backspace)"
-msgstr "Sposta alla pagina precedente (Backspace)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Backspace"
-msgstr "Backspace"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Forward"
-msgstr "Avanti"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
-msgstr "Sposta alla prossima pagina (Shift+Backspace)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Shift+Backspace"
-msgstr "Shift+Backspace"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Home"
-msgstr "Home"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to the Home page (Ctrl+H)"
-msgstr "Vai alla Home (Ctrl+H)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+H"
-msgstr "Ctrl+H"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find"
-msgstr "Cerca"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr "Cerca una parola o una frase nella pagina corrente (Crtl+F)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close"
-msgstr "Chiudi"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close Vidalia Help"
-msgstr "Chiudi l'aiuto di Vidalia"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find:"
-msgstr "Cerca:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Previous"
-msgstr "Cerca precedente"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Next"
-msgstr "Cerca successivo"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "Maiuscole/minuscole"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Whole words only"
-msgstr "Solo parole intere"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Help Topics"
-msgstr "Argomenti"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Contents"
-msgstr "Contenuti"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search"
-msgstr "Cerca"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Searching for:"
-msgstr "Ricerca di:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found Documents"
-msgstr "Documenti trovati"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "Errore nel caricamento dei contenuti d'aiuto"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "Apertura di un collegamento esterno"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
@@ -1535,65 +1535,60 @@ msgid ""
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
msgstr ""
-"Vidalia può aprire il collegamento che hai scelto dentro il tuo browser web "
-"predefinito. Se il tuo browser non è configurato per usare Tor, la richiesta"
-" non sarà anonima."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Vuoi che Vidalia apra il collegamento nel tuo browser web?"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "Impossibile aprire il collegamento"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
msgstr ""
-"Vidalia non è riuscito ad aprire il collegamento nel tuo browser web. Puoi "
-"sempre copiare l'indirizzo e incollarlo nel tuo browser."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "Errore nell'apertura del file di aiuto"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
-msgstr "Informazioni sulla licenza"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License"
-msgstr "Licenza"
+msgstr ""
msgctxt "LicenseDialog"
msgid "Credits"
-msgstr "Crediti"
+msgstr ""
msgctxt "LogEvent"
msgid "Debug"
-msgstr "Debug"
+msgstr ""
msgctxt "LogEvent"
msgid "Info"
-msgstr "Informazioni"
+msgstr ""
msgctxt "LogEvent"
msgid "Notice"
-msgstr "Avviso"
+msgstr ""
msgctxt "LogEvent"
msgid "Warning"
-msgstr "Attenzione"
+msgstr ""
msgctxt "LogEvent"
msgid "Error"
-msgstr "Errore"
+msgstr ""
msgctxt "LogEvent"
msgid "Unknown"
-msgstr "Sconosciuto"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Debug"
@@ -1621,472 +1616,336 @@ msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Avvia Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Exit"
-msgstr "Esci"
+msgstr ""
msgctxt "MainWindow"
msgid "Bandwidth Graph"
-msgstr "Grafico dell'ampiezza di banda"
+msgstr ""
msgctxt "MainWindow"
msgid "Message Log"
-msgstr "Log dei messaggi"
+msgstr ""
msgctxt "MainWindow"
msgid "Network Map"
-msgstr "Mappa della rete"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr "Pannello di controllo"
+msgstr ""
msgctxt "MainWindow"
msgid "Settings"
-msgstr "Impostazioni"
+msgstr ""
msgctxt "MainWindow"
msgid "About"
-msgstr "Informazioni su"
+msgstr ""
msgctxt "MainWindow"
msgid "Help"
-msgstr "Aiuto"
+msgstr ""
msgctxt "MainWindow"
msgid "New Identity"
-msgstr "Nuova identità "
-
-msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "View"
-msgstr "Mostra"
-
-msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Aiuto di Vidalia"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Errore nell'avvio del browser web"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia non è riuscito ad avviare il browser web impostato"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "Errore all'avvio del client IM"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia non è riuscito a configurare il client IM"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "Errore nell'avvio del proxy server"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia non è riuscito ad avviare il proxy server configurato"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "Connessione ad una directory dei relay"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "Sto creando una connessione cifrata alla directory"
+msgstr ""
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr "Sto ottenendo informazioni sullo stato della rete"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading network status"
-msgstr "Caricamento dello stato della rete"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "Caricamento dei certificati delle authority"
+msgstr ""
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "Richiesta di informazioni sui relay"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "Caricamento delle informazioni sui relay"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Mi sto connettendo alla rete Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "Sto creando un circuito Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "Connesso alla rete Tor!"
+msgstr ""
msgctxt "MainWindow"
msgid "Unrecognized startup status"
-msgstr "Stato di avvio non riconosciuto"
+msgstr ""
msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr "varie"
+msgstr ""
msgctxt "MainWindow"
msgid "identity mismatch"
-msgstr "discordanza di identità "
+msgstr ""
msgctxt "MainWindow"
msgid "done"
-msgstr "fatto"
+msgstr ""
msgctxt "MainWindow"
msgid "connection refused"
-msgstr "connessione rifiutata"
+msgstr ""
msgctxt "MainWindow"
msgid "connection timeout"
-msgstr "timeout della connessione"
+msgstr ""
msgctxt "MainWindow"
msgid "read/write error"
-msgstr "errore di lettura/scrittura"
+msgstr ""
msgctxt "MainWindow"
msgid "no route to host"
-msgstr "nessun rotta per l'host"
+msgstr ""
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "risorse insufficienti"
+msgstr ""
msgctxt "MainWindow"
msgid "unknown"
-msgstr "sconosciuto"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is not running"
-msgstr "Tor non è attivo"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is shutting down"
-msgstr "Arresto di Tor in corso"
-
-msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Ferma Tor adesso"
+msgstr ""
msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "Ferma Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "Avvio del software Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "Avvio di Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Starting Tor"
-msgstr "Errore nell'avvio di Tor"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
msgstr ""
-"Vidalia non è riuscito ad avviare Tor. Controlla le impostazioni per "
-"assicurarti di aver specificato nome e posizione corretti per l'eseguibile "
-"di Tor."
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr "Connessione a Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "Errore di connessione"
+msgstr ""
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr "Il relaying è attivato"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr "Errore durante la chiusura"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr "Vidalia non è riuscito a chiudere Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "Errore inaspettato"
+msgstr ""
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "Autenticazione a Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "Autenticazione tramite cookie richiesta"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
msgstr ""
-"Tor richiede Vidalia per mandare i contenuti di un cookie di autenticazione,"
-" ma Vidalia non è stato in grado di trovarne uno."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr "Vuoi cercare manualmente il file 'control_auth_cookie'?"
+msgstr ""
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "Directory dai dati"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "Cookie di controllo (control_auth_cookie)"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "Errore nella registrazione degli eventi"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
msgstr ""
-"Vidalia non è stato in grado di registrare alcuni eventi. Alcune funzioni di"
-" Vidalia potrebbero non essere disponibili"
-
-msgctxt "MainWindow"
-msgid "Authentication Error"
-msgstr "Errore di autenticazione"
-
-msgctxt "MainWindow"
-msgid "Vidalia was unable to authenticate to the Tor software. (%1)"
-msgstr "Vidalia non è riuscito ad autenticarsi al software Tor. (%1)"
-
-msgctxt "MainWindow"
-msgid "Please check your control port authentication settings."
-msgstr ""
-"Verificare le impostazioni di autenticazione per la porta di controllo."
msgctxt "MainWindow"
msgid "Tor Update Available"
-msgstr "Ã? disponibile un aggiornamento di Tor"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
msgstr ""
-"L'installazione corrente di Tor è obsoleta o non è più raccomandata. Per "
-"favore visita il sito di Tor per scaricare l'ultima versione."
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr "Sito Tor: %1"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
-msgstr "Tutte le nuove connessioni appariranno diverse dalle vecchie."
+msgstr ""
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
-msgstr "Impossibile creare una nuova identità "
+msgstr ""
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "Port forwarding fallito"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr "Vidalia non è riuscito a configurare il port forwarding automatico"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr "Pannello di controllo Vidalia"
+msgstr ""
msgctxt "MainWindow"
msgid "Status"
-msgstr "Stato"
-
-msgctxt "MainWindow"
-msgid "Vidalia Shortcuts"
-msgstr "Shortcut di Vidalia"
-
-msgctxt "MainWindow"
-msgid "Setup Relaying"
-msgstr "Configurazione del relaying"
-
-msgctxt "MainWindow"
-msgid "Set up a relay and help the network grow"
-msgstr "Imposta un relay e aiuta la rete a crescere"
-
-msgctxt "MainWindow"
-msgid "View the Network"
-msgstr "Mostra la rete"
-
-msgctxt "MainWindow"
-msgid "View a map of the Tor network"
-msgstr "Mostra una mappa della rete Tor"
-
-msgctxt "MainWindow"
-msgid "Use a New Identity"
-msgstr "Usa una nuova identità "
-
-msgctxt "MainWindow"
-msgid "Make subsequent connections appear new"
-msgstr "Fai apparire come nuove le prossime connessioni"
-
-msgctxt "MainWindow"
-msgid "View recent bandwidth usage"
-msgstr "Guarda l'utilizzo recente della banda"
-
-msgctxt "MainWindow"
-msgid "View log message history"
-msgstr "Guarda la cronologia dei messaggi di log"
-
-msgctxt "MainWindow"
-msgid "View help documentation"
-msgstr "Mostra la documentazione"
-
-msgctxt "MainWindow"
-msgid "Configure Vidalia"
-msgstr "Configura Vidalia"
-
-msgctxt "MainWindow"
-msgid "View version and license information"
-msgstr "Mostra informazioni sulla versione e sulla licenza"
-
-msgctxt "MainWindow"
-msgid "Exit Vidalia"
-msgstr "Esci da Vidalia"
-
-msgctxt "MainWindow"
-msgid "Show this window on startup"
-msgstr "Mostra questa finestra all'avvio"
-
-msgctxt "MainWindow"
-msgid "Hide"
-msgstr "Nascondi"
-
-msgctxt "MainWindow"
-msgid "Hide this window"
-msgstr "Nasconde questa finestra"
+msgstr ""
msgctxt "MainWindow"
msgid "Password Reset Failed"
-msgstr "Reset della password fallito"
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
msgstr ""
-"Vidalia ha provato a resettare la password di controllo di Tor, ma non è "
-"riuscito a riavviare Tor. Controlla il tuo Task Manager per assicurarsi che "
-"non vi sono altri processi Tor in esecuzione"
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
msgstr ""
-"L'installazione corrente di Tor è obsoleta o non è più raccomandata. Per "
-"favore visita il sito di Tor per scaricare l'ultima versione."
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr "Vuoi controllare se c'è un pacchetto più recente da installare?"
+msgstr ""
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "Connessione potenzialmente insicura"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
msgstr ""
-"Tor ha chiuso automaticamente la connessione per proteggere il tuo "
-"anonimato."
msgctxt "MainWindow"
msgid "Update Failed"
-msgstr "Ã? disponibile un aggiornamento di Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "Il software è aggiornato"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
-msgstr "Per ora non ci sono nuovi pacchetti software Tor per il tuo computer."
+msgstr ""
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "L'installazione è fallita"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
-msgstr "Vidalia non è riuscito a chiudere Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "Si è verificato questo errore:"
+msgstr ""
msgctxt "MainWindow"
msgid ""
@@ -2102,16 +1961,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 ""
@@ -2119,9 +1994,6 @@ msgid ""
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
-"Hai realizzato un relay Tor. Se lo spegni tutte le connessioni aperte dai client verranno interrotte.\n"
-"\n"
-"Vuoi chiuderlo gradualmente per dare ai client il tempo di trovare un nuovo relay?"
msgctxt "MainWindow"
msgid ""
@@ -2129,301 +2001,310 @@ msgid ""
"\n"
"Please check the message log for recent warning or error messages."
msgstr ""
-"Vidalia ha rilevato che il software Tor si è chiuso inaspettatamente.\n"
-"\n"
-"Controlla il log dei messaggi alla ricerca di avvisi o messaggi di errore recenti."
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to 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 ", probabilmente Telnet,"
+msgstr ""
msgctxt "MainWindow"
msgid ", probably an email client,"
-msgstr ", probabilmente un client email,"
+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 "Errore nell'impostazione del filtro"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr "Vidalia non è riuscito a registrarsi per gli eventi di log di Tor."
+msgstr ""
msgctxt "MessageLog"
msgid "Error Opening Log File"
-msgstr "Errore nell'apertura del file di log"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr "Vidalia non è riuscito ad aprire il file di log specificato."
+msgstr ""
msgctxt "MessageLog"
msgid "Log Filename Required"
-msgstr "Nome del file di log necessario"
+msgstr ""
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
-msgstr "Devi inserire un nome per salvare i messaggi di log in un file."
+msgstr ""
msgctxt "MessageLog"
msgid "Select Log File"
-msgstr "Selezionare il file di log"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Log Messages"
-msgstr "Salva i messaggi di log"
+msgstr ""
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
-msgstr "File di testo (*.txt)"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia"
-msgstr "Vidalia"
+msgstr ""
msgctxt "MessageLog"
msgid "Find in Message Log"
-msgstr "Cerca nel log dei messaggi"
+msgstr ""
msgctxt "MessageLog"
msgid "Find:"
-msgstr "Cerca:"
+msgstr ""
msgctxt "MessageLog"
msgid "Not Found"
-msgstr "Non trovato"
+msgstr ""
msgctxt "MessageLog"
msgid "Search found 0 matches."
-msgstr "La ricerca non ha prodotto risultati."
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log"
-msgstr "Log dei messaggi"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filters..."
-msgstr "Filtri messaggi..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set message filters"
-msgstr "Imposta i filtri per i messaggi"
+msgstr ""
msgctxt "MessageLog"
msgid "History Size..."
-msgstr "Dimensioni della cronologia..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
-msgstr "Imposta il numero massimo di messaggi da visualizzare"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear"
-msgstr "Pulisci"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "Svuota i messaggi del log (Ctrl+E)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+E"
-msgstr "Ctrl+E"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy"
-msgstr "Copia"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr "Copia i messaggi selezionati negli appunti (Ctrl+C)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+C"
-msgstr "Ctrl+C"
+msgstr ""
msgctxt "MessageLog"
msgid "Select All"
-msgstr "Seleziona tutti"
+msgstr ""
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
-msgstr "Seleziona tutti i messaggi (Ctrl+A)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+A"
-msgstr "Ctrl+A"
+msgstr ""
msgctxt "MessageLog"
msgid "Save All"
-msgstr "Salva tutto"
+msgstr ""
msgctxt "MessageLog"
msgid "Save all messages to a file"
-msgstr "Salva tutti i messaggi in un file"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Selected"
-msgstr "Salva selezionati"
+msgstr ""
msgctxt "MessageLog"
msgid "Save selected messages to a file"
-msgstr "Salva i messaggi selezionati in un file"
+msgstr ""
msgctxt "MessageLog"
msgid "Settings"
-msgstr "Impostazioni"
+msgstr ""
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
-msgstr "Modifica le impostazioni del log dei messaggi"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+T"
-msgstr "Ctrl+T"
+msgstr ""
msgctxt "MessageLog"
msgid "Help"
-msgstr "Aiuto"
+msgstr ""
msgctxt "MessageLog"
msgid "Show the help browser"
-msgstr "Mostra l'aiuto"
+msgstr ""
msgctxt "MessageLog"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "MessageLog"
msgid "Close"
-msgstr "Chiudi"
+msgstr ""
msgctxt "MessageLog"
msgid "Close the Message Log"
-msgstr "Chiude il log dei messaggi"
+msgstr ""
msgctxt "MessageLog"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "MessageLog"
msgid "Find"
-msgstr "Cerca"
+msgstr ""
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "Cerca tutti i messaggi contenenti il testo di ricerca (Ctrl+F)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr ""
msgctxt "MessageLog"
msgid "Time"
-msgstr "Ora"
+msgstr ""
msgctxt "MessageLog"
msgid "Type"
-msgstr "Tipo"
+msgstr ""
msgctxt "MessageLog"
msgid "Message"
-msgstr "Messaggio"
+msgstr ""
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
-msgstr "Salva le impostazioni correnti per il log dei messaggi"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Settings"
-msgstr "Salva impostazioni"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
-msgstr "Annulla i cambiamenti alle impostazioni"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancel"
-msgstr "Annulla"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filter"
-msgstr "Filtro messaggi"
+msgstr ""
msgctxt "MessageLog"
msgid "Error"
-msgstr "Errore"
+msgstr ""
msgctxt "MessageLog"
msgid "Warning"
-msgstr "Attenzione"
+msgstr ""
msgctxt "MessageLog"
msgid "Notice"
-msgstr "Avviso"
+msgstr ""
msgctxt "MessageLog"
msgid "Info"
-msgstr "Informazioni"
+msgstr ""
msgctxt "MessageLog"
msgid "Debug"
-msgstr "Debug"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log History"
-msgstr "Cronologia del log dei messaggi"
+msgstr ""
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr "Numero di messaggi da mostrare nella finestra dei log"
+msgstr ""
msgctxt "MessageLog"
msgid "messages"
-msgstr "messaggi"
+msgstr ""
msgctxt "MessageLog"
msgid "Browse"
-msgstr "Sfoglia"
+msgstr ""
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
-msgstr "Abilita il salvataggio automatico dei messaggi su file"
+msgstr ""
msgctxt "MessageLog"
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"
+msgid "Always Save New Log Messages"
msgstr ""
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."
msgstr ""
-"Messaggi che compaiono quando qualcosa è andato \n"
-"davvero storto e Tor non può continuare a funzionare."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
msgstr ""
-"Messaggi che compaiono solo quando \n"
-"qualcosa è andato storto con Tor."
msgctxt "MessageLog"
msgid ""
@@ -2432,26 +2313,18 @@ msgid ""
"not considered errors, but you may \n"
"care about."
msgstr ""
-"Messaggi che compaiono di rado \n"
-"durante il normale funzionamento \n"
-"di Tor e non sono considerati errori, \n"
-"ma potrebbero comunque interessarti."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
msgstr ""
-"Messaggi che compaiono spesso \n"
-"durante il funzionamento di Tor."
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
-"Messaggi molto prolissi che interessano \n"
-"principalmente gli sviluppatori di Tor."
msgctxt "MessageLog"
msgid ""
@@ -2459,244 +2332,242 @@ msgid ""
"\n"
"%2."
msgstr ""
-"Non riesco a scrivere il file %1\n"
-"\n"
-"%2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Mappa della rete Tor"
msgctxt "NetViewer"
msgid "Refresh"
-msgstr "Ricarica"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "Ricarica la lista dei relay Tor e delle connessioni"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+R"
-msgstr "Ctrl+R"
+msgstr ""
msgctxt "NetViewer"
msgid "Help"
-msgstr "Aiuto"
+msgstr ""
msgctxt "NetViewer"
msgid "Show the network map help"
-msgstr "Mostra l'aiuto della mappa di rete"
+msgstr ""
msgctxt "NetViewer"
msgid "Show network map help"
-msgstr "Mostra l'aiuto della mappa di rete"
+msgstr ""
msgctxt "NetViewer"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "NetViewer"
msgid "Close"
-msgstr "Chiudi"
+msgstr ""
msgctxt "NetViewer"
msgid "Close the network map"
-msgstr "Chiudi la mappa della rete"
+msgstr ""
msgctxt "NetViewer"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom In"
-msgstr "Ingrandisci"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom in on the network map"
-msgstr "Ingrandisci la mappa della rete"
+msgstr ""
msgctxt "NetViewer"
msgid "+"
-msgstr "+"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom Out"
-msgstr "Rimpicciolisci"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom out on the network map"
-msgstr "Riduci la mappa della rete"
+msgstr ""
msgctxt "NetViewer"
msgid "-"
-msgstr "-"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom To Fit"
-msgstr "Adatta"
+msgstr ""
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
-msgstr "Adatta per includere tutti i circuiti attualmente visualizzati"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+Z"
-msgstr "Ctrl+Z"
+msgstr ""
msgctxt "NetViewer"
msgid "Relay Not Found"
-msgstr "File non trovato."
+msgstr ""
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "Non sono disponibili dettagli per questo relay."
+msgstr ""
msgctxt "NetViewer"
msgid "Unknown"
-msgstr "Sconosciuto"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Network Map"
+msgstr ""
msgctxt "NetViewer"
-msgid "Full Screen"
-msgstr "A schermo intero"
+msgid "Relay"
+msgstr ""
msgctxt "NetViewer"
-msgid "View the network map as a full screen window"
-msgstr "Guarda la mappa della rete in una finestra a schermo intero"
+msgid "Connection"
+msgstr ""
msgctxt "NetViewer"
-msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgid "Status"
+msgstr ""
msgctxt "NetworkPage"
msgid "Invalid Bridge"
-msgstr "Bridge non valido"
+msgstr ""
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr "L'identifier del bridge specificat non è valido."
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr "Copia (Ctrl+C)"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
msgstr ""
-"Devi indicare sia un indirizzo IP o un nome host, sia un numero di porta per"
-" configurare Tor e usare un proxy per accedere a Internet"
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
msgstr ""
-"Devi indicare una o più porte a cui il tuo firewall permette di connettersi"
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-msgstr "'%1' non è un numero di porta valido."
+msgstr ""
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
msgstr ""
-"Seleziona nel caso che la tua rete locale richieda un proxy per accedere a "
-"Internet"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr "Uso un proxy per accedere a Internet"
+msgstr ""
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr "Impostazioni proxy"
+msgstr ""
msgctxt "NetworkPage"
msgid "Username:"
-msgstr "Nome utente:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Password:"
-msgstr "Password:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Port:"
-msgstr "Porta:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
-"Seleziona per connetterti ai relay solo attraverso le porte consentite dal "
-"tuo firewall"
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
-msgstr "Il mio firewall mi permette di connettermi solo a certe porte"
+msgstr ""
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "Impostazioni firewall"
+msgstr ""
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr "Porte consentite:"
+msgstr ""
msgctxt "NetworkPage"
msgid "80, 443"
-msgstr "80, 443"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
msgstr ""
-"Seleziona per cifrare le richieste di directory e, facoltativamente, usare "
-"bridge relay per accedere alla rete Tor"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr "Il mio ISP blocca le connessioni alla rete Tor"
+msgstr ""
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "Impostazioni bridge"
+msgstr ""
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr "Aggiungi un bridge"
+msgstr ""
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr "Rimuovi i bridge selezionati dalla lista"
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr "Copia i bridge selezionati negli appunti"
+msgstr ""
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "Trova dei bridge adesso"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">In che altri modi trovo dei bridge?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Come trovo dei bridge?</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
msgstr ""
-"Non ci sono nuovi bridge disponibili. Puoi aspettare un po' e riprovare, "
-"oppure cerca un altro modo per trovare dei bridge"
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
-msgstr "Fai clic su Aiuto per vedere altri modi di trovare nuovi bridge."
+msgstr ""
msgctxt "NetworkPage"
msgid "Address:"
@@ -2728,441 +2599,415 @@ msgstr ""
msgctxt "Policy"
msgid "accept"
-msgstr "accetta"
+msgstr ""
msgctxt "Policy"
msgid "reject"
-msgstr "rifiuta"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Online"
-msgstr "Online"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Hibernating"
-msgstr "Ibernazione"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Offline"
-msgstr "Offline"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Location:"
-msgstr "Luogo:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "IP Address:"
-msgstr "Indirizzo IP:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Platform:"
-msgstr "Piattaforma:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
-msgstr "Larghezza di banda:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Uptime:"
-msgstr "Uptime:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
-msgstr "Ultimo aggiornamento:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Copy"
-msgstr "Copia"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Hibernating"
-msgstr "Ibernazione"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Online"
-msgstr "Online"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Offline"
-msgstr "Offline"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Unknown"
-msgstr "Sconosciuto"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Dettagli del relay"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "Sommario"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Name:"
-msgstr "Nickname:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Status:"
-msgstr "Stato"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Location:"
-msgstr "Luogo:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "IP Address:"
-msgstr "Indirizzo IP:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Platform:"
-msgstr "Piattaforma:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Bandwidth:"
-msgstr "Larghezza di banda:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Uptime:"
-msgstr "Uptime:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Contact:"
-msgstr "Informazioni di contatto:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Last Updated:"
-msgstr "Ultimo aggiornamento:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Descrittore"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
-msgstr "Offline"
+msgstr ""
msgctxt "RouterListItem"
msgid "Hibernating"
-msgstr "Ibernazione"
+msgstr ""
msgctxt "RouterListItem"
msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Relay"
-msgstr "Relay"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr "Zoom sul relay"
+msgstr ""
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 relay connessi"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Copy"
-msgstr "Copia"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr "Nickname"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr "Fingerprint"
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "Supporto dei bridge non disponibile"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
msgstr ""
-"Hai configurato Tor per fare da bridge relay per utendi censurati, ma la tua"
-" versione di Tor non supporta i bridge."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
msgstr ""
-"Aggiorna il tuo software Tor o configura Tor per fare da normale relay Tor"
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr "Il tuo bridge relay non è attivo."
+msgstr ""
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr "Devi specificare un nickname del relay ed una porta"
+msgstr ""
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "Usa solo come client"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "Fai da relay e scambia traffico per la rete Tor"
+msgstr ""
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "Porta relay:"
+msgstr ""
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr "Attiva per fare da mirror della directory dei relay"
+msgstr ""
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr "Tenta di configurare automaticamente il port forwarding"
+msgstr ""
msgctxt "ServerPage"
msgid "Test"
-msgstr "Test"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr "Mostra l'aiuto sul port forwarding"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port:"
-msgstr "Porta directory:"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port Number"
-msgstr "Numero della porta directory"
+msgstr ""
msgctxt "ServerPage"
msgid "Contact Info:"
-msgstr "Informazioni di contatto:"
+msgstr ""
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr "Nome del tuo relay"
+msgstr ""
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
msgstr ""
-"Porta tramite cui utenti e altri relay possono comunicare con il tuo relay"
msgctxt "ServerPage"
msgid "Nickname:"
-msgstr "Nickname:"
+msgstr ""
msgctxt "ServerPage"
msgid "Basic Settings"
-msgstr "Impostazioni di base"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
msgstr ""
-"Se hai una connessione ad internet con molta banda in download ma poca in "
-"upload, inserisci la tua velocità di upload qui."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
-msgstr "Cavo/DSL 256 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
-msgstr "Cavo/DSL 512 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
-msgstr "Cavo/DSL 768 Kbps"
+msgstr ""
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr "T1/Cavo/DSL 1.5 Mpbs"
+msgstr ""
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
-msgstr "> 1.5 Mbps"
+msgstr ""
msgctxt "ServerPage"
msgid "Custom"
-msgstr "Personalizzata"
+msgstr ""
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
msgstr ""
-"Seleziona la voce che si avvicina di più alla tua connessione internet"
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
-msgstr "Mostra l'aiuto per l'impostazione dei limiti di banda"
+msgstr ""
msgctxt "ServerPage"
msgid "Average Rate"
-msgstr "Banda media"
+msgstr ""
msgctxt "ServerPage"
msgid "Long-term average bandwidth limit"
-msgstr "Limite medio di banda a lungo termine"
+msgstr ""
msgctxt "ServerPage"
msgid "KB/s"
-msgstr "KB/s"
+msgstr ""
msgctxt "ServerPage"
msgid "Maximum Rate"
-msgstr "Massimo"
+msgstr ""
msgctxt "ServerPage"
msgid "Peak bandwidth rate limit"
-msgstr "Picco massimo di banda"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
-"La banda massima deve essere maggiore o uguale alla banda allocata media. "
-"Entrambi i valori devono essere almeno 20 KB/s."
msgctxt "ServerPage"
msgid "Bandwidth Limits"
-msgstr "Limiti di banda"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 6660 - 6669 and 6697"
-msgstr "Porte 6660 - 6660 e 6697"
+msgstr ""
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
-msgstr "Internet Relay Chat (IRC)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
-msgstr "Porte 110, 143, 993 e 995"
+msgstr ""
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr "Ricevi email (POP, IMAP)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
-msgstr "Porte non specificate da altre caselle di selezione"
+msgstr ""
msgctxt "ServerPage"
msgid "Misc Other Services"
-msgstr "Altri servizi"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "Porte 706, 1863, 5050, 5190, 5222, 8300 e 8888"
+msgstr ""
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
-msgstr "Messaggistica Instantaea (IM)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 443"
-msgstr "Porta 443"
+msgstr ""
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
-msgstr "Siti web sicuri (SSL)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 80"
-msgstr "Porta 80"
+msgstr ""
msgctxt "ServerPage"
msgid "Websites"
-msgstr "Siti web"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on exit policies"
-msgstr "Mostra l'aiuto sulle exit policy"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
msgstr ""
-"A quali risorse di internet gli utenti possono accedere tramite il tuo "
-"relay?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
msgstr ""
-"Tor bloccherà di default alcune mail in uscita e programmi di condivisione "
-"file per ridurre spam ed altri abusi"
msgctxt "ServerPage"
msgid "Exit Policies"
-msgstr "Exit policy"
+msgstr ""
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
msgstr ""
-"Consenti agli altri di accedere al tuo bridge dando loro questa riga di "
-"testo:"
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
msgstr ""
-"Questa è l'identità del tuo bridge relay che puoi dare a altre persone"
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "Copia l'identità del tuo bridge relay negli appunti"
+msgstr ""
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr "Nessun uso recente"
+msgstr ""
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr "Nessun client ha usato il tuo relay recentemente."
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
msgstr ""
-"Mantieni attivo il tuo relay così che i client possano meglio trovarlo ed "
-"usarlo."
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr "Impostazioni bridge"
+msgstr ""
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr "Vidalia non è riuscito a salvare la tua impostazione %1"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
msgstr ""
-"Tor ha dato una risposta malformata quando Vidalia ha chiesto lo storico "
-"d'utilizzo del tuo bridge."
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr "La risposta fornita è stata: %1"
+msgstr ""
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
msgstr ""
-"Aiuta gli utenti sotto censura a raggiungere la rete Tor (Tor 0.2.0.8-alpha "
-"o più recente)"
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"bridges.finding\">Come trovo un bridge?</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
@@ -3173,103 +3018,100 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (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"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
-"L'indirizzo email per contattarti se ci fosse un \n"
-"problema col tuo relay. Puoi inserire anche il tuo fingerprint PGP o GPG."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr "Errore durante il ritiro dei servizi"
+msgstr ""
msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
msgstr ""
-"Configura almeno una cartella per il servizio e una porta virtuale per ogni "
-"servizio che vuoi salvare. Rimuovi gli altri."
msgctxt "ServicePage"
msgid "Error"
-msgstr "Errore"
+msgstr ""
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "Seleziona un servizio"
+msgstr ""
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr "Seleziona la cartella del servizio"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
msgstr ""
-"La porta virtuale può solo contenere numeri di porta validi [1..65535]."
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr "Il target può solo contenere indirizzo:porta, indirizzo o porta."
+msgstr ""
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr "Cartella già in uso da parte di un altro servizio."
-
-msgctxt "ServicePage"
-msgid "Form"
-msgstr "Modulo"
+msgstr ""
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "Hidden service forniti"
+msgstr ""
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "Indirizzo .onion"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr "Porta virtuale"
+msgstr ""
msgctxt "ServicePage"
msgid "Target"
-msgstr "Target"
+msgstr ""
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "Percorso della cartella"
+msgstr ""
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "Attivato"
+msgstr ""
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr "Aggiungi un nuovo servizio alla lista"
+msgstr ""
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr "Rimuovi il servizio selezionato dalla lista"
+msgstr ""
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "Copia l'indirizzo onion selezionato negli appunti"
+msgstr ""
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
msgstr ""
-"Esplora nei file di sistema locali e scegli una cartella per i servizi "
-"selezionati"
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr "Creato da Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
@@ -3516,57 +3358,79 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
-msgstr "Nuovo"
+msgstr ""
msgctxt "Stream"
msgid "Resolving"
-msgstr "Risoluzione"
+msgstr ""
msgctxt "Stream"
msgid "Connecting"
-msgstr "Connessione"
+msgstr ""
msgctxt "Stream"
msgid "Open"
-msgstr "Apri"
+msgstr ""
msgctxt "Stream"
msgid "Failed"
-msgstr "Non funzionante"
+msgstr ""
msgctxt "Stream"
msgid "Closed"
-msgstr "Chiuso"
+msgstr ""
msgctxt "Stream"
msgid "Retrying"
-msgstr "Nuovo tentativo"
+msgstr ""
msgctxt "Stream"
msgid "Remapped"
-msgstr "Rimappato"
+msgstr ""
msgctxt "Stream"
msgid "Unknown"
-msgstr "Sconosciuto"
+msgstr ""
+
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not 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]"
+msgstr ""
msgctxt "TorService"
msgid "The Tor service is not installed."
-msgstr "Il servizio Tor non è installato."
+msgstr ""
msgctxt "TorService"
msgid "Unable to start the Tor service."
-msgstr "Non è stato possibile avviare il servizio Tor."
+msgstr ""
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr "L'hash della password di controllo è fallito."
+msgstr ""
msgctxt "TorrcDialog"
msgid "Editing torrc"
@@ -3630,137 +3494,157 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+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"
+msgstr ""
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr "Nessuna periferica UpnP trovata"
+msgstr ""
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr "Nessun gateway internet UPnP trovato"
+msgstr ""
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr "Avvio WSA fallito"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr "Non sono riuscito ad aggiungere una mappatura delle porte"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
-msgstr "Non sono riuscito a caricare una mappatura delle porte"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
-msgstr "Non sono riuscito a rimuovere una mappatura delle porte"
+msgstr ""
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr "Errore sconosciuto"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr "Ricerca di dispositivi UPnP"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr "Sto aggiornando la mappatura porte di directory"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr "Sto aggiornando la mappatura porte di relay"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr "Test completato con successo!"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
-msgstr "Test supporto UPnP"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
-msgstr "Sto testando il supporto Universal Plug & Play"
+msgstr ""
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
msgstr ""
-"Vidalia non ha potuto controllare gli aggiornamenti software perché non ha "
-"trovato '%1'."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
msgstr ""
-"Vidalia non ha potuto controllare gli aggiornamenti software perché il "
-"processo di aggiurnamento di Tor si è interrotto inaspettatamente."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
-msgstr "Cerco gli aggiornamenti disponibili..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Hide"
-msgstr "Nascondi"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "Scarico gli aggiornamenti..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
-msgstr "Installo il software aggiornato..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
-msgstr "Fatto! Il tuo software ora è aggiornato."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "OK"
-msgstr "OK"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "Aggiornamenti software"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr "Controllo gli aggiornamenti..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Cancel"
-msgstr "Annulla"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
-msgstr "Ã? disponibile un aggiornamento di Tor"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Ricordamelo più tardi"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr "Installa"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
-msgstr "Sono pronti per l'installazione questi pacchetti software:"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Package"
-msgstr "Pacchetto"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr "versione"
+msgstr ""
msgctxt "UploadProgressDialog"
msgid "Uploading Crash Report"
@@ -3772,107 +3656,107 @@ msgstr ""
msgctxt "VMessageBox"
msgid "OK"
-msgstr "OK"
+msgstr ""
msgctxt "VMessageBox"
msgid "Cancel"
-msgstr "Annulla"
+msgstr ""
msgctxt "VMessageBox"
msgid "Yes"
-msgstr "Sì"
+msgstr ""
msgctxt "VMessageBox"
msgid "No"
-msgstr "No"
+msgstr ""
msgctxt "VMessageBox"
msgid "Help"
-msgstr "Aiuto"
+msgstr ""
msgctxt "VMessageBox"
msgid "Retry"
-msgstr "Riprova"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Log"
-msgstr "Mostra log"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Settings"
-msgstr "Mostra impostazioni"
+msgstr ""
msgctxt "VMessageBox"
msgid "Continue"
-msgstr "Continua"
+msgstr ""
msgctxt "VMessageBox"
msgid "Quit"
-msgstr "Esci"
+msgstr ""
msgctxt "VMessageBox"
msgid "Browse"
-msgstr "Sfoglia"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid Argument"
-msgstr "Parametro non valido"
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia is already running"
-msgstr "Vidalia è già in esecuzione"
+msgstr ""
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
-msgstr "Mostra questo messaggio di aiuto ed esci."
+msgstr ""
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
-msgstr "Reinizializza TUTTE le impostazioni di Vidalia."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr "Imposta la cartella che Vidalia userà per i dati."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
-msgstr "Imposta il nome e la posizione del pidfile di Vidalia"
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
-msgstr "Imposta il nome e la posizione del file di log di Vidalia"
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "Imposta il livello di dettaglio del log di Vidalia"
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
-msgstr "Imposta lo stile dell'interfaccia di Vidalia."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
-msgstr "Imposta la lingua di Vidalia"
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
-msgstr "Informazioni sull'uso di Vidalia"
+msgstr ""
msgctxt "Vidalia"
msgid "Unable to open log file '%1': %2"
-msgstr "Non è stato possibile aprire il file di log '%1': %2"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr "Il codice della lingua indicato non è valido:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "Lo stile della GUI indicato non è valido:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Il livello di log indicato non è valido:"
+msgstr ""
msgctxt "Vidalia"
msgid ""
@@ -3880,38 +3764,35 @@ msgid ""
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
-"Sembra che un altro processo di Vidalia stia già girando. Se davvero non c'è un altro processo Vidalia in funzione, puoi decidere di continuare lo stesso.\n"
-"\n"
-"Vuoi continuare ed avviare Vidalia?"
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 sec"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 B/s"
-msgstr "%1 B/s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 KB/s"
-msgstr "%1 KB/s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 MB/s"
-msgstr "%1 MB/s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 GB/s"
-msgstr "%1 GB/s"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 days"
-msgstr "%1 giorni"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 hours"
-msgstr "%1 ore"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
-msgstr "%1 minuti"
+msgstr ""
diff --git a/src/vidalia/i18n/po/kn/vidalia_kn.po b/src/vidalia/i18n/po/kn/vidalia_kn.po
index 9cb4a45..78fbf92 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-04-18 08:50+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 733caf7..55f07b4 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-04-18 08:45+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:05+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 ebdc940..0dd6801 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-04-18 08:45+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:05+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 479e54c..631e345 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-04-18 08:45+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:05+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 1b39694..3e42b64 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-04-18 08:45+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:06+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 d96a702..172c2a4 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-04-18 08:45+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:06+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 5ba09a2..934271d 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-04-18 08:47+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:08+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 a134fb5..ebb668c 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-04-18 08:48+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:09+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 dfb1356..843dbb4 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-04-18 08:48+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:09+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 bfba46d..ae056cc 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-04-18 08:48+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:09+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 aec53d6..fcbc942 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-04-18 08:48+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:09+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 4452071..b131e8b 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-04-18 08:49+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:09+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 4abc201..888880c 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-04-18 08:49+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:09+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 a265bfc..c669d2b 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-04-18 08:48+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:09+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 ff69b22..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 cea4986..8dca812 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-04-18 08:51+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:12+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 f4a2e55..3e29464 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-04-18 08:51+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:12+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 af635db..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 0d72f09..0ac27ce 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-04-18 08:51+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:12+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 d51e733..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 fda0b22..f45594b 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-04-18 08:51+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 72e1b42..0f321ff 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-04-18 08:44+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:04+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 339416d..afdeb34 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-04-18 08:49+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 0c7490a..a683ab3 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-04-18 08:46+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:06+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 1583472..cf1bf5a 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-04-18 08:51+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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/vidalia_pl.po b/src/vidalia/i18n/po/pl/vidalia_pl.po
index 8c18a30..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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"
@@ -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 d6d36c4..19d0fe8 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-04-18 08:49+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 56917b1..38d104e 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-04-18 08:45+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:05+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 7b44692..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 95053fb..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 6930b3c..0c57d33 100644
--- a/src/vidalia/i18n/po/ru/vidalia_ru.po
+++ b/src/vidalia/i18n/po/ru/vidalia_ru.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-22 16:13+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 19:51+0000\n"
"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\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"
@@ -16,126 +16,124 @@ msgstr ""
msgctxt "AboutDialog"
msgid "About Vidalia"
-msgstr "Ð? Vidalia"
+msgstr ""
msgctxt "AboutDialog"
msgid "License"
-msgstr "Ð?иÑ?ензиÑ?"
+msgstr ""
msgctxt "AboutDialog"
msgid "Vidalia 0.2.0"
-msgstr "Vidalia 0.2.0"
+msgstr ""
msgctxt "AboutDialog"
msgid "Tor 0.2.0.32"
-msgstr "Tor 0.2.0.32"
+msgstr ""
msgctxt "AboutDialog"
msgid "Qt 4.4.2"
-msgstr "Qt 4.4.2"
+msgstr ""
msgctxt "AdvancedPage"
msgid "'%1' is not a valid IP address."
-msgstr "'%1' не Ñ?влÑ?еÑ?Ñ?Ñ? пÑ?авилÑ?нÑ?м IP-адÑ?еÑ?ом."
+msgstr ""
msgctxt "AdvancedPage"
msgid ""
"You selected 'Password' authentication, but did not specify a password."
-msgstr "Ð?Ñ? вÑ?бÑ?али аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ? по паÑ?олÑ?, но не Ñ?казали паÑ?олÑ?."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select Tor Configuration File"
-msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?айл наÑ?Ñ?Ñ?оек"
+msgstr ""
msgctxt "AdvancedPage"
msgid "File Not Found"
-msgstr "Файл не найден"
+msgstr ""
msgctxt "AdvancedPage"
msgid "%1 does not exist. Would you like to create it?"
-msgstr "%1 не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?. Ð?Ñ? Ñ?оÑ?ели бÑ? его Ñ?оздаÑ?Ñ??"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Failed to Create File"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? Ñ?айл"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to create %1 [%2]"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? %1 [%2]"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select a Directory to Use for Tor Data"
-msgstr "Ð?Ñ?беÑ?иÑ?е каÑ?алог длÑ? даннÑ?Ñ? Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to remove Tor Service"
-msgstr "Ð?е Ñ?даеÑ?Ñ?Ñ? Ñ?далиÑ?Ñ? Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Unable to install Tor Service"
-msgstr "Ð?е Ñ?даеÑ?Ñ?Ñ? Ñ?Ñ?Ñ?ановиÑ?Ñ? Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Vidalia was unable to install the Tor service."
-msgstr "Vidalia не Ñ?могла Ñ?Ñ?Ñ?ановиÑ?Ñ? Tor."
+msgstr ""
msgctxt "AdvancedPage"
msgid "Authentication:"
-msgstr "Ð?Ñ?Ñ?енÑ?иÑ?икаÑ?иÑ?:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Address:"
-msgstr "Ð?дÑ?еÑ?:"
+msgstr ""
msgctxt "AdvancedPage"
msgid "None"
-msgstr "Ð?иÑ?его"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Cookie"
-msgstr "Ð?Ñ?ки"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Password"
-msgstr "Ð?аÑ?олÑ?"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Randomly Generate"
-msgstr "СгенеÑ?иÑ?оваÑ?Ñ? Ñ?лÑ?Ñ?айнÑ?м обÑ?азом"
+msgstr ""
msgctxt "AdvancedPage"
msgid ":"
-msgstr ":"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Tor Configuration File"
-msgstr "Файл наÑ?Ñ?Ñ?оек Tor"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Start the Tor software with the specified configuration file (torrc)"
-msgstr "Ð?апÑ?Ñ?Ñ?иÑ?е пÑ?огÑ?аммÑ? Tor Ñ? Ñ?казаннÑ?м Ñ?айлом конÑ?игÑ?Ñ?аÑ?ии (torrc)"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select path to your configuration file"
-msgstr "Ð?Ñ?беÑ?иÑ?е пÑ?Ñ?Ñ? к Ñ?айлÑ? конÑ?игÑ?Ñ?аÑ?ии"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Browse"
-msgstr "Ð?бзоÑ?"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Data Directory"
-msgstr "Ð?аÑ?алог даннÑ?Ñ?"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Store data for the Tor software in the following directory"
-msgstr "Ð¥Ñ?аниÑ?Ñ? даннÑ?е длÑ? пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ? Tor в Ñ?Ñ?ом каÑ?алоге"
+msgstr ""
msgctxt "AdvancedPage"
msgid "Select the directory used to store data for the Tor software"
msgstr ""
-"Ð?Ñ?беÑ?иÑ?е каÑ?алог, иÑ?полÑ?зÑ?емÑ?й длÑ? Ñ?Ñ?анениÑ? даннÑ?Ñ? длÑ? пÑ?огÑ?аммного "
-"обеÑ?пеÑ?ениÑ? Tor"
msgctxt "AdvancedPage"
msgid "Tor Control"
@@ -199,964 +197,969 @@ msgid ""
"\n"
"You may need to remove it manually."
msgstr ""
-"Vidalia не Ñ?могла Ñ?далиÑ?Ñ? Ñ?еÑ?виÑ? Tor. Ð?озможно, вам пÑ?идеÑ?Ñ?Ñ? Ñ?далиÑ?Ñ? его "
-"вÑ?Ñ?Ñ?нÑ?Ñ?."
msgctxt "AppearancePage"
msgid "Language"
-msgstr "ЯзÑ?к"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose the language used in Vidalia"
-msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?зÑ?к, иÑ?полÑ?зÑ?емÑ?й в Vidalia"
+msgstr ""
msgctxt "AppearancePage"
msgid "Style"
-msgstr "СÑ?илÑ?"
+msgstr ""
msgctxt "AppearancePage"
msgid "Choose Vidalia's interface style"
-msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?Ñ?илÑ? инÑ?еÑ?Ñ?ейÑ?а Vidalia"
+msgstr ""
msgctxt "AppearancePage"
msgid "Vidalia was unable to load the selected language translation."
-msgstr "Hе Ñ?далоÑ?Ñ? загÑ?Ñ?зиÑ?Ñ? вÑ?бÑ?аннÑ?й Ñ?зÑ?к пеÑ?евода."
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Since:"
-msgstr "Со вÑ?емени:"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Hide Settings"
-msgstr "СкÑ?Ñ?Ñ?Ñ? наÑ?Ñ?Ñ?ойки"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Show Settings"
-msgstr "Ð?оказаÑ?Ñ? наÑ?Ñ?Ñ?ойки"
-
-msgctxt "BandwidthGraph"
-msgid "Tor Bandwidth Usage"
-msgstr "Tor Ñ?Ñ?аÑ?ик"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Reset"
-msgstr "СбÑ?оÑ?"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Receive Rate"
-msgstr "Ð?Ñ?енка вÑ?одÑ?Ñ?его Ñ?Ñ?аÑ?ика"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Send Rate"
-msgstr "Ð?Ñ?енка иÑ?Ñ?одÑ?Ñ?его Ñ?Ñ?аÑ?ика"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Always on Top"
-msgstr "Ð?Ñ?егда Ñ?веÑ?Ñ?Ñ?"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Style"
-msgstr "СÑ?илÑ?"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Changes the transparency of the Bandwidth Graph"
-msgstr "Ð?зменение пÑ?озÑ?аÑ?ноÑ?Ñ?и гÑ?аÑ?ика Ñ?Ñ?аÑ?ика"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "100"
-msgstr "100"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "% Opaque"
-msgstr "Ð?епÑ?озÑ?аÑ?нÑ?е %"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Save"
-msgstr "СоÑ?Ñ?аниÑ?Ñ?"
+msgstr ""
msgctxt "BandwidthGraph"
msgid "Cancel"
-msgstr "Ð?Ñ?мениÑ?Ñ?"
+msgstr ""
+
+msgctxt "BandwidthGraph"
+msgid "Bandwidth Graph"
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Starting HTTPS bridge request..."
-msgstr "Ð?аÑ?инаем HTTPS-запÑ?оÑ? моÑ?Ñ?a ..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Connecting to %1:%2..."
-msgstr "СоединÑ?емÑ?Ñ? к %1:%2..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Sending an HTTPS request for bridges..."
-msgstr "Ð?Ñ?пÑ?авка HTTPS-запÑ?оÑ?а длÑ? моÑ?Ñ?ов ..."
+msgstr ""
msgctxt "BridgeDownloader"
msgid "Downloading a list of bridges..."
-msgstr "Ð?агÑ?Ñ?зка Ñ?пиÑ?ка моÑ?Ñ?ов ..."
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Downloading Bridges"
-msgstr "Ð?агÑ?Ñ?зка моÑ?Ñ?ов"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Unable to download bridges: %1"
-msgstr "Ð?е Ñ?даеÑ?Ñ?Ñ? загÑ?Ñ?зиÑ?Ñ? моÑ?Ñ?ов: %1"
+msgstr ""
msgctxt "BridgeDownloaderProgressDialog"
msgid "Retrying bridge request..."
-msgstr "Ð?овÑ?оÑ?нÑ?й запÑ?оÑ? моÑ?Ñ?а..."
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Country"
-msgstr "СÑ?Ñ?ана"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "# Clients"
-msgstr "ЧиÑ?ло клиенÑ?ов"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Clients from the following countries have used your relay since %1"
-msgstr "Ð?лиенÑ?Ñ? из Ñ?ледÑ?Ñ?Ñ?иÑ? Ñ?Ñ?Ñ?ан иÑ?полÑ?зовали ваÑ? Ñ?еÑ?веÑ? Ñ? %1"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Bridge Usage Summary"
-msgstr "Сводка иÑ?полÑ?зованиÑ? моÑ?Ñ?а"
+msgstr ""
msgctxt "BridgeUsageDialog"
msgid "Client Summary"
-msgstr "Сводка по клиенÑ?Ñ?"
+msgstr ""
msgctxt "Circuit"
msgid "New"
-msgstr "Ð?овÑ?й"
+msgstr ""
msgctxt "Circuit"
msgid "Open"
-msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ?"
+msgstr ""
msgctxt "Circuit"
msgid "Building"
-msgstr "Building"
+msgstr ""
msgctxt "Circuit"
msgid "Failed"
-msgstr "Ð?е Ñ?далоÑ?Ñ?"
+msgstr ""
msgctxt "Circuit"
msgid "Closed"
-msgstr "Ð?акÑ?Ñ?Ñ?о"
+msgstr ""
msgctxt "Circuit"
msgid "Unknown"
-msgstr "Ð?еизвеÑ?Ñ?но"
+msgstr ""
msgctxt "CircuitItem"
msgid "<Path Empty>"
-msgstr "<Path Empty>"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Connection"
-msgstr "Ð?одклÑ?Ñ?ение"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Status"
-msgstr "СÑ?аÑ?Ñ?Ñ?"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Zoom to Circuit"
-msgstr "УвелиÑ?иÑ?Ñ? Ñ?епÑ?"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Circuit (Del)"
-msgstr "Ð?акÑ?Ñ?Ñ?Ñ? Ñ?епÑ? (Del)"
+msgstr ""
msgctxt "CircuitListWidget"
msgid "Close Stream (Del)"
-msgstr "Ð?акÑ?Ñ?Ñ?Ñ? Ð?оÑ?ок (Del)"
+msgstr ""
msgctxt "ConfigDialog"
msgid "General"
-msgstr "General"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Network"
-msgstr "СеÑ?Ñ?"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Sharing"
-msgstr "Ð?бмен"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Services"
-msgstr "СеÑ?виÑ?Ñ?"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Appearance"
-msgstr "Ð?неÑ?ний вид"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Advanced"
-msgstr "РаÑ?Ñ?иÑ?еннÑ?й"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Help"
-msgstr "Ð?омоÑ?Ñ?"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Saving Settings"
-msgstr "Ð?Ñ?ибка пÑ?и Ñ?оÑ?Ñ?анении наÑ?Ñ?Ñ?оек"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to save your %1 settings."
-msgstr "Vidalia не Ñ?могла Ñ?оÑ?Ñ?аниÑ?Ñ? ваÑ?и наÑ?Ñ?Ñ?ойки %1."
+msgstr ""
msgctxt "ConfigDialog"
msgid "Error Applying Settings"
-msgstr "Ð?Ñ?ибка Ð?Ñ?именениÑ? паÑ?амеÑ?Ñ?ов"
+msgstr ""
msgctxt "ConfigDialog"
msgid "Vidalia was unable to apply your %1 settings to Tor."
-msgstr "Vidalia не Ñ?могла пÑ?имениÑ?Ñ? ваÑ?и %1 наÑ?Ñ?Ñ?ойки Tor."
+msgstr ""
msgctxt "ConfigDialog"
msgid "Settings"
-msgstr "Ð?аÑ?Ñ?Ñ?ойки"
+msgstr ""
msgctxt "ControlConnection"
msgid "Vidalia was unable to connect to Tor. (%1)"
-msgstr "Vidalia не Ñ?могла подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?и Tor. (%1)"
+msgstr ""
msgctxt "ControlConnection"
msgid "Control socket is not connected."
-msgstr "Ð?онÑ?Ñ?олÑ?нÑ?й Ñ?океÑ? не подклÑ?Ñ?ен."
+msgstr ""
+
+msgctxt "ControlPasswordInputDialog"
+msgid "Problem connecting to Tor"
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Password Required"
-msgstr "Ð?еобÑ?одим паÑ?олÑ?"
+msgid ""
+"Tor is already running, but Vidalia can't connect to it.\n"
+"\n"
+"This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
-msgid "Remember my password"
-msgstr "Ð?апомниÑ?Ñ? паÑ?олÑ?"
+msgid ""
+"You will need to shut down the Tor process before Vidalia can launch a new "
+"one."
+msgstr ""
msgctxt "ControlPasswordInputDialog"
msgid ""
-"Vidalia has connected to a running Tor process that requires a password. "
-"Please enter your control password:"
+"Vidalia can try to restart Tor for you. Doing so will close all currently "
+"active connections through your Tor process."
msgstr ""
-"Vidalia подклÑ?Ñ?илаÑ?Ñ? к Ñ?абоÑ?аÑ?Ñ?емÑ? пÑ?оÑ?еÑ?Ñ?Ñ? Tor, коÑ?оÑ?Ñ?й Ñ?Ñ?ебÑ?еÑ? паÑ?олÑ?. "
-"Ð?ожалÑ?йÑ?Ñ?а, введиÑ?е Ñ?вой паÑ?олÑ?:"
msgctxt "ControlSocket"
msgid "Control socket is not connected."
-msgstr "Ð?онÑ?Ñ?олÑ?нÑ?й Ñ?океÑ? не подклÑ?Ñ?ен."
+msgstr ""
msgctxt "ControlSocket"
msgid "Error sending control command. [%1]"
-msgstr "Ð?Ñ?ибка пÑ?и оÑ?пÑ?авке командÑ? Ñ?пÑ?авлениÑ?. [%1]"
+msgstr ""
msgctxt "ControlSocket"
msgid "Socket disconnected while attempting to read a line of data."
-msgstr "СокеÑ? оÑ?клÑ?Ñ?ен пÑ?и попÑ?Ñ?ке Ñ?Ñ?ениÑ? Ñ?Ñ?Ñ?оки даннÑ?Ñ?."
+msgstr ""
msgctxt "ControlSocket"
msgid "Invalid control reply. [%1]"
-msgstr "Ð?евеÑ?нÑ?й оÑ?веÑ? конÑ?Ñ?олÑ?. [%1]"
+msgstr ""
msgctxt "CountryInfo"
msgid "Afghanistan"
-msgstr "Ð?Ñ?ганиÑ?Ñ?ан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Andorra"
-msgstr "Ð?ндоÑ?Ñ?а"
+msgstr ""
msgctxt "CountryInfo"
msgid "Angola"
-msgstr "Ð?нгола"
+msgstr ""
msgctxt "CountryInfo"
msgid "Antigua & Barbuda"
-msgstr "Ð?нÑ?игÑ?а и Ð?аÑ?бÑ?да"
+msgstr ""
msgctxt "CountryInfo"
msgid "Argentina"
-msgstr "Ð?Ñ?генÑ?ина"
+msgstr ""
msgctxt "CountryInfo"
msgid "Armenia"
-msgstr "Ð?Ñ?мениÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Australia"
-msgstr "Ð?вÑ?Ñ?Ñ?алиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Azerbaijan"
-msgstr "Ð?зеÑ?байджан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahamas"
-msgstr "Ð?агамÑ?кие оÑ?Ñ?Ñ?ова"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bangladesh"
-msgstr "Ð?англадеÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Barbados"
-msgstr "Ð?аÑ?бадоÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belarus"
-msgstr "Ð?елаÑ?Ñ?Ñ?Ñ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belgium"
-msgstr "Ð?елÑ?гиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Belize"
-msgstr "Ð?елиз"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bhutan"
-msgstr "Ð?Ñ?Ñ?ан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bolivia"
-msgstr "Ð?оливиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bosnia & Herzegovina"
-msgstr "Ð?оÑ?ниÑ? и Ð?еÑ?Ñ?еговинa"
+msgstr ""
msgctxt "CountryInfo"
msgid "Botswana"
-msgstr "Ð?оÑ?Ñ?вана"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brazil"
-msgstr "Ð?Ñ?азилиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Brunei Darussalam"
-msgstr "Ð?Ñ?Ñ?ней-Ð?аÑ?Ñ?Ñ?Ñ?алам"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bulgaria"
-msgstr "Ð?олгаÑ?иÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burkina Faso"
-msgstr "Ð?Ñ?Ñ?кина-ФаÑ?о"
+msgstr ""
msgctxt "CountryInfo"
msgid "Burundi"
-msgstr "Ð?Ñ?Ñ?Ñ?нди"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cambodia"
-msgstr "Ð?амбоджа"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cameroon"
-msgstr "Ð?амеÑ?Ñ?н"
+msgstr ""
msgctxt "CountryInfo"
msgid "Canada"
-msgstr "Ð?анада"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cape Verde"
-msgstr "Ð?або-Ð?еÑ?де"
+msgstr ""
msgctxt "CountryInfo"
msgid "Central African Republic"
-msgstr "ЦенÑ?Ñ?алÑ?но-Ð?Ñ?Ñ?иканÑ?каÑ? РеÑ?пÑ?блика"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chad"
-msgstr "Чад"
+msgstr ""
msgctxt "CountryInfo"
msgid "Chile"
-msgstr "Чили"
+msgstr ""
msgctxt "CountryInfo"
msgid "China"
-msgstr "Ð?иÑ?ай"
+msgstr ""
msgctxt "CountryInfo"
msgid "Colombia"
-msgstr "Ð?олÑ?мбиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Comoros"
-msgstr "Ð?омоÑ?Ñ?кие оÑ?Ñ?Ñ?ова"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo, The Democratic Republic of the"
-msgstr "Ð?емокÑ?аÑ?иÑ?еÑ?каÑ? РеÑ?пÑ?блика Ð?онго"
+msgstr ""
msgctxt "CountryInfo"
msgid "Congo"
-msgstr "Ð?онго"
+msgstr ""
msgctxt "CountryInfo"
msgid "Costa Rica"
-msgstr "Ð?оÑ?Ñ?а-Рика"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cote d�Ivoire"
-msgstr "Ð?оÑ? д'Ð?вÑ?аÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Croatia"
-msgstr "ХоÑ?ваÑ?иÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cuba"
-msgstr "Ð?Ñ?ба"
+msgstr ""
msgctxt "CountryInfo"
msgid "Cyprus"
-msgstr "Ð?ипÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Czech Republic"
-msgstr "ЧеÑ?Ñ?каÑ? РеÑ?пÑ?блика"
+msgstr ""
msgctxt "CountryInfo"
msgid "Denmark"
-msgstr "Ð?аниÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Djibouti"
-msgstr "Ð?жибÑ?Ñ?и"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominica"
-msgstr "Ð?оминика"
+msgstr ""
msgctxt "CountryInfo"
msgid "Dominican Republic"
-msgstr "Ð?оминиканÑ?каÑ? РеÑ?пÑ?блика"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ecuador"
-msgstr "ÐквадоÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Egypt"
-msgstr "Ð?гипеÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "El Salvador"
-msgstr "СалÑ?вадоÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Equatorial Guinea"
-msgstr "ÐкваÑ?оÑ?иалÑ?наÑ? Ð?винеÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Eritrea"
-msgstr "ÐÑ?иÑ?Ñ?еÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Estonia"
-msgstr "ÐÑ?Ñ?ониÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "France"
-msgstr "ФÑ?анÑ?иÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gabon"
-msgstr "Ð?абон"
+msgstr ""
msgctxt "CountryInfo"
msgid "Gambia"
-msgstr "Ð?амбиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Georgia"
-msgstr "Ð?Ñ?Ñ?зиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Germany"
-msgstr "Ð?еÑ?маниÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ghana"
-msgstr "Ð?ана"
+msgstr ""
msgctxt "CountryInfo"
msgid "Grenada"
-msgstr "Ð?Ñ?енада"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guatemala"
-msgstr "Ð?ваÑ?емала"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea"
-msgstr "Ð?винеÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guinea-Bissau"
-msgstr "Ð?винеÑ?-Ð?иÑ?аÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guyana"
-msgstr "Ð?айана"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hong Kong"
-msgstr "Ð?онконг"
+msgstr ""
msgctxt "CountryInfo"
msgid "Haiti"
-msgstr "Ð?аиÑ?и"
+msgstr ""
msgctxt "CountryInfo"
msgid "Honduras"
-msgstr "Ð?ондÑ?Ñ?аÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Israel"
-msgstr "Ð?зÑ?аилÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Italy"
-msgstr "Ð?Ñ?алиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jamaica"
-msgstr "Ямайка"
+msgstr ""
msgctxt "CountryInfo"
msgid "Japan"
-msgstr "ЯпониÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Jordan"
-msgstr "Ð?оÑ?даниÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kazakhstan"
-msgstr "Ð?азаÑ?Ñ?Ñ?ан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kenya"
-msgstr "Ð?ениÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kiribati"
-msgstr "Ð?иÑ?ибаÑ?и"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kuwait"
-msgstr "Ð?Ñ?вейÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Kyrgyzstan"
-msgstr "Ð?Ñ?Ñ?гÑ?зÑ?Ñ?ан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Laos"
-msgstr "Ð?аоÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Latvia"
-msgstr "Ð?аÑ?виÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lebanon"
-msgstr "Ð?иван"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lesotho"
-msgstr "Ð?еÑ?оÑ?о"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liberia"
-msgstr "Ð?ибеÑ?иÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Liechtenstein"
-msgstr "Ð?иÑ?Ñ?енÑ?Ñ?ейн"
+msgstr ""
msgctxt "CountryInfo"
msgid "Lithuania"
-msgstr "Ð?иÑ?ва"
+msgstr ""
msgctxt "CountryInfo"
msgid "Luxembourg"
-msgstr "Ð?Ñ?кÑ?ембÑ?Ñ?г"
+msgstr ""
msgctxt "CountryInfo"
msgid "Macedonia"
-msgstr "Ð?акедониÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Madagascar"
-msgstr "Ð?адагаÑ?каÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malawi"
-msgstr "Ð?алави"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malaysia"
-msgstr "Ð?алайзиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mali"
-msgstr "Ð?али"
+msgstr ""
msgctxt "CountryInfo"
msgid "Malta"
-msgstr "Ð?алÑ?Ñ?а"
+msgstr ""
msgctxt "CountryInfo"
msgid "Marshall Islands"
-msgstr "Ð?аÑ?Ñ?алловÑ? оÑ?Ñ?Ñ?ова"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritania"
-msgstr "Ð?авÑ?иÑ?аниÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mauritius"
-msgstr "Ð?авÑ?икий"
+msgstr ""
msgctxt "CountryInfo"
msgid "Micronesia"
-msgstr "Ð?икÑ?онезиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Moldova"
-msgstr "Ð?олдова"
+msgstr ""
msgctxt "CountryInfo"
msgid "Monaco"
-msgstr "Ð?онако"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mongolia"
-msgstr "Ð?онголиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Montenegro"
-msgstr "ЧеÑ?ногоÑ?иÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Morocco"
-msgstr "Ð?аÑ?окко"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mozambique"
-msgstr "Ð?озамбик"
+msgstr ""
msgctxt "CountryInfo"
msgid "Namibia"
-msgstr "Ð?амибиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nauru"
-msgstr "Ð?аÑ?Ñ?Ñ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nepal"
-msgstr "Ð?епал"
+msgstr ""
msgctxt "CountryInfo"
msgid "Netherlands"
-msgstr "Ð?идеÑ?ландÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "New Zealand"
-msgstr "Ð?оваÑ? Ð?еландиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nicaragua"
-msgstr "Ð?икаÑ?агÑ?а"
+msgstr ""
msgctxt "CountryInfo"
msgid "Niger"
-msgstr "Ð?игеÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Nigeria"
-msgstr "Ð?игеÑ?иÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Norway"
-msgstr "Ð?оÑ?вегиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Oman"
-msgstr "Ð?ман"
+msgstr ""
msgctxt "CountryInfo"
msgid "Pakistan"
-msgstr "Ð?акиÑ?Ñ?ан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palau"
-msgstr "Ð?алаÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Palestine"
-msgstr "Ð?алеÑ?Ñ?ина"
+msgstr ""
msgctxt "CountryInfo"
msgid "Panama"
-msgstr "Ð?анама"
+msgstr ""
msgctxt "CountryInfo"
msgid "Papua New Guinea"
-msgstr "Ð?апÑ?а-Ð?оваÑ? Ð?винеÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Paraguay"
-msgstr "Ð?аÑ?агвай"
+msgstr ""
msgctxt "CountryInfo"
msgid "Peru"
-msgstr "Ð?еÑ?Ñ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Philippines"
-msgstr "ФилиппинÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Poland"
-msgstr "Ð?олÑ?Ñ?а"
+msgstr ""
msgctxt "CountryInfo"
msgid "Portugal"
-msgstr "Ð?оÑ?Ñ?Ñ?галиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Qatar"
-msgstr "Ð?аÑ?аÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Romania"
-msgstr "Ð Ñ?мÑ?ниÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Russia"
-msgstr "Ð Ñ?Ñ?Ñ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Rwanda"
-msgstr "Ð Ñ?андa"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Kitts & Nevis"
-msgstr "СенÑ?-Ð?иÑ?Ñ? и Ð?евиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Lucia"
-msgstr "СанÑ?а-Ð?Ñ?Ñ?иÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saint Vincent & the Grenadines"
-msgstr "СенÑ?-Ð?инÑ?енÑ? и Ð?Ñ?енадинÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Samoa"
-msgstr "Самоа"
+msgstr ""
msgctxt "CountryInfo"
msgid "San Marino"
-msgstr "Сан - Ð?аÑ?ино"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sao Tome & Principe"
-msgstr "Сан-Томе и Ð?Ñ?инÑ?ипи"
+msgstr ""
msgctxt "CountryInfo"
msgid "Saudi Arabia"
-msgstr "СаÑ?довÑ?каÑ? Ð?Ñ?авиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Senegal"
-msgstr "Сенегал"
+msgstr ""
msgctxt "CountryInfo"
msgid "Serbia"
-msgstr "СеÑ?биÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Seychelles"
-msgstr "СейÑ?елÑ?Ñ?кие оÑ?Ñ?Ñ?ова"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sierra Leone"
-msgstr "СÑ?еÑ?Ñ?а-Ð?еоне"
+msgstr ""
msgctxt "CountryInfo"
msgid "Singapore"
-msgstr "СингапÑ?Ñ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovakia"
-msgstr "СловакиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Slovenia"
-msgstr "СловениÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Solomon Islands"
-msgstr "СоломоновÑ? Ð?Ñ?Ñ?Ñ?ова"
+msgstr ""
msgctxt "CountryInfo"
msgid "Somalia"
-msgstr "Сомали"
+msgstr ""
msgctxt "CountryInfo"
msgid "South Africa"
-msgstr "ЮжнаÑ? Ð?Ñ?Ñ?ика"
+msgstr ""
msgctxt "CountryInfo"
msgid "Spain"
-msgstr "Ð?Ñ?паниÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sri Lanka"
-msgstr "ШÑ?и-Ð?анка"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sudan"
-msgstr "СÑ?дан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Suriname"
-msgstr "СÑ?Ñ?инам"
+msgstr ""
msgctxt "CountryInfo"
msgid "Swaziland"
-msgstr "Свазиленд"
+msgstr ""
msgctxt "CountryInfo"
msgid "Sweden"
-msgstr "ШвеÑ?иÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Switzerland"
-msgstr "ШвейÑ?аÑ?иÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Syria"
-msgstr "СиÑ?иÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tajikistan"
-msgstr "ТаджикиÑ?Ñ?ан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tanzania"
-msgstr "ТанзаниÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Thailand"
-msgstr "Таиланд"
+msgstr ""
msgctxt "CountryInfo"
msgid "Timor-Leste (East Timor)"
-msgstr "ТимоÑ?-Ð?еÑ?Ñ?и (Ð?оÑ?Ñ?оÑ?нÑ?й ТимоÑ?)"
+msgstr ""
msgctxt "CountryInfo"
msgid "Togo"
-msgstr "Того"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tonga"
-msgstr "Тонга"
+msgstr ""
msgctxt "CountryInfo"
msgid "Trinidad & Tobago"
-msgstr "ТÑ?инидад и Тобаго"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tunisia"
-msgstr "ТÑ?ниÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkey"
-msgstr "ТÑ?Ñ?Ñ?иÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Turkmenistan"
-msgstr "ТÑ?Ñ?кмениÑ?Ñ?ан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Tuvalu"
-msgstr "ТÑ?валÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uganda"
-msgstr "Уганда"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ukraine"
-msgstr "УкÑ?аинa"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Arab Emirates"
-msgstr "Ð?бÑ?единеннÑ?е Ð?Ñ?абÑ?кие ÐмиÑ?аÑ?Ñ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "United Kingdom"
-msgstr "Соединенное Ð?оÑ?олевÑ?Ñ?во"
+msgstr ""
msgctxt "CountryInfo"
msgid "United States"
-msgstr "СоединеннÑ?е ШÑ?аÑ?Ñ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uruguay"
-msgstr "УÑ?Ñ?гвай"
+msgstr ""
msgctxt "CountryInfo"
msgid "Uzbekistan"
-msgstr "УзбекиÑ?Ñ?ан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vanuatu"
-msgstr "Ð?анÑ?аÑ?Ñ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vatican"
-msgstr "Ð?аÑ?икан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Venezuela"
-msgstr "Ð?енеÑ?Ñ?Ñ?ла"
+msgstr ""
msgctxt "CountryInfo"
msgid "Vietnam"
-msgstr "Ð?Ñ?еÑ?нам"
+msgstr ""
msgctxt "CountryInfo"
msgid "Western Sahara"
-msgstr "Ð?ападнaÑ? СаÑ?аÑ?a"
+msgstr ""
msgctxt "CountryInfo"
msgid "Yemen"
-msgstr "Ð?емен"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zambia"
-msgstr "Ð?амбиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zimbabwe"
-msgstr "Ð?имбабве"
+msgstr ""
msgctxt "CountryInfo"
msgid "Zaire"
@@ -1164,99 +1167,99 @@ msgstr ""
msgctxt "CountryInfo"
msgid "Albania"
-msgstr "Ð?лбаниÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Algeria"
-msgstr "Ð?лжиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Austria"
-msgstr "Ð?вÑ?Ñ?Ñ?иÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Bahrain"
-msgstr "Ð?аÑ?Ñ?ейн"
+msgstr ""
msgctxt "CountryInfo"
msgid "Benin"
-msgstr "Ð?енин"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ethiopia"
-msgstr "ÐÑ?иопиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Fiji"
-msgstr "Фиджи"
+msgstr ""
msgctxt "CountryInfo"
msgid "Finland"
-msgstr "ФинлÑ?ндиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Greece"
-msgstr "Ð?Ñ?еÑ?иÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Guam"
-msgstr "Ð?Ñ?ам"
+msgstr ""
msgctxt "CountryInfo"
msgid "Hungary"
-msgstr "Ð?енгÑ?иÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iceland"
-msgstr "Ð?Ñ?ландиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "India"
-msgstr "Ð?ндиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Indonesia"
-msgstr "Ð?ндонезиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iran"
-msgstr "Ð?Ñ?ан"
+msgstr ""
msgctxt "CountryInfo"
msgid "Iraq"
-msgstr "Ð?Ñ?ак"
+msgstr ""
msgctxt "CountryInfo"
msgid "Ireland"
-msgstr "Ð?Ñ?ландиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, North"
-msgstr "СевеÑ?наÑ? Ð?оÑ?еÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Korea, South"
-msgstr "ЮжнаÑ? Ð?оÑ?еÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Libya"
-msgstr "Ð?ивиÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Maldives"
-msgstr "Ð?алÑ?дивÑ?"
+msgstr ""
msgctxt "CountryInfo"
msgid "Mexico"
-msgstr "Ð?екÑ?ика"
+msgstr ""
msgctxt "CountryInfo"
msgid "Myanmar"
-msgstr "Ð?Ñ?Ñ?нмa"
+msgstr ""
msgctxt "CountryInfo"
msgid "Taiwan"
-msgstr "ТайванÑ?"
+msgstr ""
msgctxt "CrashReportDialog"
msgid "Submit a Crash Report"
@@ -1316,215 +1319,215 @@ msgstr ""
msgctxt "GeneralPage"
msgid "Executables (*.exe)"
-msgstr "Ð?Ñ?полнÑ?емÑ?е Ñ?айлÑ? (*. EXE)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Path to Tor"
-msgstr "Ð?Ñ?беÑ?иÑ?е пÑ?Ñ?Ñ? к Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Select Proxy Executable"
-msgstr "Ð?Ñ?беÑ?иÑ?е иÑ?полнÑ?емÑ?й Ñ?айл пÑ?окÑ?и"
+msgstr ""
msgctxt "GeneralPage"
msgid "You must specify the name of your Tor executable."
-msgstr "Ð?Ñ? должнÑ? Ñ?казаÑ?Ñ? имÑ? иÑ?полнÑ?емого Ñ?айла Tor."
+msgstr ""
msgctxt "GeneralPage"
msgid "Start Vidalia when my system starts"
-msgstr "Ð?апÑ?Ñ?каÑ?Ñ? Vidalia пÑ?и запÑ?Ñ?ке моей Ñ?иÑ?Ñ?емÑ?"
+msgstr ""
msgctxt "GeneralPage"
msgid "Browse"
-msgstr "Ð?бзоÑ?"
-
-msgctxt "GeneralPage"
-msgid "Start the Tor software when Vidalia starts"
-msgstr "Ð?апÑ?Ñ?каÑ?Ñ? Tor пÑ?и запÑ?Ñ?ке Vidalia"
+msgstr ""
msgctxt "GeneralPage"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application (optional)"
-msgstr "Ð?Ñ?окÑ?и (опÑ?ионалÑ?но)"
+msgstr ""
msgctxt "GeneralPage"
msgid "Start a proxy application when Tor starts"
-msgstr "Ð?апÑ?Ñ?каÑ?Ñ? пÑ?окÑ?и пÑ?и запÑ?Ñ?ке Tor"
+msgstr ""
msgctxt "GeneralPage"
msgid "Proxy Application Arguments:"
-msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? пÑ?окÑ?и:"
+msgstr ""
msgctxt "GeneralPage"
msgid "Software Updates"
-msgstr "Ð?бновлениÑ? пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ?"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check for new software updates automatically"
-msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ? налиÑ?ие обновлений пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ? авÑ?омаÑ?иÑ?еÑ?ки"
+msgstr ""
msgctxt "GeneralPage"
msgid "Check Now"
-msgstr "Ð?Ñ?овеÑ?иÑ?Ñ? Ñ?ейÑ?аÑ?"
+msgstr ""
+
+msgctxt "GeneralPage"
+msgid "Connect to Tor automatically"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB/s"
-msgstr "%1 Ð?Ð?/Ñ?"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 KB"
-msgstr "%1 KB"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 MB"
-msgstr "%1 Ð?Ð?"
+msgstr ""
msgctxt "GraphFrame"
msgid "%1 GB"
-msgstr "%1 Ð?Ð?"
+msgstr ""
msgctxt "GraphFrame"
msgid "Recv:"
-msgstr "Ð?олÑ?Ñ?ено:"
+msgstr ""
msgctxt "GraphFrame"
msgid "Sent:"
-msgstr "Ð?Ñ?пÑ?авлено:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Supplied XML file is not a valid Contents document."
-msgstr "Ð?Ñ?едоÑ?Ñ?авленнÑ?й XML Ñ?айл не Ñ?одеÑ?жиÑ? веÑ?нÑ?й докÑ?менÑ?."
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached end of document"
-msgstr "Ð?оиÑ?к доÑ?Ñ?иг конÑ?а докÑ?менÑ?а"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search reached start of document"
-msgstr "Ð?оиÑ?к доÑ?Ñ?иг наÑ?алa докÑ?менÑ?а"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Text not found in document"
-msgstr "ТекÑ?Ñ? не найден в докÑ?менÑ?е"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found %1 results"
-msgstr "Ð?айдено %1 Ñ?езÑ?лÑ?Ñ?аÑ?ов"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Vidalia Help"
-msgstr "Ð?омоÑ?Ñ?"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Back"
-msgstr "Ð?азад"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to previous page (Backspace)"
-msgstr "Ð?еÑ?нÑ?Ñ?Ñ?Ñ?Ñ? на пÑ?едÑ?дÑ?Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ? (Backspace)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Backspace"
-msgstr "Backspace"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Forward"
-msgstr "Ð?пеÑ?Ñ?д"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to next page (Shift+Backspace)"
-msgstr "Ð?еÑ?ейÑ?и на Ñ?ледÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ? (Shift+Backspace)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Shift+Backspace"
-msgstr "Shift+Backspace"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Home"
-msgstr "Ð?лавнаÑ?"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Move to the Home page (Ctrl+H)"
-msgstr "Ð?еÑ?ейÑ?и на главнÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ? (Ctrl+H)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+H"
-msgstr "Ctrl+H"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find"
-msgstr "Ð?айÑ?и"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search for a word or phrase on current page (Ctrl+F)"
-msgstr "Ð?оиÑ?к Ñ?лово или Ñ?Ñ?азÑ? на Ñ?екÑ?Ñ?ей Ñ?Ñ?Ñ?аниÑ?е (Ctrl + F)"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close"
-msgstr "Ð?акÑ?Ñ?Ñ?Ñ?"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Close Vidalia Help"
-msgstr "Ð?акÑ?Ñ?Ñ?Ñ? Ð?омоÑ?Ñ? Vidalia"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find:"
-msgstr "Ð?айÑ?и:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Previous"
-msgstr "Ð?айÑ?и пÑ?едÑ?дÑ?Ñ?ee"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Find Next"
-msgstr "Ð?айÑ?и Ñ?ледÑ?Ñ?Ñ?ее"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Case sensitive"
-msgstr "С Ñ?Ñ?еÑ?ом Ñ?егиÑ?Ñ?Ñ?а"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Whole words only"
-msgstr "ТолÑ?ко Ñ?лова Ñ?еликом"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Help Topics"
-msgstr "СпÑ?авки"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Contents"
-msgstr "СодеÑ?жание"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Search"
-msgstr "Ð?оиÑ?к"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Searching for:"
-msgstr "Ð?оиÑ?к:"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Found Documents"
-msgstr "Ð?айденÑ?е докÑ?менÑ?Ñ?"
+msgstr ""
msgctxt "HelpBrowser"
msgid "Error Loading Help Contents:"
-msgstr "Ð?Ñ?ибка пÑ?и загÑ?Ñ?зке даннÑ?Ñ? Ð?омоÑ?и:"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Opening External Link"
-msgstr "Ð?Ñ?кÑ?Ñ?Ñ?ие внеÑ?ней Ñ?Ñ?Ñ?лки"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
@@ -1532,64 +1535,60 @@ msgid ""
"browser is not currently configured to use Tor then the request will not be "
"anonymous."
msgstr ""
-"Vidalia можеÑ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?лкÑ? в ваÑ?ем бÑ?аÑ?зеÑ?е по Ñ?молÑ?аниÑ?. Ð?Ñ?ли ваÑ? бÑ?аÑ?зеÑ?"
-" не наÑ?Ñ?Ñ?оен длÑ? иÑ?полÑ?зованиÑ? Tor, Ñ?о запÑ?оÑ? не бÑ?деÑ? анонимнÑ?м."
msgctxt "HelpTextBrowser"
msgid "Do you want Vidalia to open the link in your Web browser?"
-msgstr "Ð?Ñ? Ñ?оÑ?иÑ?е, Ñ?Ñ?обÑ? Vidalia оÑ?кÑ?Ñ?ла Ñ?Ñ?Ñ?лкÑ? в веб-бÑ?аÑ?зеÑ?е?"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid "Unable to Open Link"
-msgstr "Ð?е Ñ?даеÑ?Ñ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?лкÑ?"
+msgstr ""
msgctxt "HelpTextBrowser"
msgid ""
"Vidalia was unable to open the selected link in your Web browser. You can "
"still copy the URL and paste it into your browser."
msgstr ""
-"Vidalia не Ñ?могла оÑ?кÑ?Ñ?Ñ?Ñ? вÑ?бÑ?аннÑ?Ñ? Ñ?Ñ?Ñ?лкÑ? на ваÑ? веб-бÑ?аÑ?зеÑ?. Ð?Ñ? вÑ?е еÑ?е "
-"можеÑ?е Ñ?копиÑ?оваÑ?Ñ? URL и вÑ?Ñ?авиÑ?Ñ? его в адÑ?еÑ?нÑ?Ñ? Ñ?Ñ?Ñ?окÑ? бÑ?аÑ?зеÑ?а."
msgctxt "HelpTextBrowser"
msgid "Error opening help file:"
-msgstr "Ð?Ñ?ибка оÑ?кÑ?Ñ?Ñ?иÑ? Ñ?айла помоÑ?и:"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License Information"
-msgstr "Ð?нÑ?оÑ?маÑ?иÑ? о лиÑ?ензии"
+msgstr ""
msgctxt "LicenseDialog"
msgid "License"
-msgstr "Ð?иÑ?ензиÑ?"
+msgstr ""
msgctxt "LicenseDialog"
msgid "Credits"
-msgstr "Ð?Ñ?едиÑ?Ñ?"
+msgstr ""
msgctxt "LogEvent"
msgid "Debug"
-msgstr "Ð?Ñ?ладка"
+msgstr ""
msgctxt "LogEvent"
msgid "Info"
-msgstr "Ð?нÑ?оÑ?маÑ?иÑ?"
+msgstr ""
msgctxt "LogEvent"
msgid "Notice"
-msgstr "Ð?амеÑ?ание"
+msgstr ""
msgctxt "LogEvent"
msgid "Warning"
-msgstr "Ð?Ñ?едÑ?пÑ?еждение"
+msgstr ""
msgctxt "LogEvent"
msgid "Error"
-msgstr "Ð?Ñ?ибка"
+msgstr ""
msgctxt "LogEvent"
msgid "Unknown"
-msgstr "Ð?еизвеÑ?Ñ?но"
+msgstr ""
msgctxt "LogTreeItem"
msgid "Debug"
@@ -1617,472 +1616,336 @@ msgstr ""
msgctxt "MainWindow"
msgid "Start Tor"
-msgstr "Ð?апÑ?Ñ?Ñ?иÑ?Ñ? Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Exit"
-msgstr "Ð?Ñ?Ñ?од"
+msgstr ""
msgctxt "MainWindow"
msgid "Bandwidth Graph"
-msgstr "Ð?Ñ?аÑ?ик Ñ?Ñ?аÑ?ика"
+msgstr ""
msgctxt "MainWindow"
msgid "Message Log"
-msgstr "Ð?Ñ?Ñ?нал Ñ?ообÑ?ений"
+msgstr ""
msgctxt "MainWindow"
msgid "Network Map"
-msgstr "Ð?аÑ?Ñ?а Ñ?еÑ?и"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Panel"
-msgstr "Ð?анелÑ? Ñ?пÑ?авлениÑ?"
+msgstr ""
msgctxt "MainWindow"
msgid "Settings"
-msgstr "Ð?аÑ?Ñ?Ñ?ойки"
+msgstr ""
msgctxt "MainWindow"
msgid "About"
-msgstr "СпÑ?авка"
+msgstr ""
msgctxt "MainWindow"
msgid "Help"
-msgstr "Ð?омоÑ?Ñ?"
+msgstr ""
msgctxt "MainWindow"
msgid "New Identity"
-msgstr "СмениÑ?Ñ? лиÑ?инÑ?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+T"
-msgstr "Ctrl+T"
-
-msgctxt "MainWindow"
-msgid "Ctrl+B"
-msgstr "Ctrl+B"
-
-msgctxt "MainWindow"
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-msgctxt "MainWindow"
-msgid "Ctrl+N"
-msgstr "Ctrl+N"
-
-msgctxt "MainWindow"
-msgid "Ctrl+?"
-msgstr "Ctrl+?"
-
-msgctxt "MainWindow"
-msgid "Ctrl+I"
-msgstr "Ctrl+I"
-
-msgctxt "MainWindow"
-msgid "Ctrl+P"
-msgstr "Ctrl+P"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor"
-msgstr "Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "View"
-msgstr "Ð?Ñ?оÑ?моÑ?Ñ?"
-
-msgctxt "MainWindow"
-msgid "Vidalia Help"
-msgstr "Ð?омоÑ?Ñ?"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting web browser"
-msgstr "Ð?Ñ?ибка пÑ?и запÑ?Ñ?ке веб-бÑ?аÑ?зеÑ?а"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured web browser"
-msgstr "Vidalia не Ñ?могла запÑ?Ñ?Ñ?иÑ?Ñ? Ñ?казаннÑ?й в наÑ?Ñ?Ñ?ойкаÑ? веб-бÑ?аÑ?зеÑ?"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting IM client"
-msgstr "Ð?Ñ?ибка пÑ?и запÑ?Ñ?ке IM-клиенÑ?а"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured IM client"
-msgstr "Vidalia не Ñ?могла запÑ?Ñ?Ñ?иÑ?Ñ? Ñ?казаннÑ?й в наÑ?Ñ?Ñ?ойкаÑ? IM-клиенÑ?"
+msgstr ""
msgctxt "MainWindow"
msgid "Error starting proxy server"
-msgstr "Ð?Ñ?ибка пÑ?и запÑ?Ñ?ке пÑ?окÑ?и-Ñ?еÑ?веÑ?a"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to start the configured proxy server"
-msgstr "Vidalia не Ñ?могла запÑ?Ñ?Ñ?иÑ?Ñ? Ñ?казаннÑ?й в наÑ?Ñ?Ñ?ойкаÑ? пÑ?окÑ?и-Ñ?еÑ?веÑ?"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to a relay directory"
-msgstr "Ð?одклÑ?Ñ?ение к каÑ?алогy Ñ?еÑ?веÑ?ов"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing an encrypted directory connection"
-msgstr "Создание Ñ?иÑ?Ñ?ованного Ñ?оединениÑ? каÑ?алогa"
+msgstr ""
msgctxt "MainWindow"
msgid "Retrieving network status"
-msgstr "Ð?олÑ?Ñ?ение Ñ?Ñ?аÑ?Ñ?Ñ?а Ñ?еÑ?и"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading network status"
-msgstr "Ð?агÑ?Ñ?зка Ñ?оÑ?Ñ?оÑ?ниÑ? Ñ?еÑ?и"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading authority certificates"
-msgstr "Ð?агÑ?Ñ?зка Ñ?еÑ?Ñ?иÑ?икаÑ?ов"
+msgstr ""
msgctxt "MainWindow"
msgid "Requesting relay information"
-msgstr "Ð?апÑ?оÑ? инÑ?оÑ?маÑ?ии Ñ?еÑ?веÑ?a"
+msgstr ""
msgctxt "MainWindow"
msgid "Loading relay information"
-msgstr "Ð?агÑ?Ñ?зка инÑ?оÑ?маÑ?ии Ñ?еле"
+msgstr ""
msgctxt "MainWindow"
msgid "Connecting to the Tor network"
-msgstr "Ð?одклÑ?Ñ?ение к Ñ?еÑ?и Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Establishing a Tor circuit"
-msgstr "Создание Ñ?епоÑ?ки Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Connected to the Tor network!"
-msgstr "Ð?одклÑ?Ñ?ение к Ñ?еÑ?и Tor!"
+msgstr ""
msgctxt "MainWindow"
msgid "Unrecognized startup status"
-msgstr "Ð?еÑ?аÑ?познаннÑ?й Ñ?Ñ?аÑ?Ñ?Ñ? запÑ?Ñ?ка"
+msgstr ""
msgctxt "MainWindow"
msgid "miscellaneous"
-msgstr "pазное"
+msgstr ""
msgctxt "MainWindow"
msgid "identity mismatch"
-msgstr "неÑ?ооÑ?веÑ?Ñ?Ñ?вие иденÑ?иÑ?икаÑ?ии"
+msgstr ""
msgctxt "MainWindow"
msgid "done"
-msgstr "cделано"
+msgstr ""
msgctxt "MainWindow"
msgid "connection refused"
-msgstr "в подклÑ?Ñ?ении оÑ?казано"
+msgstr ""
msgctxt "MainWindow"
msgid "connection timeout"
-msgstr "Тайм-аÑ?Ñ? Ñ?оединениÑ?"
+msgstr ""
msgctxt "MainWindow"
msgid "read/write error"
-msgstr "оÑ?ибка Ñ?Ñ?ениÑ? / запиÑ?и"
+msgstr ""
msgctxt "MainWindow"
msgid "no route to host"
-msgstr "не Ñ?казан пÑ?Ñ?Ñ? к Ñ?оÑ?Ñ?Ñ?"
+msgstr ""
msgctxt "MainWindow"
msgid "insufficient resources"
-msgstr "неÑ?ваÑ?ка Ñ?еÑ?Ñ?Ñ?Ñ?ов"
+msgstr ""
msgctxt "MainWindow"
msgid "unknown"
-msgstr "неизвеÑ?Ñ?нo"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is not running"
-msgstr "Tor не Ñ?абоÑ?аеÑ?"
+msgstr ""
msgctxt "MainWindow"
msgid "Tor is shutting down"
-msgstr "Tor оÑ?Ñ?анавливаеÑ?Ñ?Ñ?"
-
-msgctxt "MainWindow"
-msgid "Stop Tor Now"
-msgstr "Ð?Ñ?Ñ?ановиÑ?Ñ? Tor пÑ?Ñ?мо Ñ?ейÑ?аÑ?"
+msgstr ""
msgctxt "MainWindow"
msgid "Stop Tor"
-msgstr "Ð?Ñ?Ñ?ановиÑ?Ñ? Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting the Tor software"
-msgstr "Ð?апÑ?Ñ?к пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ? Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Starting Tor"
-msgstr "Tor запÑ?Ñ?каеÑ?Ñ?Ñ?"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Starting Tor"
-msgstr "Ð?Ñ?ибка пÑ?и запÑ?Ñ?ке Tor"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to start Tor. Check your settings to ensure the correct "
"name and location of your Tor executable is specified."
msgstr ""
-"Vidalia не Ñ?могла запÑ?Ñ?Ñ?иÑ?Ñ? Tor. Ð?Ñ?овеÑ?Ñ?Ñ?е наÑ?Ñ?Ñ?ойки и Ñ?бедиÑ?еÑ?Ñ? Ñ?Ñ?о имÑ? и "
-"меÑ?Ñ?оположение иÑ?полнÑ?емого Ñ?айла Tor Ñ?казанo."
msgctxt "MainWindow"
msgid "Connecting to Tor"
-msgstr "Ð?одклÑ?Ñ?ение к Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Connection Error"
-msgstr "Ð?Ñ?ибка пÑ?и подклÑ?Ñ?ении"
+msgstr ""
msgctxt "MainWindow"
msgid "Relaying is Enabled"
-msgstr "РеÑ?Ñ?анÑ?лÑ?Ñ?иÑ? Ð?клÑ?Ñ?енa"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Shutting Down"
-msgstr "Ð?Ñ?ибка вÑ?клÑ?Ñ?ениÑ?"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to stop the Tor software."
-msgstr "Vidalia не Ñ?могла оÑ?Ñ?ановиÑ?Ñ? пÑ?огÑ?аммное обеÑ?пеÑ?ение Tor."
+msgstr ""
msgctxt "MainWindow"
msgid "Unexpected Error"
-msgstr "Ð?еожиданнаÑ? оÑ?ибка"
+msgstr ""
msgctxt "MainWindow"
msgid "Authenticating to Tor"
-msgstr "Ð?Ñ?Ñ?енÑ?иÑ?икаÑ?иÑ? Tor"
+msgstr ""
msgctxt "MainWindow"
msgid "Cookie Authentication Required"
-msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? пÑ?овеÑ?ка подлинноÑ?Ñ?и кÑ?ки"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The Tor software requires Vidalia to send the contents of an authentication "
"cookie, but Vidalia was unable to find one."
msgstr ""
-"Ð?Ñ?огÑ?аммное обеÑ?пеÑ?ение Tor Ñ?Ñ?ебÑ?еÑ? Vidalia оÑ?пÑ?авиÑ?Ñ? Ñ?одеÑ?жание "
-"аÑ?Ñ?енÑ?иÑ?икаÑ?ии кÑ?ки, но Vidalia не Ñ?могла найÑ?и ни одного."
msgctxt "MainWindow"
msgid "Would you like to browse for the file 'control_auth_cookie' yourself?"
-msgstr "ХоÑ?ели бÑ? Ð?Ñ? найÑ?и Ñ?айл \"control_auth_cookie\" Ñ?амоÑ?Ñ?оÑ?Ñ?елÑ?но?"
+msgstr ""
msgctxt "MainWindow"
msgid "Data Directory"
-msgstr "Ð?аÑ?алог даннÑ?Ñ?"
+msgstr ""
msgctxt "MainWindow"
msgid "Control Cookie (control_auth_cookie)"
-msgstr "УпÑ?авление Ð?Ñ?ки (control_auth_cookie)"
+msgstr ""
msgctxt "MainWindow"
msgid "Error Registering for Events"
-msgstr "Ð?Ñ?ибка Ñ?егиÑ?Ñ?Ñ?аÑ?ии Ñ?обÑ?Ñ?ий"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Vidalia was unable to register for some events. Many of Vidalia's features "
"may be unavailable."
msgstr ""
-"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 доÑ?Ñ?Ñ?пно"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended. Please visit the Tor website to download the latest version."
msgstr ""
-"УÑ?Ñ?ановленнаÑ? веÑ?Ñ?иÑ? Tor Ñ?Ñ?Ñ?аÑ?ела или не Ñ?екомендÑ?еÑ?Ñ?Ñ?. Ð?ожалÑ?йÑ?Ñ?а, поÑ?еÑ?иÑ?е"
-" веб-Ñ?айÑ? Tor длÑ? загÑ?Ñ?зки поÑ?ледней веÑ?Ñ?ии."
msgctxt "MainWindow"
msgid "Tor website: %1"
-msgstr "Tor Ñ?айÑ?: %1"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"All subsequent connections will appear to be different than your old "
"connections."
msgstr ""
-"Ð?Ñ?е поÑ?ледÑ?Ñ?Ñ?ие Ñ?оединениÑ? бÑ?дÑ?Ñ? оÑ?лиÑ?аÑ?Ñ?Ñ?Ñ? оÑ? ваÑ?иÑ? пÑ?едÑ?дÑ?Ñ?иÑ? Ñ?оединений"
msgctxt "MainWindow"
msgid "Failed to Create New Identity"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? новÑ?й маÑ?Ñ?Ñ?Ñ?Ñ?"
+msgstr ""
msgctxt "MainWindow"
msgid "Port Forwarding Failed"
-msgstr "Ð?еÑ?енапÑ?авление поÑ?Ñ?а не Ñ?далоÑ?Ñ?"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to configure automatic port forwarding."
-msgstr "Vidalia не Ñ?могла наÑ?Ñ?Ñ?оиÑ?Ñ? авÑ?омаÑ?иÑ?еÑ?кое пеÑ?енапÑ?авление поÑ?Ñ?a."
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia Control Panel"
-msgstr "Ð?анелÑ? УпÑ?авлениÑ? Vidalia"
+msgstr ""
msgctxt "MainWindow"
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 "СкÑ?Ñ?Ñ?Ñ? Ñ?Ñ?о окно"
+msgstr ""
msgctxt "MainWindow"
msgid "Password Reset Failed"
-msgstr "Ð?зменение паÑ?олÑ? не Ñ?далоÑ?Ñ?"
-
-msgctxt "MainWindow"
-msgid ""
-"Vidalia tried to reset Tor's control password, but was not able to restart "
-"the Tor software. Please check your Task Manager to ensure there are no "
-"other Tor processes running."
msgstr ""
-"Vidalia пÑ?Ñ?алаÑ?Ñ? Ñ?бÑ?оÑ?иÑ?Ñ? паÑ?олÑ? Ñ?пÑ?авлениÑ? Tor, но бÑ?ла не в Ñ?оÑ?Ñ?оÑ?нии "
-"пеÑ?езагÑ?Ñ?зиÑ?Ñ? пÑ?огÑ?аммное обеÑ?пеÑ?ение Tor. Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е диÑ?пеÑ?Ñ?еÑ? "
-"задаÑ?, Ñ?Ñ?обÑ? Ñ?бедиÑ?Ñ?Ñ?Ñ?, Ñ?Ñ?о неÑ? болÑ?Ñ?е никакиÑ? Ñ?абоÑ?аÑ?Ñ?иÑ? пÑ?оÑ?еÑ?Ñ?ов Tor."
msgctxt "MainWindow"
msgid ""
"The currently installed version of Tor is out of date or no longer "
"recommended."
-msgstr "УÑ?Ñ?ановленнаÑ? веÑ?Ñ?иÑ? Tor Ñ?Ñ?Ñ?аÑ?ела или не Ñ?екомендÑ?еÑ?Ñ?Ñ?."
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Would you like to check if a newer package is available for installation?"
-msgstr "ХоÑ?ели бÑ? Ð?Ñ? пÑ?овеÑ?иÑ?Ñ?, еÑ?ли новÑ?й пакеÑ? доÑ?Ñ?Ñ?пен длÑ? Ñ?Ñ?Ñ?ановки?"
+msgstr ""
msgctxt "MainWindow"
msgid "Potentially Unsafe Connection"
-msgstr "Ð?оÑ?енÑ?иалÑ?но опаÑ?ное подклÑ?Ñ?ение"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"Tor has automatically closed your connection in order to protect your "
"anonymity."
msgstr ""
-"Tor авÑ?омаÑ?иÑ?еÑ?ки оÑ?Ñ?ановил ваÑ?е Ñ?оединение, Ñ?Ñ?обÑ? Ñ?оÑ?Ñ?аниÑ?Ñ? ваÑ?Ñ? "
-"анонимноÑ?Ñ?Ñ?."
msgctxt "MainWindow"
msgid "Update Failed"
-msgstr "Ð?еÑ?даÑ?наÑ? попÑ?Ñ?ка обновлениÑ?"
+msgstr ""
msgctxt "MainWindow"
msgid "Your software is up to date"
-msgstr "Ð?аÑ?е пÑ?огÑ?аммное обеÑ?пеÑ?ение - новейÑ?ее"
+msgstr ""
msgctxt "MainWindow"
msgid ""
"There are no new Tor software packages available for your computer at this "
"time."
msgstr ""
-"Ð?овое пÑ?огÑ?аммное обеÑ?пеÑ?ение Tor длÑ? ваÑ?его компÑ?Ñ?Ñ?еÑ?а в наÑ?Ñ?оÑ?Ñ?ий моменÑ? "
-"не доÑ?Ñ?Ñ?пно."
msgctxt "MainWindow"
msgid "Installation Failed"
-msgstr "УÑ?Ñ?ановка не Ñ?далаÑ?Ñ?"
+msgstr ""
msgctxt "MainWindow"
msgid "Vidalia was unable to install your software updates."
-msgstr "Vidalia не Ñ?могла Ñ?Ñ?Ñ?ановиÑ?Ñ? обновлениÑ? пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ?."
+msgstr ""
msgctxt "MainWindow"
msgid "The following error occurred:"
-msgstr "Ð?Ñ?оизоÑ?ла Ñ?ледÑ?Ñ?Ñ?аÑ? оÑ?ибка:"
+msgstr ""
msgctxt "MainWindow"
msgid ""
@@ -2098,16 +1961,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 ""
@@ -2115,9 +1994,6 @@ msgid ""
"\n"
"Would you like to shutdown gracefully and give clients time to find a new relay?"
msgstr ""
-"Ð?Ñ? в наÑ?Ñ?оÑ?Ñ?ее вÑ?емÑ? Ñ?абоÑ?аеÑ?е в Ñ?ежиме Ñ?еÑ?веÑ?а. Ð?Ñ?клÑ?Ñ?ение ваÑ?его Ñ?еÑ?веÑ?а "
-"пÑ?еÑ?Ñ?вÑ?Ñ? вÑ?е оÑ?кÑ?Ñ?Ñ?Ñ?е Ñ?оединений оÑ? клиенÑ?ов. ХоÑ?ели бÑ? Ð?Ñ? вÑ?клÑ?Ñ?иÑ?Ñ? Ñ?еÑ?веÑ? "
-"в Ñ?адÑ?Ñ?ем Ñ?ежиме и пÑ?едоÑ?Ñ?авиÑ?Ñ? клиенÑ?ам вÑ?емÑ?, Ñ?Ñ?обÑ? найÑ?и новйÑ? Ñ?еÑ?веÑ??"
msgctxt "MainWindow"
msgid ""
@@ -2125,301 +2001,310 @@ msgid ""
"\n"
"Please check the message log for recent warning or error messages."
msgstr ""
-"Vidalia обнаÑ?Ñ?жила, Ñ?Ñ?о пÑ?огÑ?аммное обеÑ?пеÑ?ение Tor неожиданно завеÑ?Ñ?ило "
-"Ñ?абоÑ?Ñ?. Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е жÑ?Ñ?нал Ñ?ообÑ?ений на поÑ?ледние пÑ?едÑ?пÑ?еждениÑ? "
-"или Ñ?ообÑ?ениÑ? об оÑ?ибкаÑ?."
+
+msgctxt "MainWindow"
+msgid ""
+"Vidalia tried to restart Tor, but was not able to. Please check your Task "
+"Manager to ensure there are no other Tor processes running."
+msgstr ""
+
+msgctxt "MainWindow"
+msgid "failed (%1)"
+msgstr ""
msgctxt "MainWindow"
msgid ", probably Telnet,"
-msgstr ", веÑ?оÑ?Ñ?но, Telnet,"
+msgstr ""
msgctxt "MainWindow"
msgid ", probably an email client,"
-msgstr ", веÑ?оÑ?Ñ?но, клиенÑ? Ñ?лекÑ?Ñ?онной поÑ?Ñ?Ñ?,"
+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 "Ð?Ñ?ибка пÑ?и Ñ?Ñ?Ñ?ановке Ñ?илÑ?Ñ?Ñ?а"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to register for Tor's log events."
-msgstr "Vidalia не Ñ?могла заÑ?егиÑ?Ñ?Ñ?иÑ?оваÑ?Ñ?Ñ?Ñ? длÑ? Ñ?обÑ?Ñ?ий Tor."
+msgstr ""
msgctxt "MessageLog"
msgid "Error Opening Log File"
-msgstr "Ð?Ñ?ибка оÑ?кÑ?Ñ?Ñ?иÑ? Ñ?айла жÑ?Ñ?нала"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia was unable to open the specified log file."
-msgstr "Vidalia не Ñ?могла оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?казаннÑ?й Ñ?айл жÑ?Ñ?нала."
+msgstr ""
msgctxt "MessageLog"
msgid "Log Filename Required"
-msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? имÑ? Ñ?айла жÑ?Ñ?нала"
+msgstr ""
msgctxt "MessageLog"
msgid "You must enter a filename to be able to save log messages to a file."
msgstr ""
-"Ð?Ñ? должнÑ? ввеÑ?Ñ?и имÑ? Ñ?айла, Ñ?Ñ?обÑ? имеÑ?Ñ? возможноÑ?Ñ?Ñ? Ñ?оÑ?Ñ?аниÑ?Ñ? запиÑ?и жÑ?Ñ?нала"
-" в Ñ?айл."
msgctxt "MessageLog"
msgid "Select Log File"
-msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?айл жÑ?Ñ?нала"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Log Messages"
-msgstr "СоÑ?Ñ?аниÑ?Ñ? жÑ?Ñ?нал Ñ?ообÑ?ений"
+msgstr ""
msgctxt "MessageLog"
msgid "Text Files (*.txt)"
-msgstr "ТекÑ?Ñ?овÑ?е Ñ?айлÑ? (*.txt)"
+msgstr ""
msgctxt "MessageLog"
msgid "Vidalia"
-msgstr "Vidalia"
+msgstr ""
msgctxt "MessageLog"
msgid "Find in Message Log"
-msgstr "Ð?айÑ?и в жÑ?Ñ?нале Ñ?ообÑ?ений"
+msgstr ""
msgctxt "MessageLog"
msgid "Find:"
-msgstr "Ð?оиÑ?к:"
+msgstr ""
msgctxt "MessageLog"
msgid "Not Found"
-msgstr "Ð?е найдено"
+msgstr ""
msgctxt "MessageLog"
msgid "Search found 0 matches."
-msgstr "РезÑ?лÑ?Ñ?аÑ? поиÑ?ка: 0."
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log"
-msgstr "Ð?Ñ?Ñ?нал Ñ?ообÑ?ений"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filters..."
-msgstr "ФилÑ?Ñ?Ñ?Ñ? Ñ?ообÑ?ений ..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set message filters"
-msgstr "УÑ?Ñ?ановиÑ?Ñ? Ñ?илÑ?Ñ?Ñ?Ñ? Ñ?ообÑ?ений"
+msgstr ""
msgctxt "MessageLog"
msgid "History Size..."
-msgstr "Ð?лÑ?бина иÑ?Ñ?оÑ?ии ..."
+msgstr ""
msgctxt "MessageLog"
msgid "Set maximum number of messages to display"
-msgstr "УÑ?Ñ?ановиÑ?Ñ? макÑ?ималÑ?ное колиÑ?еÑ?Ñ?во Ñ?ообÑ?ений длÑ? оÑ?обÑ?ажениÑ?"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear"
-msgstr "Ð?Ñ?иÑ?Ñ?иÑ?Ñ?"
+msgstr ""
msgctxt "MessageLog"
msgid "Clear all messages from the Message Log (Ctrl+E)"
-msgstr "Ð?Ñ?иÑ?Ñ?иÑ?Ñ? вÑ?е Ñ?ообÑ?ениÑ? жÑ?Ñ?нала Ñ?ообÑ?ений (Ctrl+E)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+E"
-msgstr "Ctrl+E"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy"
-msgstr "Ð?опиÑ?оваÑ?Ñ?"
+msgstr ""
msgctxt "MessageLog"
msgid "Copy the selected messages to the clipboard (Ctrl+C)"
-msgstr "Ð?опиÑ?оваÑ?Ñ? вÑ?деленнÑ?е Ñ?ообÑ?ениÑ? в бÑ?Ñ?еÑ? обмена (Ctrl+C)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+C"
-msgstr "Ctrl+C"
+msgstr ""
msgctxt "MessageLog"
msgid "Select All"
-msgstr "Ð?Ñ?бÑ?аÑ?Ñ? вÑ?е"
+msgstr ""
msgctxt "MessageLog"
msgid "Select all messages (Ctrl+A)"
-msgstr "Ð?Ñ?бÑ?аÑ?Ñ? вÑ?е Ñ?ообÑ?ениÑ? (Ctrl+A)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+A"
-msgstr "Ctrl+A"
+msgstr ""
msgctxt "MessageLog"
msgid "Save All"
-msgstr "СоÑ?Ñ?аниÑ?Ñ? вÑ?е"
+msgstr ""
msgctxt "MessageLog"
msgid "Save all messages to a file"
-msgstr "СоÑ?Ñ?аниÑ?Ñ? вÑ?е Ñ?ообÑ?ениÑ? в Ñ?айл"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Selected"
-msgstr "СоÑ?Ñ?аниÑ?Ñ? вÑ?бÑ?аннoе"
+msgstr ""
msgctxt "MessageLog"
msgid "Save selected messages to a file"
-msgstr "СоÑ?Ñ?аниÑ?Ñ? вÑ?деленнÑ?е Ñ?ообÑ?ениÑ? в Ñ?айл"
+msgstr ""
msgctxt "MessageLog"
msgid "Settings"
-msgstr "Ð?аÑ?Ñ?Ñ?ойки"
+msgstr ""
msgctxt "MessageLog"
msgid "Adjust Message Log Settings"
-msgstr "Ð?Ñ?Ñ?егÑ?лиÑ?Ñ?йÑ?е наÑ?Ñ?Ñ?ойки жÑ?Ñ?нала Ñ?ообÑ?ений"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+T"
-msgstr "Ctrl+T"
+msgstr ""
msgctxt "MessageLog"
msgid "Help"
-msgstr "Ð?омоÑ?Ñ?"
+msgstr ""
msgctxt "MessageLog"
msgid "Show the help browser"
-msgstr "Ð?оказаÑ?Ñ? бÑ?аÑ?зеÑ?а помоÑ?и"
+msgstr ""
msgctxt "MessageLog"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "MessageLog"
msgid "Close"
-msgstr "Ð?акÑ?Ñ?Ñ?Ñ?"
+msgstr ""
msgctxt "MessageLog"
msgid "Close the Message Log"
-msgstr "Ð?акÑ?Ñ?Ñ?Ñ? жÑ?Ñ?нал Ñ?ообÑ?ений"
+msgstr ""
msgctxt "MessageLog"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "MessageLog"
msgid "Find"
-msgstr "Ð?айÑ?и"
+msgstr ""
msgctxt "MessageLog"
msgid "Find all messages containing the search text (Ctrl+F)"
-msgstr "Ð?айÑ?и вÑ?е Ñ?ообÑ?ениÑ?, Ñ?одеÑ?жаÑ?ие Ñ?екÑ?Ñ? длÑ? поиÑ?ка (Ctrl+F)"
+msgstr ""
msgctxt "MessageLog"
msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgstr ""
msgctxt "MessageLog"
msgid "Time"
-msgstr "Ð?Ñ?емÑ?"
+msgstr ""
msgctxt "MessageLog"
msgid "Type"
-msgstr "Тип"
+msgstr ""
msgctxt "MessageLog"
msgid "Message"
-msgstr "СообÑ?ение"
+msgstr ""
msgctxt "MessageLog"
msgid "Saves the current Message Log settings"
-msgstr "СоÑ?Ñ?анение Ñ?екÑ?Ñ?иÑ? наÑ?Ñ?Ñ?оек жÑ?Ñ?нала"
+msgstr ""
msgctxt "MessageLog"
msgid "Save Settings"
-msgstr "СоÑ?Ñ?аниÑ?Ñ? наÑ?Ñ?Ñ?ойки"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancels changes made to settings"
-msgstr "Ð?Ñ?менÑ?еÑ? изменениÑ?, внеÑ?еннÑ?е в наÑ?Ñ?Ñ?ойки"
+msgstr ""
msgctxt "MessageLog"
msgid "Cancel"
-msgstr "Ð?Ñ?мениÑ?Ñ?"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Filter"
-msgstr "ФилÑ?Ñ?Ñ? Ñ?ообÑ?ений"
+msgstr ""
msgctxt "MessageLog"
msgid "Error"
-msgstr "Ð?Ñ?ибка"
+msgstr ""
msgctxt "MessageLog"
msgid "Warning"
-msgstr "Ð?Ñ?едÑ?пÑ?еждение"
+msgstr ""
msgctxt "MessageLog"
msgid "Notice"
-msgstr "Уведомление"
+msgstr ""
msgctxt "MessageLog"
msgid "Info"
-msgstr "Ð?нÑ?оÑ?маÑ?иÑ?"
+msgstr ""
msgctxt "MessageLog"
msgid "Debug"
-msgstr "Ð?Ñ?ладка"
+msgstr ""
msgctxt "MessageLog"
msgid "Message Log History"
-msgstr "Ð?Ñ?Ñ?оÑ?иÑ? жÑ?Ñ?нала Ñ?ообÑ?ений"
+msgstr ""
msgctxt "MessageLog"
msgid "Number of messages to display in the message log window"
-msgstr "Ð?олиÑ?еÑ?Ñ?во Ñ?ообÑ?ений длÑ? оÑ?обÑ?ажениÑ? в окне жÑ?Ñ?нала Ñ?ообÑ?ений"
+msgstr ""
msgctxt "MessageLog"
msgid "messages"
-msgstr "Ñ?ообÑ?ениÑ?"
+msgstr ""
msgctxt "MessageLog"
msgid "Browse"
-msgstr "Ð?бзоÑ?"
+msgstr ""
msgctxt "MessageLog"
msgid "Enable automatically saving all new log messages to a file"
-msgstr "РазÑ?еÑ?иÑ?Ñ? авÑ?омаÑ?иÑ?еÑ?кое Ñ?оÑ?Ñ?анение вÑ?еÑ? новÑ?Ñ? Ñ?ообÑ?ений в Ñ?айл"
+msgstr ""
msgctxt "MessageLog"
msgid "Automatically save new log messages to a file"
-msgstr "Ð?вÑ?омаÑ?иÑ?еÑ?ки Ñ?оÑ?Ñ?анÑ?Ñ?Ñ? новÑ?е Ñ?ообÑ?ениÑ? в Ñ?айл"
-
-msgctxt "MessageLog"
-msgid "Basic"
msgstr ""
msgctxt "MessageLog"
-msgid "Tor Status"
+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."
msgstr ""
-"СообÑ?ениÑ?, коÑ?оÑ?Ñ?е поÑ?влÑ?Ñ?Ñ?Ñ?Ñ? когда Ñ?Ñ?о-Ñ?о поÑ?ло оÑ?енÑ? непÑ?авилÑ?но и Tor не "
-"можеÑ? пÑ?одолжиÑ?Ñ?."
msgctxt "MessageLog"
msgid ""
"Messages that only appear when \n"
"something has gone wrong with Tor."
-msgstr "СообÑ?ениÑ?, коÑ?оÑ?Ñ?е поÑ?влÑ?Ñ?Ñ?Ñ?Ñ? Ñ?олÑ?ко когда Ñ?Ñ?о-Ñ?о поÑ?ло не Ñ?ак Ñ? Tor."
+msgstr ""
msgctxt "MessageLog"
msgid ""
@@ -2428,266 +2313,261 @@ msgid ""
"not considered errors, but you may \n"
"care about."
msgstr ""
-"СообÑ?ениÑ? коÑ?оÑ?Ñ?е поÑ?влÑ?Ñ?Ñ?Ñ?Ñ? Ñ?едко во вÑ?емÑ? ноÑ?малÑ?ной Ñ?абоÑ?Ñ? Tor и не "
-"Ñ?Ñ?иÑ?аÑ?Ñ?Ñ?Ñ? оÑ?ибками, но вÑ? можеÑ?е Ñ?делиÑ?Ñ? им внимание."
msgctxt "MessageLog"
msgid ""
"Messages that appear frequently \n"
"during normal Tor operation."
-msgstr "СообÑ?ениÑ?, коÑ?оÑ?Ñ?е Ñ?аÑ?Ñ?о поÑ?влÑ?Ñ?Ñ?Ñ?Ñ? во вÑ?емÑ? ноÑ?малÑ?ной Ñ?абоÑ?Ñ? Tor."
+msgstr ""
msgctxt "MessageLog"
msgid ""
"Hyper-verbose messages primarily of \n"
"interest to Tor developers."
msgstr ""
-"Ð?ипеÑ?-Ñ?ообÑ?ениÑ? в пеÑ?вÑ?Ñ? оÑ?еÑ?едÑ? пÑ?едÑ?Ñ?авлÑ?Ñ?Ñ? инÑ?еÑ?еÑ? длÑ? Ñ?азÑ?абоÑ?Ñ?иков Tor."
msgctxt "MessageLog"
msgid ""
"Cannot write file %1\n"
"\n"
"%2."
-msgstr "Ð?евозможно запиÑ?аÑ?Ñ? Ñ?айл %1 %2."
-
-msgctxt "NetViewer"
-msgid "Tor Network Map"
-msgstr "Ð?аÑ?Ñ?а Ñ?еÑ?и Tor"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh"
-msgstr "Ð?бновиÑ?Ñ?"
+msgstr ""
msgctxt "NetViewer"
msgid "Refresh the list of Tor relays and connections"
-msgstr "Ð?бновиÑ?Ñ? Ñ?пиÑ?ок Ñ?еÑ?веÑ?ов и Ñ?оединений"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+R"
-msgstr "Ctrl+R"
+msgstr ""
msgctxt "NetViewer"
msgid "Help"
-msgstr "Ð?омоÑ?Ñ?"
+msgstr ""
msgctxt "NetViewer"
msgid "Show the network map help"
-msgstr "Ð?оказаÑ?Ñ? помоÑ?Ñ? по каÑ?Ñ?е Ñ?еÑ?и"
+msgstr ""
msgctxt "NetViewer"
msgid "Show network map help"
-msgstr "Ð?оказаÑ?Ñ? помоÑ?Ñ? по каÑ?Ñ?е Ñ?еÑ?и"
+msgstr ""
msgctxt "NetViewer"
msgid "F1"
-msgstr "F1"
+msgstr ""
msgctxt "NetViewer"
msgid "Close"
-msgstr "Ð?акÑ?Ñ?Ñ?Ñ?"
+msgstr ""
msgctxt "NetViewer"
msgid "Close the network map"
-msgstr "Ð?акÑ?Ñ?Ñ?Ñ? каÑ?Ñ?Ñ? Ñ?еÑ?и"
+msgstr ""
msgctxt "NetViewer"
msgid "Esc"
-msgstr "Esc"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom In"
-msgstr "УвелиÑ?иÑ?Ñ?"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom in on the network map"
-msgstr "УвелиÑ?иÑ?Ñ? на каÑ?Ñ?е Ñ?еÑ?и"
+msgstr ""
msgctxt "NetViewer"
msgid "+"
-msgstr "+"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom Out"
-msgstr "УменÑ?Ñ?иÑ?Ñ?"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom out on the network map"
-msgstr "УменÑ?Ñ?иÑ?Ñ? на каÑ?Ñ?е Ñ?еÑ?и"
+msgstr ""
msgctxt "NetViewer"
msgid "-"
-msgstr "-"
+msgstr ""
msgctxt "NetViewer"
msgid "Zoom To Fit"
-msgstr "Ð?одогнаÑ?Ñ? под Ñ?азмеÑ?"
+msgstr ""
msgctxt "NetViewer"
msgid "Zooms to fit all currently displayed circuits"
-msgstr "Ð?одогнаÑ?Ñ? под Ñ?азмеÑ?, Ñ?Ñ?обÑ? показаÑ?Ñ? вÑ?е Ñ?епоÑ?ки"
+msgstr ""
msgctxt "NetViewer"
msgid "Ctrl+Z"
-msgstr "Ctrl+Z"
+msgstr ""
msgctxt "NetViewer"
msgid "Relay Not Found"
-msgstr "СеÑ?веÑ? не найден"
+msgstr ""
msgctxt "NetViewer"
msgid "No details on the selected relay are available."
-msgstr "Ð?еÑ? подÑ?обной инÑ?оÑ?маÑ?ии о вÑ?бÑ?анном Ñ?еÑ?веÑ?е."
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Unknown"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Full Screen"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "View the network map as a full screen window"
+msgstr ""
+
+msgctxt "NetViewer"
+msgid "Ctrl+F"
+msgstr ""
msgctxt "NetViewer"
-msgid "Unknown"
-msgstr "Ð?еизвеÑ?Ñ?но"
+msgid "Network Map"
+msgstr ""
msgctxt "NetViewer"
-msgid "Full Screen"
-msgstr "Ð?олнÑ?й ÐкÑ?ан"
+msgid "Relay"
+msgstr ""
msgctxt "NetViewer"
-msgid "View the network map as a full screen window"
-msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? каÑ?Ñ?Ñ? Ñ?еÑ?и как полнÑ?й Ñ?кÑ?ан окна"
+msgid "Connection"
+msgstr ""
msgctxt "NetViewer"
-msgid "Ctrl+F"
-msgstr "Ctrl+F"
+msgid "Status"
+msgstr ""
msgctxt "NetworkPage"
msgid "Invalid Bridge"
-msgstr "Ð?евеÑ?нÑ?й моÑ?Ñ?"
+msgstr ""
msgctxt "NetworkPage"
msgid "The specified bridge identifier is not valid."
-msgstr "УказаннÑ?й иденÑ?иÑ?икаÑ?оÑ? моÑ?Ñ?а не дейÑ?Ñ?виÑ?елен."
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy (Ctrl+C)"
-msgstr "Ð?опиÑ?оваÑ?Ñ? (Ctrl+C)"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"You must specify both an IP address or hostname and a port number to "
"configure Tor to use a proxy to access the Internet."
msgstr ""
-"Ð?Ñ? должнÑ? Ñ?казаÑ?Ñ? IP-адÑ?еÑ? или имÑ? Ñ?оÑ?Ñ?а и поÑ?Ñ?, Ñ?Ñ?обÑ? наÑ?Ñ?Ñ?оиÑ?Ñ? Tor и "
-"иÑ?полÑ?зоваÑ?Ñ? пÑ?окÑ?и длÑ? доÑ?Ñ?Ñ?па в Ð?нÑ?еÑ?неÑ?."
msgctxt "NetworkPage"
msgid ""
"You must specify one or more ports to which your firewall allows you to "
"connect."
msgstr ""
-"Ð?Ñ? должнÑ? Ñ?казаÑ?Ñ? один или неÑ?колÑ?ко поÑ?Ñ?ов, к коÑ?оÑ?Ñ?м ваÑ? Ñ?еÑ?евой Ñ?кÑ?ан "
-"Ñ?азÑ?еÑ?аеÑ? подклÑ?Ñ?ение."
msgctxt "NetworkPage"
msgid "'%1' is not a valid port number."
-msgstr "'%1' невеÑ?нÑ?й номеÑ? поÑ?Ñ?а."
+msgstr ""
msgctxt "NetworkPage"
msgid "Check if your local network requires a proxy to access the Internet"
msgstr ""
-"Ð?Ñ?овеÑ?Ñ?Ñ?е, еÑ?ли ваÑ?a локалÑ?нaÑ? Ñ?еÑ?Ñ? Ñ?Ñ?ебÑ?еÑ? пÑ?окÑ?и длÑ? доÑ?Ñ?Ñ?па в Ð?нÑ?еÑ?неÑ?"
msgctxt "NetworkPage"
msgid "I use a proxy to access the Internet"
-msgstr "Я иÑ?полÑ?зÑ?Ñ? пÑ?окÑ?и длÑ? доÑ?Ñ?Ñ?па в Ð?нÑ?еÑ?неÑ?"
+msgstr ""
msgctxt "NetworkPage"
msgid "Proxy Settings"
-msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? пÑ?окÑ?и"
+msgstr ""
msgctxt "NetworkPage"
msgid "Username:"
-msgstr "Ð?мÑ? полÑ?зоваÑ?елÑ?:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Password:"
-msgstr "Ð?аÑ?олÑ?:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Port:"
-msgstr "Ð?оÑ?Ñ?:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Check to only connect to relays using ports allowed by your firewall"
msgstr ""
-"Ð?Ñ?овеÑ?Ñ?Ñ?е, Ñ?Ñ?обÑ? подклÑ?Ñ?ение к Ñ?еÑ?веÑ?ам Tor Ñ?ло Ñ?олÑ?ко Ñ?еÑ?ез поÑ?Ñ?Ñ?, "
-"Ñ?азÑ?еÑ?аемÑ?е ваÑ?им Ñ?еÑ?евÑ?м Ñ?кÑ?аном."
msgctxt "NetworkPage"
msgid "My firewall only lets me connect to certain ports"
msgstr ""
-"Ð?ой Ñ?еÑ?евой Ñ?кÑ?ан позволÑ?еÑ? мне подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? Ñ?олÑ?ко к опÑ?еделеннÑ?м поÑ?Ñ?ам"
msgctxt "NetworkPage"
msgid "Firewall Settings"
-msgstr "Ð?аÑ?Ñ?Ñ?ойки Ñ?еÑ?евого Ñ?кÑ?ана"
+msgstr ""
msgctxt "NetworkPage"
msgid "Allowed Ports:"
-msgstr "РазÑ?еÑ?еннÑ?е поÑ?Ñ?Ñ?:"
+msgstr ""
msgctxt "NetworkPage"
msgid "80, 443"
-msgstr "80443"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"Check to encrypt directory requests and, optionally, use bridge relays to "
"access the Tor network"
msgstr ""
-"Ð?Ñ?овеÑ?Ñ?Ñ?е, Ñ?Ñ?обÑ? заÑ?иÑ?Ñ?оваÑ?Ñ? запÑ?оÑ?Ñ? каÑ?алогa и, пÑ?и необÑ?одимоÑ?Ñ?и, "
-"иÑ?полÑ?зоваÑ?Ñ? моÑ?Ñ? длÑ? доÑ?Ñ?Ñ?па к Ñ?еÑ?и Tor"
msgctxt "NetworkPage"
msgid "My ISP blocks connections to the Tor network"
-msgstr "Ð?ой пÑ?овайдеÑ? блокиÑ?Ñ?еÑ? доÑ?Ñ?Ñ?п к Ñ?еÑ?и Tor"
+msgstr ""
msgctxt "NetworkPage"
msgid "Bridge Settings"
-msgstr "Ð?аÑ?Ñ?Ñ?ойки Ð?оÑ?Ñ?а"
+msgstr ""
msgctxt "NetworkPage"
msgid "Add a Bridge:"
-msgstr "Ð?обавиÑ?Ñ? моÑ?Ñ?:"
+msgstr ""
msgctxt "NetworkPage"
msgid "Remove the selected bridges from the list"
-msgstr "УдалиÑ?Ñ? вÑ?бÑ?аннÑ?е моÑ?Ñ?Ñ? из Ñ?пиÑ?ка"
+msgstr ""
msgctxt "NetworkPage"
msgid "Copy the selected bridges to the clipboard"
-msgstr "Ð?опиÑ?оваÑ?Ñ? вÑ?деленнÑ?е моÑ?Ñ?Ñ? в бÑ?Ñ?еÑ? обмена"
+msgstr ""
msgctxt "NetworkPage"
msgid "Find Bridges Now"
-msgstr "Ð?айÑ?и Ð?оÑ?Ñ?Ñ?"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How else can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Ð?ак еÑ?е Ñ? могÑ? найÑ?и моÑ?Ñ?Ñ??</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid "<a href=\"bridges.finding\">How can I find bridges?</a>"
-msgstr "<a href=\"bridges.finding\">Ð?ак Ñ? могÑ? найÑ?и моÑ?Ñ?Ñ??</a>"
+msgstr ""
msgctxt "NetworkPage"
msgid ""
"No new bridges are currently available. You can either wait a while and try "
"again, or try another method of finding new bridges."
msgstr ""
-"Ð?еÑ? новÑ?Ñ? моÑ?Ñ?ов, коÑ?оÑ?Ñ?е в наÑ?Ñ?оÑ?Ñ?ее вÑ?емÑ? доÑ?Ñ?Ñ?пнÑ?. Ð?Ñ? можеÑ?е либо "
-"подождаÑ?Ñ? некоÑ?оÑ?ое вÑ?емÑ? и попÑ?обоваÑ?Ñ? еÑ?е Ñ?аз, или попÑ?обÑ?йÑ?е дÑ?Ñ?гой "
-"Ñ?поÑ?об наÑ?ождениÑ? новÑ?Ñ? моÑ?Ñ?ов."
msgctxt "NetworkPage"
msgid "Click Help to see other methods of finding new bridges."
msgstr ""
-"Ð?ажмиÑ?е кнопкÑ? Ð?омоÑ?Ñ?, Ñ?Ñ?обÑ? Ñ?видеÑ?Ñ? дÑ?Ñ?гие меÑ?одÑ? поиÑ?ка новÑ?Ñ? моÑ?Ñ?ов."
msgctxt "NetworkPage"
msgid "Address:"
@@ -2719,439 +2599,415 @@ msgstr ""
msgctxt "Policy"
msgid "accept"
-msgstr "пÑ?инÑ?Ñ?Ñ?"
+msgstr ""
msgctxt "Policy"
msgid "reject"
-msgstr "оÑ?клониÑ?Ñ?"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Online"
-msgstr "Ð?нлайн"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Hibernating"
-msgstr "Ð?еÑ?еÑ?од в \"Ñ?пÑ?Ñ?ий\" Ñ?ежим"
+msgstr ""
msgctxt "RouterDescriptor"
msgid "Offline"
-msgstr "Ð?Ñ?Ñ?лайн"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Location:"
-msgstr "РаÑ?положение:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "IP Address:"
-msgstr "IP-адÑ?еÑ?:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Platform:"
-msgstr "Ð?лаÑ?Ñ?оÑ?ма:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Bandwidth:"
-msgstr "ТÑ?аÑ?ик:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Uptime:"
msgstr ""
-"Ð?Ñ?емÑ? Ñ?абоÑ?Ñ?\n"
-":"
msgctxt "RouterDescriptorView"
msgid "Last Updated:"
-msgstr "Ð?оÑ?леднее обновление:"
+msgstr ""
msgctxt "RouterDescriptorView"
msgid "Copy"
-msgstr "Ð?опиÑ?оваÑ?Ñ?"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Hibernating"
-msgstr "Ð?еÑ?еÑ?од в \"Ñ?пÑ?Ñ?ий\" Ñ?ежим"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Online"
-msgstr "Ð?нлайн"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Offline"
-msgstr "Ð?Ñ?Ñ?лайн"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Unknown"
-msgstr "Ð?еизвеÑ?Ñ?но"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Relay Details"
-msgstr "Ð?одÑ?обноÑ?Ñ?и по Ñ?еÑ?веÑ?Ñ?"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Summary"
-msgstr "РезÑ?ме"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Name:"
-msgstr "Ð?мÑ?:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Status:"
-msgstr "СÑ?аÑ?Ñ?Ñ?:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Location:"
-msgstr "РаÑ?положение:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "IP Address:"
-msgstr "IP-адÑ?еÑ?:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Platform:"
-msgstr "Ð?лаÑ?Ñ?оÑ?ма:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Bandwidth:"
-msgstr "Ð?Ñ?опÑ?Ñ?кнаÑ? Ñ?поÑ?обноÑ?Ñ?Ñ?:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Uptime:"
-msgstr "Ð?Ñ?емÑ? Ñ?абоÑ?Ñ?:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Contact:"
-msgstr "Ð?онÑ?акÑ?наÑ? инÑ?оÑ?маÑ?иÑ?:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Last Updated:"
-msgstr "Ð?оÑ?леднее обновление:"
+msgstr ""
msgctxt "RouterInfoDialog"
msgid "Descriptor"
-msgstr "Ð?еÑ?кÑ?ипÑ?оÑ?"
+msgstr ""
msgctxt "RouterListItem"
msgid "Offline"
-msgstr "Ð?Ñ?клÑ?Ñ?ено"
+msgstr ""
msgctxt "RouterListItem"
msgid "Hibernating"
-msgstr "Ð?еÑ?еÑ?од в \"Ñ?пÑ?Ñ?ий\" Ñ?ежим"
+msgstr ""
msgctxt "RouterListItem"
msgid "%1 KB/s"
-msgstr "%1 Ð?б/Ñ?"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Relay"
-msgstr "СеÑ?веÑ?"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Zoom to Relay"
-msgstr "УвелиÑ?иÑ?Ñ? -> СеÑ?веÑ?"
+msgstr ""
msgctxt "RouterListWidget"
msgid "%1 relays online"
-msgstr "%1 Ñ?еÑ?веÑ? онлайн"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Copy"
-msgstr "Ð?опиÑ?оваÑ?Ñ?"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Nickname"
-msgstr "Ð?Ñ?озвиÑ?е"
+msgstr ""
msgctxt "RouterListWidget"
msgid "Fingerprint"
-msgstr "Ð?Ñ?пеÑ?аÑ?ок"
+msgstr ""
msgctxt "ServerPage"
msgid "Bridge Support Unavailable"
-msgstr "Ð?оддеÑ?жка Ð?оÑ?Ñ?а недоÑ?Ñ?Ñ?пна"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"You have configured Tor to act as a bridge relay for censored users, but "
"your version of Tor does not support bridges."
msgstr ""
-"Ð?Ñ? наÑ?Ñ?Ñ?оили Tor, Ñ?Ñ?обÑ? дейÑ?Ñ?воваÑ?Ñ? в каÑ?еÑ?Ñ?ве моÑ?Ñ?а длÑ? заблокиÑ?ованнÑ?Ñ? "
-"полÑ?зоваÑ?елей, но ваÑ?а веÑ?Ñ?иÑ? Tor не поддеÑ?живаеÑ? моÑ?Ñ?ов."
msgctxt "ServerPage"
msgid ""
"Please upgrade your Tor software or configure Tor to act as a normal Tor "
"relay."
msgstr ""
-"Ð?бновиÑ?е или наÑ?Ñ?Ñ?ойÑ?е Tor, Ñ?Ñ?обÑ? дейÑ?Ñ?воваÑ?Ñ? как обÑ?Ñ?нÑ?й Ñ?еÑ?веÑ? Tor."
msgctxt "ServerPage"
msgid "Your bridge relay is not running."
-msgstr "Ð?аÑ? моÑ?Ñ? не Ñ?абоÑ?аеÑ?."
+msgstr ""
msgctxt "ServerPage"
msgid "You must specify at least a relay nickname and port."
-msgstr "Ð?Ñ? должнÑ? Ñ?казаÑ?Ñ? как минимÑ?м имÑ? Ñ?еÑ?веÑ?а и поÑ?Ñ?."
+msgstr ""
msgctxt "ServerPage"
msgid "Run as a client only"
-msgstr "Режим Ñ?абоÑ?Ñ? Ñ?олÑ?ко как клиенÑ?"
-
-msgctxt "ServerPage"
-msgid "Relay traffic for the Tor network"
-msgstr "СеÑ?веÑ?нÑ?й Ñ?Ñ?аÑ?ик Ñ?еÑ?и Tor"
+msgstr ""
msgctxt "ServerPage"
msgid "Relay Port:"
-msgstr "Ð?оÑ?Ñ? Ñ?еÑ?веÑ?а:"
+msgstr ""
msgctxt "ServerPage"
msgid "Enable to mirror the relay directory"
-msgstr "РазÑ?еÑ?иÑ?Ñ? зеÑ?кало каÑ?алога Ñ?еÑ?веÑ?ов"
+msgstr ""
msgctxt "ServerPage"
msgid "Attempt to automatically configure port forwarding"
-msgstr "Ð?опÑ?Ñ?ка авÑ?омаÑ?иÑ?еÑ?ки наÑ?Ñ?Ñ?оиÑ?Ñ? пеÑ?еадÑ?еÑ?аÑ?иÑ? поÑ?Ñ?ов"
+msgstr ""
msgctxt "ServerPage"
msgid "Test"
-msgstr "ТеÑ?Ñ?"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on port forwarding"
-msgstr "помоÑ?Ñ? по пеÑ?еадÑ?еÑ?аÑ?ии поÑ?Ñ?ов"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port:"
-msgstr "Ð?оÑ?Ñ? каÑ?алога:"
+msgstr ""
msgctxt "ServerPage"
msgid "Directory Port Number"
-msgstr "Ð?омеÑ? поÑ?Ñ?а каÑ?алога"
+msgstr ""
msgctxt "ServerPage"
msgid "Contact Info:"
-msgstr "Ð?онÑ?акÑ?наÑ? инÑ?оÑ?маÑ?иÑ?:"
+msgstr ""
msgctxt "ServerPage"
msgid "Name of your relay"
-msgstr "Ð?азвание ваÑ?его Ñ?еÑ?веÑ?а"
+msgstr ""
msgctxt "ServerPage"
msgid "Port on which users and other relays can communicate with your relay"
msgstr ""
-"Ð?оÑ?Ñ?, Ñ?еÑ?ез коÑ?оÑ?Ñ?й полÑ?зоваÑ?ели и дÑ?Ñ?гие Ñ?еÑ?веÑ?Ñ? Ñ?могÑ?Ñ? обÑ?аÑ?Ñ?Ñ?Ñ? Ñ? ваÑ?им "
-"Ñ?еÑ?веÑ?ом"
msgctxt "ServerPage"
msgid "Nickname:"
-msgstr "Ð?ик:"
+msgstr ""
msgctxt "ServerPage"
msgid "Basic Settings"
-msgstr "Ð?Ñ?новнÑ?е наÑ?Ñ?Ñ?ойки"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"For Internet connections with fast download speed but slow upload, please "
"list your upload speed here."
msgstr ""
-"Ð?лÑ? подклÑ?Ñ?ений к Ð?нÑ?еÑ?неÑ? Ñ? медленной вÑ?одÑ?Ñ?ей, но Ñ? вÑ?Ñ?окой иÑ?Ñ?одÑ?Ñ?ей "
-"Ñ?коÑ?оÑ?Ñ?Ñ?Ñ?, пожалÑ?йÑ?Ñ?а, Ñ?кажиÑ?е здеÑ?Ñ? Ñ?воÑ? вÑ?одÑ?Ñ?Ñ?Ñ? Ñ?коÑ?оÑ?Ñ?Ñ?."
msgctxt "ServerPage"
msgid "Cable/DSL 256 Kbps"
-msgstr "Ð?абелÑ?/DSL 256 Ð?б/Ñ?"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 512 Kbps"
-msgstr "Ð?абелÑ?/DSL 512 Ð?б/Ñ?"
+msgstr ""
msgctxt "ServerPage"
msgid "Cable/DSL 768 Kbps"
-msgstr "Ð?абелÑ?/DSL 768 Ð?б/Ñ?"
+msgstr ""
msgctxt "ServerPage"
msgid "T1/Cable/DSL 1.5 Mbps"
-msgstr "T1/Ð?абелÑ?/DSL 1,5 Mб/Ñ?"
+msgstr ""
msgctxt "ServerPage"
msgid "> 1.5 Mbps"
-msgstr "> 1,5 Ð?биÑ?/Ñ?"
+msgstr ""
msgctxt "ServerPage"
msgid "Custom"
-msgstr "СвоÑ? знаÑ?ение"
+msgstr ""
msgctxt "ServerPage"
msgid "Select the entry that most closely resembles your Internet connection"
-msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?о, Ñ?Ñ?о более вÑ?его поÑ?оже на ваÑ?е подклÑ?Ñ?ение к Ð?нÑ?еÑ?неÑ?Ñ?"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on bandwidth rate limits"
-msgstr "Ð?оказаÑ?Ñ? помоÑ?Ñ? по пÑ?еделам пÑ?опÑ?Ñ?кной Ñ?коÑ?оÑ?Ñ?и"
+msgstr ""
msgctxt "ServerPage"
msgid "Average Rate"
-msgstr "СÑ?еднÑ?Ñ? Ñ?коÑ?оÑ?Ñ?Ñ?"
+msgstr ""
msgctxt "ServerPage"
msgid "Long-term average bandwidth limit"
-msgstr "Ð?олгоÑ?Ñ?оÑ?нÑ?й Ñ?Ñ?едний пÑ?едел пÑ?опÑ?Ñ?кной Ñ?поÑ?обноÑ?Ñ?и"
+msgstr ""
msgctxt "ServerPage"
msgid "KB/s"
-msgstr "Ð?Ð?/Ñ?"
+msgstr ""
msgctxt "ServerPage"
msgid "Maximum Rate"
-msgstr "Ð?акÑ?ималÑ?наÑ? Ñ?коÑ?оÑ?Ñ?Ñ?"
+msgstr ""
msgctxt "ServerPage"
msgid "Peak bandwidth rate limit"
-msgstr "Ð?Ñ?едел Ñ?коÑ?оÑ?Ñ?и пÑ?и пиковай пÑ?опÑ?Ñ?кнаÑ? Ñ?поÑ?обноÑ?Ñ?и"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Your maximum bandwidth rate must be greater than or equal to your average "
"bandwidth rate. Both values must be at least 20 KB/s."
msgstr ""
-"Ð?акÑ?ималÑ?наÑ? пÑ?опÑ?Ñ?кнаÑ? Ñ?поÑ?обноÑ?Ñ?Ñ? должна бÑ?Ñ?Ñ? болÑ?Ñ?е или Ñ?авна Ñ?Ñ?еднего "
-"Ñ?Ñ?овнÑ? Ñ?Ñ?аÑ?ика. Ð?ба знаÑ?ениÑ? должнÑ? бÑ?Ñ?Ñ? не менÑ?Ñ?е 20Ð?Ð?/Ñ?"
msgctxt "ServerPage"
msgid "Bandwidth Limits"
-msgstr "Ð?Ñ?еделÑ? полоÑ?Ñ? пÑ?опÑ?Ñ?каниÑ?"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 6660 - 6669 and 6697"
-msgstr "Ð?оÑ?Ñ?Ñ? 6660 - 6669 и 6697"
+msgstr ""
msgctxt "ServerPage"
msgid "Internet Relay Chat (IRC)"
-msgstr "Ð?нÑ?еÑ?неÑ? Реле ЧаÑ? (IRC)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 110, 143, 993 and 995"
-msgstr "Ð?оÑ?Ñ?Ñ? 110, 143, 993 и 995"
+msgstr ""
msgctxt "ServerPage"
msgid "Retrieve Mail (POP, IMAP)"
-msgstr "Ð?олÑ?Ñ?аÑ?Ñ? поÑ?Ñ?Ñ? (POP, IMAP)"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports unspecified by other checkboxes"
-msgstr "Ð?оÑ?Ñ?Ñ? не опÑ?еделеннÑ?й дÑ?Ñ?гими Ñ?лажками"
+msgstr ""
msgctxt "ServerPage"
msgid "Misc Other Services"
-msgstr "Ð?Ñ?оÑ?ие Ñ?еÑ?виÑ?Ñ?"
+msgstr ""
msgctxt "ServerPage"
msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"
-msgstr "Ð?оÑ?Ñ?Ñ? 706, 1863, 5050, 5190, 5222, 5223, 8300 и 8888"
+msgstr ""
msgctxt "ServerPage"
msgid "Instant Messaging (IM)"
-msgstr "Ð?гновеннÑ?й обмен Ñ?ообÑ?ениÑ?ми (IM)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 443"
-msgstr "Ð?оÑ?Ñ? 443"
+msgstr ""
msgctxt "ServerPage"
msgid "Secure Websites (SSL)"
-msgstr "Ð?езопаÑ?нÑ?e веб-Ñ?айÑ?Ñ? (SSL)"
+msgstr ""
msgctxt "ServerPage"
msgid "Port 80"
-msgstr "Ð?оÑ?Ñ? 80"
+msgstr ""
msgctxt "ServerPage"
msgid "Websites"
-msgstr "СайÑ?Ñ?"
+msgstr ""
msgctxt "ServerPage"
msgid "Show help topic on exit policies"
-msgstr "Ð?оказаÑ?Ñ? помоÑ?Ñ? по пÑ?авилам Ñ?злов вÑ?Ñ?ода"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"What Internet resources should users be able to access from your relay?"
msgstr ""
-"Ð? каким инÑ?еÑ?неÑ?-Ñ?еÑ?Ñ?Ñ?Ñ?ам полÑ?зоваÑ?ели Ñ?могÑ?Ñ? полÑ?Ñ?иÑ?Ñ? доÑ?Ñ?Ñ?п Ñ? ваÑ?его "
-"Ñ?еÑ?веÑ?а?"
msgctxt "ServerPage"
msgid ""
"Tor will still block some outgoing mail and file sharing applications by "
"default to reduce spam and other abuse."
msgstr ""
-"Tor бÑ?дÑ?Ñ? пÑ?одолжаÑ?Ñ? по Ñ?молÑ?аниÑ? блокиÑ?оваÑ?Ñ? некоÑ?оÑ?Ñ?Ñ? иÑ?Ñ?одÑ?Ñ?Ñ?Ñ? поÑ?Ñ?Ñ? и "
-"пÑ?иложениÑ? обмена Ñ?айлами длÑ? Ñ?менÑ?Ñ?ениÑ? колиÑ?еÑ?Ñ?ва Ñ?пама и дÑ?Ñ?гиÑ? "
-"злоÑ?поÑ?Ñ?еблений."
msgctxt "ServerPage"
msgid "Exit Policies"
-msgstr "Ð?Ñ?авила вÑ?Ñ?ода"
+msgstr ""
msgctxt "ServerPage"
msgid "Let others access your bridge by giving them this line:"
-msgstr "Ð?айÑ?е дÑ?Ñ?гим доÑ?Ñ?Ñ?п к ваÑ?емÑ? моÑ?Ñ?Ñ?, пÑ?едоÑ?Ñ?авив им Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?окÑ?:"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"This is the identity of your bridge relay that you can give to other people"
-msgstr "ÐÑ?о иденÑ?еÑ?икаÑ?иÑ? ваÑ?иÑ? моÑ?Ñ?а, коÑ?оÑ?ой вÑ? можеÑ?е поделиÑ?Ñ?Ñ?Ñ? Ñ? дÑ?Ñ?гими"
+msgstr ""
msgctxt "ServerPage"
msgid "Copy your bridge relay's identity to the clipboard"
-msgstr "СкопиÑ?Ñ?йÑ?е иденÑ?иÑ?икаÑ?иÑ? моÑ?Ñ?а в бÑ?Ñ?еÑ? обмена"
+msgstr ""
msgctxt "ServerPage"
msgid "No Recent Usage"
-msgstr "Ð?еÑ? нового иÑ?полÑ?зованиÑ?"
+msgstr ""
msgctxt "ServerPage"
msgid "No clients have used your relay recently."
-msgstr "Ð?еÑ? клиенÑ?ов, коÑ?оÑ?Ñ?е недавно иÑ?полÑ?зовали ваÑ? Ñ?еÑ?веÑ?."
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Leave your relay running so clients have a better chance of finding and "
"using it."
msgstr ""
-"Ð?Ñ?Ñ?авÑ?Ñ?е ваÑ? Ñ?еÑ?веÑ? Ñ?абоÑ?аÑ?Ñ?им, Ñ?ак Ñ?Ñ?обÑ? клиенÑ?Ñ? имели болÑ?Ñ?е Ñ?анÑ?ов найÑ?и "
-"и иÑ?полÑ?зоваÑ?Ñ? его."
msgctxt "ServerPage"
msgid "Bridge History"
-msgstr "Ð?Ñ?Ñ?оÑ?иÑ? Ð?оÑ?Ñ?a"
+msgstr ""
msgctxt "ServerPage"
msgid "Vidalia was unable to retrieve your bridge's usage history."
-msgstr "Vidalia не Ñ?могла полÑ?Ñ?иÑ?Ñ? иÑ?Ñ?оÑ?иÑ? иÑ?полÑ?зованиÑ? ваÑ?его моÑ?Ñ?а."
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Tor returned an improperly formatted response when Vidalia requested your "
"bridge's usage history."
msgstr ""
-"Tor веÑ?нÑ?л непÑ?авилÑ?но оÑ?Ñ?оÑ?маÑ?иÑ?ованнÑ?й оÑ?клик, когда Vidalia запÑ?аÑ?ивала "
-"иÑ?Ñ?оÑ?иÑ? иÑ?полÑ?зованиÑ? ваÑ?его моÑ?Ñ?а."
msgctxt "ServerPage"
msgid "The returned response was: %1"
-msgstr "Ð?еÑ?нÑ?лÑ?Ñ? оÑ?веÑ?: %1"
+msgstr ""
msgctxt "ServerPage"
msgid "Help censored users reach the Tor network"
-msgstr "Ð?омоÑ?Ñ? заблокиÑ?ованнÑ?м полÑ?зоваÑ?елÑ?м полÑ?Ñ?иÑ?Ñ? доÑ?Ñ?Ñ?п к Ñ?еÑ?и Tor"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>"
-msgstr "<a href=\"#bridgeUsage\">Ð?Ñ?о иÑ?полÑ?зовал мой моÑ?Ñ??</a>"
+msgstr ""
msgctxt "ServerPage"
msgid "<a href=\"#bridgeHelp\">What's this?</a>"
@@ -3162,103 +3018,100 @@ msgid "Automatically distribute my bridge address"
msgstr ""
msgctxt "ServerPage"
+msgid "Relay traffic inside the Tor network (non-exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
+msgid "Relay traffic for the Tor network (exit relay)"
+msgstr ""
+
+msgctxt "ServerPage"
msgid "Mirror the Relay Directory"
-msgstr "Ð?еÑ?кало каÑ?алога Ñ?еÑ?веÑ?ов"
+msgstr ""
msgctxt "ServerPage"
msgid ""
"Email address at which you may be reached if there is a\n"
"problem with your relay. You might also include your PGP or GPG fingerprint."
msgstr ""
-"Ð?дÑ?еÑ? Ñ?лекÑ?Ñ?онной поÑ?Ñ?Ñ?, по коÑ?оÑ?омÑ? ваÑ? можно найÑ?и, еÑ?ли возникла пÑ?облема"
-" Ñ? ваÑ?им Ñ?еÑ?веÑ?ом. Ð?Ñ? Ñ?акже можеÑ?е вклÑ?Ñ?иÑ?Ñ? ваÑ? PGP или GPG оÑ?пеÑ?аÑ?ок."
msgctxt "ServicePage"
msgid "Error while trying to unpublish all services"
-msgstr "Ð?Ñ?ибка пÑ?и попÑ?Ñ?ке оÑ?мениÑ?Ñ? пÑ?бликаÑ?иÑ? вÑ?еÑ? Ñ?еÑ?виÑ?ов"
+msgstr ""
msgctxt "ServicePage"
msgid ""
"Please configure at least a service directory and a virtual port for each "
"service you want to save. Remove the other ones."
msgstr ""
-"Ð?ожалÑ?йÑ?Ñ?а, вÑ?беÑ?иÑ?е по кÑ?айней меÑ?е каÑ?алог Ñ?еÑ?виÑ?ов и виÑ?Ñ?Ñ?алÑ?нÑ?й поÑ?Ñ? длÑ?"
-" каждого Ñ?еÑ?виÑ?а, коÑ?оÑ?Ñ?й вÑ? Ñ?оÑ?иÑ?е Ñ?оÑ?Ñ?аниÑ?Ñ?. УдалиÑ?е дÑ?Ñ?гие."
msgctxt "ServicePage"
msgid "Error"
-msgstr "Ð?Ñ?ибка"
+msgstr ""
msgctxt "ServicePage"
msgid "Please select a Service."
-msgstr "Ð?ожалÑ?йÑ?Ñ?а, вÑ?беÑ?иÑ?е Ñ?еÑ?виÑ?."
+msgstr ""
msgctxt "ServicePage"
msgid "Select Service Directory"
-msgstr "Ð?Ñ?беÑ?иÑ?е каÑ?алог Ñ?еÑ?виÑ?ов"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port may only contain valid port numbers [1..65535]."
msgstr ""
-"Ð?иÑ?Ñ?Ñ?алÑ?нÑ?й поÑ?Ñ? можеÑ? Ñ?одеÑ?жаÑ?Ñ? Ñ?олÑ?ко допÑ?Ñ?Ñ?имÑ?е номеÑ?а поÑ?Ñ?а [1..65535]."
msgctxt "ServicePage"
msgid "Target may only contain address:port, address, or port."
-msgstr "ЦелÑ? можеÑ? Ñ?одеÑ?жаÑ?Ñ? Ñ?олÑ?ко адÑ?еÑ?: поÑ?Ñ?, адÑ?еÑ? или поÑ?Ñ?."
+msgstr ""
msgctxt "ServicePage"
msgid "Directory already in use by another service."
-msgstr "Ð?аÑ?алог Ñ?же иÑ?полÑ?зÑ?еÑ?Ñ?Ñ? дÑ?Ñ?гой Ñ?лÑ?жбой."
-
-msgctxt "ServicePage"
-msgid "Form"
-msgstr "ФоÑ?ма"
+msgstr ""
msgctxt "ServicePage"
msgid "Provided Hidden Services"
-msgstr "Ð?Ñ?едоÑ?Ñ?авленнÑ?й Ñ?кÑ?Ñ?Ñ?Ñ?й Ñ?еÑ?виÑ?"
+msgstr ""
msgctxt "ServicePage"
msgid "Onion Address"
-msgstr "\"Ð?Ñ?ковÑ?й\" адÑ?еÑ? Tor"
+msgstr ""
msgctxt "ServicePage"
msgid "Virtual Port"
-msgstr "Ð?иÑ?Ñ?Ñ?алÑ?нÑ?й поÑ?Ñ?"
+msgstr ""
msgctxt "ServicePage"
msgid "Target"
-msgstr "ЦелÑ?"
+msgstr ""
msgctxt "ServicePage"
msgid "Directory Path"
-msgstr "Ð?Ñ?Ñ?Ñ? к каÑ?алогÑ?"
+msgstr ""
msgctxt "ServicePage"
msgid "Enabled"
-msgstr "Ð?клÑ?Ñ?ено"
+msgstr ""
msgctxt "ServicePage"
msgid "Add new service to list"
-msgstr "Ð?обавиÑ?Ñ? новÑ?й Ñ?еÑ?виÑ? к Ñ?пиÑ?кÑ?"
+msgstr ""
msgctxt "ServicePage"
msgid "Remove selected service from list"
-msgstr "УдалиÑ?Ñ? вÑ?бÑ?аннÑ?й Ñ?еÑ?виÑ? из Ñ?пиÑ?ка"
+msgstr ""
msgctxt "ServicePage"
msgid "Copy onion address of selected service to clipboard"
-msgstr "Ð?опиÑ?оваÑ?Ñ? \"лÑ?ковÑ?й\" адÑ?еÑ? вÑ?бÑ?анного Ñ?еÑ?виÑ?а в бÑ?Ñ?еÑ?"
+msgstr ""
msgctxt "ServicePage"
msgid "Browse in local file system and choose directory for selected service"
msgstr ""
-"Ð?Ñ?оÑ?моÑ?Ñ? в локалÑ?ной Ñ?айловой Ñ?иÑ?Ñ?еме и вÑ?бÑ?аÑ?Ñ? каÑ?алог длÑ? вÑ?бÑ?анного "
-"Ñ?еÑ?виÑ?а"
msgctxt "ServicePage"
msgid "Created by Tor"
-msgstr "Создано Tor"
+msgstr ""
msgctxt "StatusEventWidget"
msgid "Copy to Clipboard"
@@ -3505,57 +3358,79 @@ msgid ""
" the Tor network!"
msgstr ""
+msgctxt "StatusTab"
+msgid "Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Message Log"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Tor Status"
+msgstr ""
+
+msgctxt "StatusTab"
+msgid "Show on startup"
+msgstr ""
+
msgctxt "Stream"
msgid "New"
-msgstr "СоздаÑ?Ñ?"
+msgstr ""
msgctxt "Stream"
msgid "Resolving"
-msgstr "РазÑ?еÑ?ение"
+msgstr ""
msgctxt "Stream"
msgid "Connecting"
-msgstr "Ð?одклÑ?Ñ?ение"
+msgstr ""
msgctxt "Stream"
msgid "Open"
-msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ?"
+msgstr ""
msgctxt "Stream"
msgid "Failed"
-msgstr "Ð?е Ñ?далоÑ?Ñ?"
+msgstr ""
msgctxt "Stream"
msgid "Closed"
-msgstr "Ð?акÑ?Ñ?Ñ?о"
+msgstr ""
msgctxt "Stream"
msgid "Retrying"
-msgstr "Ð?овÑ?оÑ?"
+msgstr ""
msgctxt "Stream"
msgid "Remapped"
-msgstr "Ð?Ñ?обÑ?ажено повÑ?оÑ?но"
+msgstr ""
msgctxt "Stream"
msgid "Unknown"
-msgstr "Ð?еизвеÑ?Ñ?но"
+msgstr ""
+
+msgctxt "TorControl"
+msgid ""
+"Vidalia has not started Tor. You need to stop Tor through the interface you "
+"started it."
+msgstr ""
msgctxt "TorProcess"
msgid "Process %1 failed to stop. [%2]"
-msgstr "Ð?Ñ?оÑ?еÑ?Ñ? %1 не Ñ?далоÑ?Ñ? оÑ?Ñ?ановиÑ?Ñ?. [%2]"
+msgstr ""
msgctxt "TorService"
msgid "The Tor service is not installed."
-msgstr "Tor-Ñ?еÑ?виÑ? не Ñ?Ñ?Ñ?ановлен."
+msgstr ""
msgctxt "TorService"
msgid "Unable to start the Tor service."
-msgstr "Ð?е Ñ?даеÑ?Ñ?Ñ? запÑ?Ñ?Ñ?иÑ?Ñ? Tor-Ñ?еÑ?виÑ?."
+msgstr ""
msgctxt "TorSettings"
msgid "Failed to hash the control password."
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?Ñ?Ñ?иÑ?оваÑ?Ñ? паÑ?олÑ? Ñ?пÑ?авлениÑ?."
+msgstr ""
msgctxt "TorrcDialog"
msgid "Editing torrc"
@@ -3619,140 +3494,157 @@ msgctxt "TorrcDialog"
msgid "An error ocurred while opening torrc file"
msgstr ""
+msgctxt "TorrcDialog"
+msgid "Ctrl+X"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+C"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+V"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+Shift+Z"
+msgstr ""
+
+msgctxt "TorrcDialog"
+msgid "Ctrl+A"
+msgstr ""
+
msgctxt "UPNPControl"
msgid "Success"
-msgstr "УÑ?пеÑ?"
+msgstr ""
msgctxt "UPNPControl"
msgid "No UPnP-enabled devices found"
-msgstr "Ð?е найдено UPnP-Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?в"
+msgstr ""
msgctxt "UPNPControl"
msgid "No valid UPnP-enabled Internet gateway devices found"
-msgstr "Ð?еÑ? найдено доÑ?Ñ?Ñ?пнÑ?Ñ? UPnP-Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?в Ð?нÑ?еÑ?неÑ?-Ñ?лÑ?за"
+msgstr ""
msgctxt "UPNPControl"
msgid "WSAStartup failed"
-msgstr "Ð?апÑ?Ñ?к WSA не полÑ?Ñ?илÑ?Ñ?"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to add a port mapping"
-msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? каÑ?Ñ?Ñ? поÑ?Ñ?ов"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to retrieve a port mapping"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? каÑ?Ñ?Ñ? поÑ?Ñ?ов"
+msgstr ""
msgctxt "UPNPControl"
msgid "Failed to remove a port mapping"
-msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? каÑ?Ñ?Ñ? поÑ?Ñ?ов"
+msgstr ""
msgctxt "UPNPControl"
msgid "Unknown error"
-msgstr "Ð?еизвеÑ?Ñ?наÑ? оÑ?ибка"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Discovering UPnP-enabled devices"
-msgstr "Ð?Ñ?Ñ?вление UPnP-Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?в"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating directory port mapping"
-msgstr "Ð?бновление каÑ?Ñ?Ñ? каÑ?алога поÑ?Ñ?ов "
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Updating relay port mapping"
-msgstr "Ð?бновление каÑ?Ñ?Ñ? поÑ?Ñ?ов Ñ?еÑ?веÑ?ов"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Test completed successfully!"
-msgstr "ТеÑ?Ñ?иÑ?ование завеÑ?Ñ?ено Ñ?Ñ?пеÑ?но!"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing UPnP Support"
-msgstr "ТеÑ?Ñ?иÑ?ование Ð?оддеÑ?жки UPnP"
+msgstr ""
msgctxt "UPNPTestDialog"
msgid "Testing Universal Plug & Play Support"
-msgstr "ТеÑ?Ñ?иÑ?ование Ñ?нивеÑ?Ñ?алÑ?ной поддеÑ?жки Plug & Play"
+msgstr ""
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because it could "
"not find '%1'."
msgstr ""
-"Vidalia не Ñ?могла пÑ?овеÑ?иÑ?Ñ? налиÑ?ие обновлений пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ?, "
-"поÑ?колÑ?кÑ? она не можеÑ? найÑ?и '%1'."
msgctxt "UpdateProcess"
msgid ""
"Vidalia was unable to check for available software updates because Tor's "
"update process exited unexpectedly."
msgstr ""
-"Vidalia не Ñ?могла пÑ?овеÑ?иÑ?Ñ? налиÑ?ие обновлений пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ?, "
-"поÑ?колÑ?кÑ? пÑ?оÑ?еÑ?Ñ? обновлениÑ? Tor неожиданно завеÑ?Ñ?ил Ñ?абоÑ?Ñ?."
msgctxt "UpdateProgressDialog"
msgid "Checking for available updates..."
-msgstr "Ð?Ñ?овеÑ?ка налиÑ?иÑ? обновлений..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Hide"
-msgstr "СкÑ?Ñ?Ñ?Ñ?"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Downloading updates..."
-msgstr "Ð?агÑ?Ñ?зка обновлений ..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Installing updated software..."
-msgstr "УÑ?Ñ?ановка новейÑ?его пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ? ..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Done! Your software is now up to date."
msgstr ""
-"Ð?оÑ?ово! Ð?аÑ?е пÑ?огÑ?аммное обеÑ?пеÑ?ение в наÑ?Ñ?оÑ?Ñ?ее вÑ?емÑ? в акÑ?Ñ?алÑ?ном "
-"Ñ?оÑ?Ñ?оÑ?нии."
msgctxt "UpdateProgressDialog"
msgid "OK"
-msgstr "Ð?Ð?"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Software Updates"
-msgstr "Ð?бновление пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ?"
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Checking for updates..."
-msgstr "Ð?Ñ?овеÑ?ка обновлений ..."
+msgstr ""
msgctxt "UpdateProgressDialog"
msgid "Cancel"
-msgstr "Ð?Ñ?мениÑ?Ñ?"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Software Updates Available"
-msgstr "Ð?бновление пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ? доÑ?Ñ?Ñ?пно"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Remind Me Later"
-msgstr "Ð?апомниÑ?Ñ? позже"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Install"
-msgstr "УÑ?Ñ?ановиÑ?Ñ?"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "The following updated software packages are ready for installation:"
msgstr ""
-"СледÑ?Ñ?Ñ?ие обновленнÑ?е пакеÑ?Ñ? пÑ?огÑ?аммного обеÑ?пеÑ?ениÑ? гоÑ?овÑ? длÑ? Ñ?Ñ?Ñ?ановки:"
msgctxt "UpdatesAvailableDialog"
msgid "Package"
-msgstr "Ð?акеÑ?"
+msgstr ""
msgctxt "UpdatesAvailableDialog"
msgid "Version"
-msgstr "Ð?еÑ?Ñ?иÑ?"
+msgstr ""
msgctxt "UploadProgressDialog"
msgid "Uploading Crash Report"
@@ -3764,109 +3656,107 @@ msgstr ""
msgctxt "VMessageBox"
msgid "OK"
-msgstr "Ð?Ð?"
+msgstr ""
msgctxt "VMessageBox"
msgid "Cancel"
-msgstr "Ð?Ñ?мениÑ?Ñ?"
+msgstr ""
msgctxt "VMessageBox"
msgid "Yes"
-msgstr "Ð?а"
+msgstr ""
msgctxt "VMessageBox"
msgid "No"
-msgstr "Ð?еÑ?"
+msgstr ""
msgctxt "VMessageBox"
msgid "Help"
-msgstr "Ð?омоÑ?Ñ?"
+msgstr ""
msgctxt "VMessageBox"
msgid "Retry"
-msgstr "Ð?овÑ?оÑ?иÑ?Ñ?"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Log"
-msgstr "Ð?оказаÑ?Ñ? жÑ?Ñ?нал"
+msgstr ""
msgctxt "VMessageBox"
msgid "Show Settings"
-msgstr "Ð?оказаÑ?Ñ? наÑ?Ñ?Ñ?ойки"
+msgstr ""
msgctxt "VMessageBox"
msgid "Continue"
-msgstr "Ð?Ñ?одолжиÑ?Ñ?"
+msgstr ""
msgctxt "VMessageBox"
msgid "Quit"
-msgstr "Ð?Ñ?Ñ?од"
+msgstr ""
msgctxt "VMessageBox"
msgid "Browse"
-msgstr "Ð?бзоÑ?"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid Argument"
-msgstr "Ð?евеÑ?нÑ?й паÑ?амеÑ?Ñ?"
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia is already running"
-msgstr "Vidalia Ñ?же запÑ?Ñ?енa"
+msgstr ""
msgctxt "Vidalia"
msgid "Displays this usage message and exits."
-msgstr "Ð?оказÑ?ваеÑ? Ñ?Ñ?о Ñ?ообÑ?ение о иÑ?полÑ?зовании и завеÑ?Ñ?аеÑ? Ñ?абоÑ?Ñ?."
+msgstr ""
msgctxt "Vidalia"
msgid "Resets ALL stored Vidalia settings."
-msgstr "СбÑ?аÑ?Ñ?ваеÑ? Ð?СÐ? Ñ?оÑ?Ñ?аненнÑ?е наÑ?Ñ?Ñ?ойки Vidalia."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the directory Vidalia uses for data files."
-msgstr "УÑ?Ñ?анавливаеÑ? каÑ?алог, иÑ?полÑ?зÑ?емÑ?й Vidalia длÑ? Ñ?айлов даннÑ?Ñ?."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's pidfile."
-msgstr "УÑ?Ñ?анавливаеÑ? имÑ? и Ñ?аÑ?положение Ñ?айла PID Vidalia."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the name and location of Vidalia's logfile."
-msgstr "УÑ?Ñ?анавливаеÑ? имÑ? и пÑ?Ñ?Ñ? Ñ?айла жÑ?Ñ?нала Vidalia."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets the verbosity of Vidalia's logging."
-msgstr "УÑ?Ñ?анавливаеÑ? Ñ?Ñ?овенÑ? жÑ?Ñ?налиÑ?ованиÑ? Vidalia."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's interface style."
-msgstr "УÑ?Ñ?анавливаеÑ? Ñ?Ñ?илÑ? инÑ?еÑ?Ñ?ейÑ?а Vidalia."
+msgstr ""
msgctxt "Vidalia"
msgid "Sets Vidalia's language."
-msgstr "УÑ?Ñ?анавливаеÑ? Ñ?зÑ?к Vidalia."
+msgstr ""
msgctxt "Vidalia"
msgid "Vidalia Usage Information"
-msgstr "Ð?нÑ?оÑ?маÑ?иÑ? по иÑ?полÑ?зованиÑ? Vidalia"
+msgstr ""
msgctxt "Vidalia"
msgid "Unable to open log file '%1': %2"
msgstr ""
-"Ð?евозможно оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?айл жÑ?Ñ?нала \n"
-"%1': %2"
msgctxt "Vidalia"
msgid "Invalid language code specified:"
-msgstr "Указан невеÑ?нÑ?й код Ñ?зÑ?ка:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid GUI style specified:"
-msgstr "Указан невеÑ?нÑ?й Ñ?Ñ?илÑ? Ñ?кÑ?анного инÑ?еÑ?Ñ?ейÑ?а:"
+msgstr ""
msgctxt "Vidalia"
msgid "Invalid log level specified:"
-msgstr "Указан невеÑ?нÑ?й Ñ?Ñ?овенÑ? жÑ?Ñ?нала:"
+msgstr ""
msgctxt "Vidalia"
msgid ""
@@ -3874,38 +3764,35 @@ msgid ""
"\n"
"Would you like to continue starting Vidalia?"
msgstr ""
-"Ð?Ñ?Ñ?гой пÑ?оÑ?еÑ?Ñ? Vidalia, возможно, Ñ?же запÑ?Ñ?ен. Ð?Ñ?ли дейÑ?Ñ?виÑ?елÑ?но неÑ? "
-"дÑ?Ñ?гого пÑ?оÑ?еÑ?Ñ?а Ñ?абоÑ?аÑ?Ñ?его Vidalia, вÑ? можеÑ?е пÑ?одолжиÑ?Ñ? в лÑ?бом Ñ?лÑ?Ñ?ае. "
-"ХоÑ?ели бÑ? вÑ? пÑ?одолжиÑ?Ñ? запÑ?Ñ?к Vidalia?"
msgctxt "stringutil.h"
msgid "%1 secs"
-msgstr "%1 Ñ?ек"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 B/s"
-msgstr "%1 б/Ñ?"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 KB/s"
-msgstr "%1 Ð?б/Ñ?"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 MB/s"
-msgstr "%1 Ð?б/Ñ?"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 GB/s"
-msgstr "%1 Ð?б/Ñ?"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 days"
-msgstr "%1 дней"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 hours"
-msgstr "%1 Ñ?аÑ?ов"
+msgstr ""
msgctxt "stringutil.h"
msgid "%1 mins"
-msgstr "%1 мин"
+msgstr ""
diff --git a/src/vidalia/i18n/po/sco/vidalia_sco.po b/src/vidalia/i18n/po/sco/vidalia_sco.po
index f369cb9..b11439b 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-04-18 08:44+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:04+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 0df5f1f..a91ef8a 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-04-18 08:44+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:04+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 1e91d91..e04cbb9 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-04-18 08:50+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 3284689..fa22505 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-04-18 08:46+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:06+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 4883d82..d4e0df0 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-04-18 08:46+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:07+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 d83592f..9995e8c 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-04-18 08:46+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:07+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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/tg/vidalia_tg.po b/src/vidalia/i18n/po/tg/vidalia_tg.po
index 2243ef5..9344fee 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-04-18 08:46+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:06+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 12e3fcd..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 1441edd..05168e5 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-04-18 08:46+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:06+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 6b2398c..022a94d 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-04-18 08:46+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:06+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 3e7582b..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 706d03e..83c3805 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-04-18 08:48+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:09+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 dfcccf4..6c9c0cf 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-04-18 08:49+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:10+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 f548859..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 b078a25..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-22 16:13+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@xxxxxxxxx>\n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 bee5f96..8a3c4da 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-04-18 08:46+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:07+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 85fa17f..774a923 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-04-18 08:50+0000\n"
+"POT-Creation-Date: 2011-05-03 14:28+0000\n"
+"PO-Revision-Date: 2011-05-06 20:11+0000\n"
"Last-Translator: \n"
"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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 ""
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits